Merge branch 'hydraulics-structure' of...

Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure

src/Model/SolverParameters/SolverParametersList.py

@@ -142,6 +142,10 @@ class SolverParametersList(PamhyrModelList):
                         insert(v[0], v[1], ind)
                         ind += 1
 
+                    if int(release) < 7:
+                        insert("mage_init_internal","N",ind)
+                        ind += 1
+
                     new = [
                         ("mage_sediment_masse_volumique", "2650.0"),
                         ("mage_sediment_angle_repos", "40.0"),

src/Model/Study.py

@@ -41,7 +41,7 @@ class Study(SQLModel):
 
     def __init__(self, filename=None, init_new=True):
         # Metadata
-        self._version = "0.0.6"
+        self._version = "0.0.7"
         self.creation_date = datetime.now()
         self.last_modification_date = datetime.now()
         self.last_save_date = datetime.now()

src/Solver/Mage.py

@@ -36,7 +36,7 @@ def mage_file_open(filepath, mode):
 
     if "w" in mode:
         # Write header
-        f.write("* This file is generate by PAMHYR, please don't modify\n")
+        f.write("* This file is generated by PAMHYR, please don't modify\n")
 
     return f
 
@@ -81,6 +81,7 @@ class Mage(CommandLineSolver):
             ("mage_compute_reach_volume_balance", "y"),
             ("mage_max_reach_volume_balance", "0.001"),
             ("mage_min_reach_volume_to_check", "1000.0"),
+            ("mage_init_internal", " "),
         ]
 
         return lst
@@ -718,8 +719,11 @@ class Mage8(Mage):
                 if name in ["command_line_arguments"]:
                     continue
 
-                if name == "mage_compute_reach_volume_balance":
-                    value = "O" if value == "y" else "N"
+                if name == "compute_reach_volume_balance":
+                    value = "O" if value.lower() == "y" else "N"
+
+                if name == "init_internal":
+                    value = "p" if value.lower() in ["y","yes","true"] else ""
 
                 f.write(f"{name} {value}\n")
 

src/View/SolverParameters/translate.py

@@ -129,4 +129,7 @@ class ParamTranslate(PamhyrTranslate):
             "mage_min_reach_volume_to_check":
             _translate("SolverParameters",
                        "Minimum reach volume to check"),
+            "mage_init_internal":
+            _translate("SolverParameters",
+                       "Use Mage internal initialization (Y/N)"),
         }