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

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

setup.py
Pierre-Antoine Rouby 2023-12-18 10:14:24 +01:00
parent ffbd2e2413 9c0ffa8356
commit 6b232d2971
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/SolverParameters/SolverParametersList.py
View File

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

2
src/Model/Study.py
View File

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

10
src/Solver/Mage.py
View File

@ -36,7 +36,7 @@ def mage_file_open(filepath, mode):
if "w" in mode: if "w" in mode:
# Write header # 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 return f
@ -81,6 +81,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", " "),
] ]
return lst return lst
@ -718,8 +719,11 @@ class Mage8(Mage):
if name in ["command_line_arguments"]: if name in ["command_line_arguments"]:
continue continue
if name == "mage_compute_reach_volume_balance": if name == "compute_reach_volume_balance":
value = "O" if value == "y" else "N" 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") f.write(f"{name} {value}\n")

3
src/View/SolverParameters/translate.py
View File

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