parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SolverParameters: Minor change.

setup.py
Pierre-Antoine Rouby 2024-02-02 10:11:54 +01:00
parent fe9c348ee0
commit 9fd9bd95f4
3 changed files with 186 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Solver/Mage.py
View File

@ -90,7 +90,7 @@ class Mage(CommandLineSolver):
("mage_compute_reach_volume_balance", "y"), ("mage_compute_reach_volume_balance", "y"),
("mage_max_reach_volume_balance", "0.001"), ("mage_max_reach_volume_balance", "0.001"),
("mage_min_reach_volume_to_check", "1000.0"), ("mage_min_reach_volume_to_check", "1000.0"),
("mage_init_internal", " "), ("mage_init_internal", "n"),
] ]
return lst return lst
@ -792,6 +792,10 @@ class Mage8(Mage):
value = ("p" if value.lower() in ["y", "yes", "true"] value = ("p" if value.lower() in ["y", "yes", "true"]
else "") else "")
logger.debug(
f"export: PAR: {name}: {value} ({p.value})"
)
f.write(f"{name} {value}\n") f.write(f"{name} {value}\n")
return files return files

70
src/View/SolverParameters/Table.py
View File

@ -96,76 +96,6 @@ class TableModel(PamhyrTableModel):
self.dataChanged.emit(index, index) self.dataChanged.emit(index, index)
return True return True
# def add(self, row, parent=QModelIndex()):
# self.beginInsertRows(parent, row, row - 1)
# self._undo.push(
# AddCommand(
# self._lst, row
# )
# )
# self.endInsertRows()
# self.layoutChanged.emit()
# def delete(self, rows, parent=QModelIndex()):
# self.beginRemoveRows(parent, rows[0], rows[-1])
# self._undo.push(
# DelCommand(
# self._lst, rows
# )
# )
# self.endRemoveRows()
# self.layoutChanged.emit()
# def sort(self, _reverse, parent=QModelIndex()):
# self.layoutAboutToBeChanged.emit()
# self._undo.push(
# SortCommand(
# self._lst, False
# )
# )
# self.layoutAboutToBeChanged.emit()
# self.layoutChanged.emit()
# def move_up(self, row, parent=QModelIndex()):
# if row <= 0:
# return
# target = row + 2
# self.beginMoveRows(parent, row - 1, row - 1, parent, target)
# self._undo_stack.push(
# MoveCommand(
# self._lst, "up", row
# )
# )
# self.endMoveRows()
# self.layoutChanged.emit()
# def move_down(self, index, parent=QModelIndex()):
# if row > len(self._lst):
# return
# target = row
# self.beginMoveRows(parent, row + 1, row + 1, parent, target)
# self._undo_stack.push(
# MoveCommand(
# self._lst, "down", row
# )
# )
# self.endMoveRows()
# self.layoutChanged.emit()
def undo(self): def undo(self):
self._undo.undo() self._undo.undo()
self.layoutChanged.emit() self.layoutChanged.emit()

333
src/lang/fr.ts
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS><TS version="2.0" language="fr_FR" sourcelanguage="en_150">
<TS version="2.1" language="fr_FR" sourcelanguage="en_150">
<context> <context>
<name>About</name> <name>About</name>
<message> <message>
@ -276,7 +275,7 @@
</message> </message>
<message> <message>
<location filename="../View/BoundaryCondition/Edit/translate.py" line="12"/> <location filename="../View/BoundaryCondition/Edit/translate.py" line="12"/>
<source>Discharge (m³/s)</source> <source>Discharge (m&#xb3;/s)</source>
<translation type="obsolete">Débit (m³/s)</translation> <translation type="obsolete">Débit (m³/s)</translation>
</message> </message>
<message> <message>
@ -319,6 +318,11 @@
<source>Q(Z)</source> <source>Q(Z)</source>
<translation>Q(Z)</translation> <translation>Q(Z)</translation>
</message> </message>
<message encoding="UTF-8">
<location filename="../View/BoundaryCondition/Edit/translate.py" line="37"/>
<source>Discharge (m³/s)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>CheckList</name> <name>CheckList</name>
@ -433,9 +437,14 @@
</message> </message>
<message> <message>
<location filename="../View/Results/CustomPlot/Translate.py" line="53"/> <location filename="../View/Results/CustomPlot/Translate.py" line="53"/>
<source>Discharge (m³/s)</source> <source>Discharge (m&#xb3;/s)</source>
<translation type="obsolete">Débit (m³/s)</translation> <translation type="obsolete">Débit (m³/s)</translation>
</message> </message>
<message encoding="UTF-8">
<location filename="../View/Results/CustomPlot/Translate.py" line="53"/>
<source>Discharge (m³/s)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>Dialog</name> <name>Dialog</name>
@ -925,12 +934,12 @@
<message> <message>
<location filename="../View/Geometry/Translate.py" line="31"/> <location filename="../View/Geometry/Translate.py" line="31"/>
<source>File mage geometry (*.ST)</source> <source>File mage geometry (*.ST)</source>
<translation>Fichier géométrie Mage (*.ST)</translation> <translation type="obsolete">Fichier géométrie Mage (*.ST)</translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Translate.py" line="33"/> <location filename="../View/Geometry/Translate.py" line="33"/>
<source>File mage meshed geometry (*.M)</source> <source>File mage meshed geometry (*.M)</source>
<translation>Fichier géométrie maillée (*.M)</translation> <translation type="obsolete">Fichier géométrie maillée (*.M)</translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Translate.py" line="35"/> <location filename="../View/Geometry/Translate.py" line="35"/>
@ -967,6 +976,16 @@
<source>Points</source> <source>Points</source>
<translation>Points</translation> <translation>Points</translation>
</message> </message>
<message>
<location filename="../View/Geometry/Translate.py" line="31"/>
<source>File mage geometry (*.ST *.st)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../View/Geometry/Translate.py" line="33"/>
<source>File mage meshed geometry (*.M *.m)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>Hydraulic structure</name> <name>Hydraulic structure</name>
@ -1003,7 +1022,7 @@
</message> </message>
<message> <message>
<location filename="../View/InitialConditions/translate.py" line="40"/> <location filename="../View/InitialConditions/translate.py" line="40"/>
<source>Discharge (m³/s)</source> <source>Discharge (m&#xb3;/s)</source>
<translation type="obsolete">Débit (m³/s)</translation> <translation type="obsolete">Débit (m³/s)</translation>
</message> </message>
<message> <message>
@ -1016,6 +1035,11 @@
<source>Height (m)</source> <source>Height (m)</source>
<translation>Hauteur (m)</translation> <translation>Hauteur (m)</translation>
</message> </message>
<message encoding="UTF-8">
<location filename="../View/InitialConditions/translate.py" line="40"/>
<source>Discharge (m³/s)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LateralContribution</name> <name>LateralContribution</name>
@ -1136,9 +1160,14 @@
</message> </message>
<message> <message>
<location filename="../View/InitialConditions/translate.py" line="11"/> <location filename="../View/InitialConditions/translate.py" line="11"/>
<source>Discharge (m³/s)</source> <source>Discharge (m&#xb3;/s)</source>
<translation type="obsolete">Débit (m³/s)</translation> <translation type="obsolete">Débit (m³/s)</translation>
</message> </message>
<message encoding="UTF-8">
<location filename="../View/LateralContribution/Edit/translate.py" line="36"/>
<source>Discharge (m³/s)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
@ -1213,7 +1242,7 @@
<translation>&amp;Aide</translation> <translation>&amp;Aide</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="264"/> <location filename="../View/ui/MainWindow.ui" line="263"/>
<source>New study</source> <source>New study</source>
<translation>Nouvelle étude</translation> <translation>Nouvelle étude</translation>
</message> </message>
@ -1223,87 +1252,87 @@
<translation>Ctrl+N</translation> <translation>Ctrl+N</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="295"/> <location filename="../View/ui/MainWindow.ui" line="294"/>
<source>Open a study</source> <source>Open a study</source>
<translation>Ouvrir une étude</translation> <translation>Ouvrir une étude</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="298"/> <location filename="../View/ui/MainWindow.ui" line="297"/>
<source>Ctrl+O</source> <source>Ctrl+O</source>
<translation>Ctrl+O</translation> <translation>Ctrl+O</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="306"/> <location filename="../View/ui/MainWindow.ui" line="305"/>
<source>Import data from MAGE</source> <source>Import data from MAGE</source>
<translation>Importer des données d&apos;une étude MAGE</translation> <translation>Importer des données d&apos;une étude MAGE</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="317"/> <location filename="../View/ui/MainWindow.ui" line="316"/>
<source>Import data from RubarBE</source> <source>Import data from RubarBE</source>
<translation>Importer des données d&apos;une étude RubarBE</translation> <translation>Importer des données d&apos;une étude RubarBE</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="589"/> <location filename="../View/ui/MainWindow.ui" line="588"/>
<source>Close</source> <source>Close</source>
<translation>Fermer</translation> <translation>Fermer</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="682"/> <location filename="../View/ui/MainWindow.ui" line="681"/>
<source>Close current study</source> <source>Close current study</source>
<translation>Fermer l&apos;étude en cours</translation> <translation>Fermer l&apos;étude en cours</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="340"/> <location filename="../View/ui/MainWindow.ui" line="339"/>
<source>Save mesh</source> <source>Save mesh</source>
<translation>Sauvegarder le maillage</translation> <translation>Sauvegarder le maillage</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="349"/> <location filename="../View/ui/MainWindow.ui" line="348"/>
<source>Save</source> <source>Save</source>
<translation>Sauvegarder</translation> <translation>Sauvegarder</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="355"/> <location filename="../View/ui/MainWindow.ui" line="354"/>
<source>Ctrl+S</source> <source>Ctrl+S</source>
<translation>Ctrl+S</translation> <translation>Ctrl+S</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="364"/> <location filename="../View/ui/MainWindow.ui" line="363"/>
<source>Save as ...</source> <source>Save as ...</source>
<translation>Sauvegarder sous...</translation> <translation>Sauvegarder sous...</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="370"/> <location filename="../View/ui/MainWindow.ui" line="369"/>
<source>Ctrl+Shift+S</source> <source>Ctrl+Shift+S</source>
<translation>Ctrl+Shift+S</translation> <translation>Ctrl+Shift+S</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="375"/> <location filename="../View/ui/MainWindow.ui" line="374"/>
<source>Archive</source> <source>Archive</source>
<translation>Archive</translation> <translation>Archive</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="380"/> <location filename="../View/ui/MainWindow.ui" line="379"/>
<source>Pamhyr configuration</source> <source>Pamhyr configuration</source>
<translation>Configuration de PAMHYR</translation> <translation>Configuration de PAMHYR</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="697"/> <location filename="../View/ui/MainWindow.ui" line="696"/>
<source>Quit</source> <source>Quit</source>
<translation>Quitter</translation> <translation>Quitter</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="395"/> <location filename="../View/ui/MainWindow.ui" line="394"/>
<source>Ctrl+F4</source> <source>Ctrl+F4</source>
<translation>Ctrl+F4</translation> <translation>Ctrl+F4</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="772"/> <location filename="../View/ui/MainWindow.ui" line="771"/>
<source>Edit river network</source> <source>Edit river network</source>
<translation>Éditer le réseau</translation> <translation>Éditer le réseau</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="405"/> <location filename="../View/ui/MainWindow.ui" line="404"/>
<source>Edit geometry</source> <source>Edit geometry</source>
<translation>Éditer la géométrie</translation> <translation>Éditer la géométrie</translation>
</message> </message>
@ -1318,47 +1347,47 @@
<translation>Exporter la géométrie</translation> <translation>Exporter la géométrie</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="429"/> <location filename="../View/ui/MainWindow.ui" line="428"/>
<source>Run extrenal meshing tool</source> <source>Run extrenal meshing tool</source>
<translation>Lancer le mailler externe</translation> <translation>Lancer le mailler externe</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="434"/> <location filename="../View/ui/MainWindow.ui" line="433"/>
<source>choose meshing tool by reach</source> <source>choose meshing tool by reach</source>
<translation>Choisir l&apos;outil de maillage par bief</translation> <translation>Choisir l&apos;outil de maillage par bief</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="442"/> <location filename="../View/ui/MainWindow.ui" line="441"/>
<source>View meshed geometry</source> <source>View meshed geometry</source>
<translation>Voir la géométrie maillée</translation> <translation>Voir la géométrie maillée</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="450"/> <location filename="../View/ui/MainWindow.ui" line="449"/>
<source>Export mesh</source> <source>Export mesh</source>
<translation>Exporter le maillage</translation> <translation>Exporter le maillage</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="458"/> <location filename="../View/ui/MainWindow.ui" line="457"/>
<source>Delete mesh of current reach</source> <source>Delete mesh of current reach</source>
<translation>Supprimer le maillage du bief courant</translation> <translation>Supprimer le maillage du bief courant</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="466"/> <location filename="../View/ui/MainWindow.ui" line="465"/>
<source>Delete all mesh</source> <source>Delete all mesh</source>
<translation>Supprimer tout le maillage</translation> <translation>Supprimer tout le maillage</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="474"/> <location filename="../View/ui/MainWindow.ui" line="473"/>
<source>Abscisse - Cote</source> <source>Abscisse - Cote</source>
<translation>Abscisse - Cote</translation> <translation>Abscisse - Cote</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="482"/> <location filename="../View/ui/MainWindow.ui" line="481"/>
<source>XYZ</source> <source>XYZ</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="490"/> <location filename="../View/ui/MainWindow.ui" line="489"/>
<source>Numerical parameter for solvers</source> <source>Numerical parameter for solvers</source>
<translation>Paramètres numeriques des solvers</translation> <translation>Paramètres numeriques des solvers</translation>
</message> </message>
@ -1368,62 +1397,62 @@
<translation type="obsolete">Condition aux limites et apports ponctuels</translation> <translation type="obsolete">Condition aux limites et apports ponctuels</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="874"/> <location filename="../View/ui/MainWindow.ui" line="873"/>
<source>Initial conditions</source> <source>Initial conditions</source>
<translation>Conditions initiales</translation> <translation>Conditions initiales</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="514"/> <location filename="../View/ui/MainWindow.ui" line="513"/>
<source>Export initial conditions</source> <source>Export initial conditions</source>
<translation>Exporter les conditions initiales</translation> <translation>Exporter les conditions initiales</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="522"/> <location filename="../View/ui/MainWindow.ui" line="521"/>
<source>Import final state as initial condition</source> <source>Import final state as initial condition</source>
<translation>Importer un état final comme conditions initiales</translation> <translation>Importer un état final comme conditions initiales</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="527"/> <location filename="../View/ui/MainWindow.ui" line="526"/>
<source>Edit friction</source> <source>Edit friction</source>
<translation>Éditer les frottements</translation> <translation>Éditer les frottements</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="532"/> <location filename="../View/ui/MainWindow.ui" line="531"/>
<source>Edit lateral contributions</source> <source>Edit lateral contributions</source>
<translation>Éditer les apports latéraux</translation> <translation>Éditer les apports latéraux</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="540"/> <location filename="../View/ui/MainWindow.ui" line="539"/>
<source>Edit spills</source> <source>Edit spills</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="553"/> <location filename="../View/ui/MainWindow.ui" line="552"/>
<source>Edit cross building</source> <source>Edit cross building</source>
<translation>Éditer les ouvrages</translation> <translation>Éditer les ouvrages</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="712"/> <location filename="../View/ui/MainWindow.ui" line="711"/>
<source>Run solver</source> <source>Run solver</source>
<translation>Lancer un solver</translation> <translation>Lancer un solver</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="561"/> <location filename="../View/ui/MainWindow.ui" line="560"/>
<source>F5</source> <source>F5</source>
<translation>F5</translation> <translation>F5</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="566"/> <location filename="../View/ui/MainWindow.ui" line="565"/>
<source>Stop solver</source> <source>Stop solver</source>
<translation>Stopper le solveur</translation> <translation>Stopper le solveur</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="571"/> <location filename="../View/ui/MainWindow.ui" line="570"/>
<source>Display listings</source> <source>Display listings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="579"/> <location filename="../View/ui/MainWindow.ui" line="578"/>
<source>Simulation directory management</source> <source>Simulation directory management</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1438,92 +1467,92 @@
<translation>Hydrogramme</translation> <translation>Hydrogramme</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="611"/> <location filename="../View/ui/MainWindow.ui" line="610"/>
<source>Limnigram</source> <source>Limnigram</source>
<translation>Limnigramme</translation> <translation>Limnigramme</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="625"/> <location filename="../View/ui/MainWindow.ui" line="624"/>
<source>Map current reach</source> <source>Map current reach</source>
<translation>Cartographier le bief sélectionné</translation> <translation>Cartographier le bief sélectionné</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="633"/> <location filename="../View/ui/MainWindow.ui" line="632"/>
<source>Help PAMHYR</source> <source>Help PAMHYR</source>
<translation>Aide de PAMHYR</translation> <translation>Aide de PAMHYR</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="641"/> <location filename="../View/ui/MainWindow.ui" line="640"/>
<source>Help MAGE</source> <source>Help MAGE</source>
<translation>Aide de MAGE</translation> <translation>Aide de MAGE</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="646"/> <location filename="../View/ui/MainWindow.ui" line="645"/>
<source>About</source> <source>About</source>
<translation>À propos</translation> <translation>À propos</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="655"/> <location filename="../View/ui/MainWindow.ui" line="654"/>
<source>ouvrir</source> <source>ouvrir</source>
<translation>open</translation> <translation>open</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="667"/> <location filename="../View/ui/MainWindow.ui" line="666"/>
<source>Save current study</source> <source>Save current study</source>
<translation>Sauvegarder l&apos;étude</translation> <translation>Sauvegarder l&apos;étude</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="688"/> <location filename="../View/ui/MainWindow.ui" line="687"/>
<source>Ctrl+F</source> <source>Ctrl+F</source>
<translation>Ctrl+F</translation> <translation>Ctrl+F</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="392"/> <location filename="../View/ui/MainWindow.ui" line="391"/>
<source>Quit application</source> <source>Quit application</source>
<translation>Quitter l&apos;application</translation> <translation>Quitter l&apos;application</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="703"/> <location filename="../View/ui/MainWindow.ui" line="702"/>
<source>Ctrl+Q</source> <source>Ctrl+Q</source>
<translation>Ctrl+Q</translation> <translation>Ctrl+Q</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="727"/> <location filename="../View/ui/MainWindow.ui" line="726"/>
<source>stop solver</source> <source>stop solver</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="730"/> <location filename="../View/ui/MainWindow.ui" line="729"/>
<source>Interrompt la simulation en cours</source> <source>Interrompt la simulation en cours</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="733"/> <location filename="../View/ui/MainWindow.ui" line="732"/>
<source>Ctrl+C</source> <source>Ctrl+C</source>
<translation>Ctrl+C</translation> <translation>Ctrl+C</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="742"/> <location filename="../View/ui/MainWindow.ui" line="741"/>
<source>Run external meshing tool</source> <source>Run external meshing tool</source>
<translation>Lancer le mailleur externe</translation> <translation>Lancer le mailleur externe</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="745"/> <location filename="../View/ui/MainWindow.ui" line="744"/>
<source>Run meshing tool on current reach geometry</source> <source>Run meshing tool on current reach geometry</source>
<translation>Lancer le mailleur externe sur le bief selectionné</translation> <translation>Lancer le mailleur externe sur le bief selectionné</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="757"/> <location filename="../View/ui/MainWindow.ui" line="756"/>
<source>Display simulation listing</source> <source>Display simulation listing</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="760"/> <location filename="../View/ui/MainWindow.ui" line="759"/>
<source>Display current simulation listing</source> <source>Display current simulation listing</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="769"/> <location filename="../View/ui/MainWindow.ui" line="768"/>
<source>River network</source> <source>River network</source>
<translation>Réseau</translation> <translation>Réseau</translation>
</message> </message>
@ -1533,17 +1562,17 @@
<translation>Géométrie</translation> <translation>Géométrie</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="784"/> <location filename="../View/ui/MainWindow.ui" line="783"/>
<source>Edit reach geometry</source> <source>Edit reach geometry</source>
<translation>Éditer la géométrie</translation> <translation>Éditer la géométrie</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="793"/> <location filename="../View/ui/MainWindow.ui" line="792"/>
<source>Mesh</source> <source>Mesh</source>
<translation>Maillage</translation> <translation>Maillage</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="801"/> <location filename="../View/ui/MainWindow.ui" line="800"/>
<source>Boundary conditions</source> <source>Boundary conditions</source>
<translation>Conditions aux limites</translation> <translation>Conditions aux limites</translation>
</message> </message>
@ -1553,62 +1582,62 @@
<translation type="obsolete">Éditer les conditions aux limites et les apports ponctuels</translation> <translation type="obsolete">Éditer les conditions aux limites et les apports ponctuels</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="812"/> <location filename="../View/ui/MainWindow.ui" line="811"/>
<source>Lateral contribution</source> <source>Lateral contribution</source>
<translation>Contributions latérales</translation> <translation>Contributions latérales</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="815"/> <location filename="../View/ui/MainWindow.ui" line="814"/>
<source>Edit lateral contribution</source> <source>Edit lateral contribution</source>
<translation>Éditer les contributions latérales</translation> <translation>Éditer les contributions latérales</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="820"/> <location filename="../View/ui/MainWindow.ui" line="819"/>
<source>Spills</source> <source>Spills</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="823"/> <location filename="../View/ui/MainWindow.ui" line="822"/>
<source>Edit lateral spills</source> <source>Edit lateral spills</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="828"/> <location filename="../View/ui/MainWindow.ui" line="827"/>
<source>Friction</source> <source>Friction</source>
<translation>Frottements</translation> <translation>Frottements</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="836"/> <location filename="../View/ui/MainWindow.ui" line="835"/>
<source>Stricklers</source> <source>Stricklers</source>
<translation>Stricklers</translation> <translation>Stricklers</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="839"/> <location filename="../View/ui/MainWindow.ui" line="838"/>
<source>Edit the study stricklers</source> <source>Edit the study stricklers</source>
<translation>Éditer les Stricklers de l&apos;étude</translation> <translation>Éditer les Stricklers de l&apos;étude</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="844"/> <location filename="../View/ui/MainWindow.ui" line="843"/>
<source>Building</source> <source>Building</source>
<translation>Ouvrages</translation> <translation>Ouvrages</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="847"/> <location filename="../View/ui/MainWindow.ui" line="846"/>
<source>Edit building (valve, ...), singularity and pump</source> <source>Edit building (valve, ...), singularity and pump</source>
<translation>Éditer les ouvrages</translation> <translation>Éditer les ouvrages</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="856"/> <location filename="../View/ui/MainWindow.ui" line="855"/>
<source>Edit study</source> <source>Edit study</source>
<translation>Éditer l&apos;étude</translation> <translation>Éditer l&apos;étude</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="864"/> <location filename="../View/ui/MainWindow.ui" line="863"/>
<source>English</source> <source>English</source>
<translation>Anglais</translation> <translation>Anglais</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="869"/> <location filename="../View/ui/MainWindow.ui" line="868"/>
<source>French</source> <source>French</source>
<translation>Français</translation> <translation>Français</translation>
</message> </message>
@ -1813,27 +1842,27 @@
<translation>Trier les points des conditions aux limites</translation> <translation>Trier les points des conditions aux limites</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="700"/> <location filename="../View/ui/MainWindow.ui" line="699"/>
<source>Quit the application (Ctrl+Q)</source> <source>Quit the application (Ctrl+Q)</source>
<translation>Quitter l&apos;application (Ctrl+Q)</translation> <translation>Quitter l&apos;application (Ctrl+Q)</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="715"/> <location filename="../View/ui/MainWindow.ui" line="714"/>
<source>Run a solver</source> <source>Run a solver</source>
<translation>Lancer un solveur</translation> <translation>Lancer un solveur</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="796"/> <location filename="../View/ui/MainWindow.ui" line="795"/>
<source>Display meshed reach</source> <source>Display meshed reach</source>
<translation>Afficher le maillage du bief</translation> <translation>Afficher le maillage du bief</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="831"/> <location filename="../View/ui/MainWindow.ui" line="830"/>
<source>Edit friction frictions</source> <source>Edit friction frictions</source>
<translation>Éditer les frottements</translation> <translation>Éditer les frottements</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="877"/> <location filename="../View/ui/MainWindow.ui" line="876"/>
<source>Define initial conditions</source> <source>Define initial conditions</source>
<translation>Définir les conditions initiales</translation> <translation>Définir les conditions initiales</translation>
</message> </message>
@ -1858,17 +1887,17 @@
<translation>Éditer la couche sedimentaire</translation> <translation>Éditer la couche sedimentaire</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="178"/> <location filename="../View/ui/MainWindow.ui" line="177"/>
<source>&amp;Sediment</source> <source>&amp;Sediment</source>
<translation>&amp;Sédiments</translation> <translation>&amp;Sédiments</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="882"/> <location filename="../View/ui/MainWindow.ui" line="881"/>
<source>Sediment layers</source> <source>Sediment layers</source>
<translation>Couche sédimentaires</translation> <translation>Couche sédimentaires</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="890"/> <location filename="../View/ui/MainWindow.ui" line="889"/>
<source>Edit reach sediment layers</source> <source>Edit reach sediment layers</source>
<translation>Éditer les couches sédimentaires</translation> <translation>Éditer les couches sédimentaires</translation>
</message> </message>
@ -1958,109 +1987,104 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="352"/> <location filename="../View/ui/MainWindow.ui" line="351"/>
<source>Save study</source> <source>Save study</source>
<translation>Sauvegarder l&apos;étude</translation> <translation>Sauvegarder l&apos;étude</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="367"/> <location filename="../View/ui/MainWindow.ui" line="366"/>
<source>Save study as ...</source> <source>Save study as ...</source>
<translation>Sauvegarder l&apos;étude sous ...</translation> <translation>Sauvegarder l&apos;étude sous ...</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="495"/> <location filename="../View/ui/MainWindow.ui" line="494"/>
<source>Boundary conditions and punctual contributions</source> <source>Boundary conditions and punctual contributions</source>
<translation>Conditions aux limites et apports ponctuels</translation> <translation>Conditions aux limites et apports ponctuels</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="597"/> <location filename="../View/ui/MainWindow.ui" line="596"/>
<source>Visualize last results</source> <source>Visualize last results</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="600"/> <location filename="../View/ui/MainWindow.ui" line="599"/>
<source>Visualize the last results</source> <source>Visualize the last results</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="670"/> <location filename="../View/ui/MainWindow.ui" line="669"/>
<source>Save the study (Ctrl+S)</source> <source>Save the study (Ctrl+S)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="685"/> <location filename="../View/ui/MainWindow.ui" line="684"/>
<source>Close the study (Ctrl+F)</source> <source>Close the study (Ctrl+F)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="859"/> <location filename="../View/ui/MainWindow.ui" line="858"/>
<source>Edit the study metadata</source> <source>Edit the study metadata</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="885"/> <location filename="../View/ui/MainWindow.ui" line="884"/>
<source>Define sediment layers</source> <source>Define sediment layers</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="895"/> <location filename="../View/ui/MainWindow.ui" line="894"/>
<source>Doc</source> <source>Doc</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="900"/> <location filename="../View/ui/MainWindow.ui" line="899"/>
<source>Pamhyr2 developer</source> <source>Pamhyr2 developer</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="905"/> <location filename="../View/ui/MainWindow.ui" line="904"/>
<source>Mage</source> <source>Mage</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="908"/> <location filename="../View/ui/MainWindow.ui" line="907"/>
<source>Open mage documentation</source> <source>Open mage documentation</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="913"/> <location filename="../View/ui/MainWindow.ui" line="917"/>
<source>Users (pdf)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="918"/>
<source>Users (html)</source> <source>Users (html)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="923"/> <location filename="../View/ui/MainWindow.ui" line="922"/>
<source>Developers (pdf)</source> <source>Developers (pdf)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="928"/> <location filename="../View/ui/MainWindow.ui" line="927"/>
<source>Developers (html)</source> <source>Developers (html)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="933"/> <location filename="../View/ui/MainWindow.ui" line="932"/>
<source>Reservoirs</source> <source>Reservoirs</source>
<translation>Casiers</translation> <translation>Casiers</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="936"/> <location filename="../View/ui/MainWindow.ui" line="935"/>
<source>Edit reservoirs</source> <source>Edit reservoirs</source>
<translation>Éditer les casiers</translation> <translation>Éditer les casiers</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="133"/> <location filename="../View/ui/GeometryReach.ui" line="133"/>
<source>import</source> <source>import</source>
<translation>Importer</translation> <translation type="obsolete">Importer</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="141"/> <location filename="../View/ui/GeometryReach.ui" line="141"/>
<source>export</source> <source>export</source>
<translation>Exporter</translation> <translation type="obsolete">Exporter</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="153"/> <location filename="../View/ui/GeometryReach.ui" line="153"/>
@ -2218,7 +2242,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="804"/> <location filename="../View/ui/MainWindow.ui" line="803"/>
<source>Edit boundary conditions and punctual contributions</source> <source>Edit boundary conditions and punctual contributions</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2228,7 +2252,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="944"/> <location filename="../View/ui/MainWindow.ui" line="943"/>
<source>Edit hydraulic structures</source> <source>Edit hydraulic structures</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2283,22 +2307,37 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/GeometryReach.ui" line="233"/> <location filename="../View/ui/MainWindow.ui" line="951"/>
<source>meshing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../View/ui/MainWindow.ui" line="952"/>
<source>Open results from file</source> <source>Open results from file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="545"/> <location filename="../View/ui/MainWindow.ui" line="912"/>
<source>Édition des Tronçons</source> <source>Users (wiki)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/ui/MainWindow.ui" line="658"/> <location filename="../View/ui/GeometryReach.ui" line="133"/>
<source>Import</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../View/ui/GeometryReach.ui" line="141"/>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../View/ui/GeometryReach.ui" line="233"/>
<source>Meshing</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<location filename="../View/ui/MainWindow.ui" line="544"/>
<source>Édition des Tronçons</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<location filename="../View/ui/MainWindow.ui" line="657"/>
<source>Ouvrir une étude</source> <source>Ouvrir une étude</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2355,11 +2394,6 @@
<source>Kp (m)</source> <source>Kp (m)</source>
<translation>Pk (m)</translation> <translation>Pk (m)</translation>
</message> </message>
<message>
<location filename="../View/Geometry/PlotAC.py" line="197"/>
<source>Profil suivant</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<location filename="../View/Geometry/mainwindow_ui_reach.py" line="334"/> <location filename="../View/Geometry/mainwindow_ui_reach.py" line="334"/>
<source>Name</source> <source>Name</source>
@ -2403,68 +2437,58 @@
<message> <message>
<location filename="../View/Geometry/PlotAC.py" line="183"/> <location filename="../View/Geometry/PlotAC.py" line="183"/>
<source>Transverse abscissa (m)</source> <source>Transverse abscissa (m)</source>
<translation type="unfinished"></translation> <translation type="unfinished">Abscisse en travers (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/PlotAC.py" line="89"/> <location filename="../View/Geometry/PlotAC.py" line="193"/>
<source>Previous cross-section</source> <source>Previous cross-section</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/PlotAC.py" line="91"/> <location filename="../View/Geometry/PlotAC.py" line="195"/>
<source>Cross-section</source> <source>Cross-section</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/PlotAC.py" line="92"/> <location filename="../View/Geometry/PlotAC.py" line="197"/>
<source>Next cross-section</source> <source>Next cross-section</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../View/Geometry/PlotAC.py" line="193"/>
<source>Profil précédent</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../View/Geometry/PlotAC.py" line="195"/>
<source>Profil sélectionné</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>Network</name> <name>Network</name>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="816"/> <location filename="../View/Network/GraphWidget.py" line="817"/>
<source>Add node</source> <source>Add node</source>
<translation>Ajouter un nœud</translation> <translation>Ajouter un nœud</translation>
</message> </message>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="824"/> <location filename="../View/Network/GraphWidget.py" line="825"/>
<source>Delete the node</source> <source>Delete the node</source>
<translation>Supprimer un nœud</translation> <translation>Supprimer un nœud</translation>
</message> </message>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="825"/> <location filename="../View/Network/GraphWidget.py" line="826"/>
<source>Disable the node</source> <source>Disable the node</source>
<translation>Désactiver un nœud</translation> <translation>Désactiver un nœud</translation>
</message> </message>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="833"/> <location filename="../View/Network/GraphWidget.py" line="834"/>
<source>Delete the reach</source> <source>Delete the reach</source>
<translation>Supprimer un bief</translation> <translation>Supprimer un bief</translation>
</message> </message>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="836"/> <location filename="../View/Network/GraphWidget.py" line="837"/>
<source>Disable the reach</source> <source>Disable the reach</source>
<translation>Désactiver un bief</translation> <translation>Désactiver un bief</translation>
</message> </message>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="839"/> <location filename="../View/Network/GraphWidget.py" line="840"/>
<source>Enable the reach</source> <source>Enable the reach</source>
<translation>Activer un bief</translation> <translation>Activer un bief</translation>
</message> </message>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="842"/> <location filename="../View/Network/GraphWidget.py" line="843"/>
<source>Reverse the reach orientation</source> <source>Reverse the reach orientation</source>
<translation>Inverser l&apos;orientation du bief</translation> <translation>Inverser l&apos;orientation du bief</translation>
</message> </message>
@ -2569,9 +2593,14 @@
</message> </message>
<message> <message>
<location filename="../View/Results/PlotH.py" line="79"/> <location filename="../View/Results/PlotH.py" line="79"/>
<source>Discharge (m³/s)</source> <source>Discharge (m&#xb3;/s)</source>
<translation type="obsolete">Débit (m³/s)</translation> <translation type="obsolete">Débit (m³/s)</translation>
</message> </message>
<message encoding="UTF-8">
<location filename="../View/Results/PlotH.py" line="87"/>
<source>Discharge (m³/s)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>SedimentLayers</name> <name>SedimentLayers</name>
@ -2831,7 +2860,7 @@
<message> <message>
<location filename="../View/SolverParameters/translate.py" line="133"/> <location filename="../View/SolverParameters/translate.py" line="133"/>
<source>Use Mage internal initialization (Y/N)</source> <source>Use Mage internal initialization (Y/N)</source>
<translation>Utiliser l&apos;initialisation interne de mage (Y/N)</translation> <translation>Utiliser l&apos;initialisation interne de mage (O/N)</translation>
</message> </message>
<message> <message>
<location filename="../View/SolverParameters/translate.py" line="137"/> <location filename="../View/SolverParameters/translate.py" line="137"/>