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

Sediment: Add SL to geometry into DB and minor change.

mesh
Pierre-Antoine Rouby 2023-08-21 10:55:27 +02:00
parent 768a0b9f14
commit cd07f3aa8d
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Geometry/PointXYZ.py
View File

@ -44,7 +44,9 @@ class PointXYZ(Point, SQLSubModel):
y INTEGER NOT NULL, y INTEGER NOT NULL,
z INTEGER NOT NULL, z INTEGER NOT NULL,
profile INTEGER NOT NULL, profile INTEGER NOT NULL,
FOREIGN KEY(profile) REFERENCES profileXYZ(id) sl INTEGER,
FOREIGN KEY(profile) REFERENCES profileXYZ(id),
FOREIGN KEY(sl) REFERENCES sedimentary_layer(id)
) )
""") """)

4
src/Model/Geometry/ProfileXYZ.py
View File

@ -76,7 +76,9 @@ class ProfileXYZ(Profile, SQLSubModel):
num INTEGER NOT NULL, num INTEGER NOT NULL,
code1 INTEGER NOT NULL, code1 INTEGER NOT NULL,
code2 INTEGER NOT NULL, code2 INTEGER NOT NULL,
FOREIGN KEY(reach) REFERENCES river_reach(id) sl INTEGER,
FOREIGN KEY(reach) REFERENCES river_reach(id),
FOREIGN KEY(sl) REFERENCES sedimentary_layer(id)
) )
""") """)

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

@ -93,6 +93,13 @@ class SolverParametersList(SQLSubModel):
@classmethod @classmethod
def _sql_update(cls, execute, version): def _sql_update(cls, execute, version):
major, minor, release = version.strip().split(".")
if major == minor == "0":
if int(release) < 3:
execute(f"UPDATE solver_parameter SET name='mage_implicitation' WHERE name='mage_implication'")
execute(f"UPDATE solver_parameter SET name='mage_iteration_type' WHERE name='mage_iter_type'")
return cls._update_submodel(execute, version) return cls._update_submodel(execute, version)
@classmethod @classmethod

2
src/Model/Study.py
View File

@ -40,7 +40,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.2" self._version = "0.0.3"
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()

4
src/Solver/Mage.py
View File

@ -61,11 +61,11 @@ class Mage(AbstractSolver):
("mage_timestep_tra", "3600"), ("mage_timestep_tra", "3600"),
("mage_timestep_bin", "0"), ("mage_timestep_bin", "0"),
# ("mage_timestep_melissa", "0"), # ("mage_timestep_melissa", "0"),
("mage_implication", "0.70"), ("mage_implicitation", "0.70"),
("mage_continuity_discretization", "S"), ("mage_continuity_discretization", "S"),
("mage_qsj_discretization", "B"), ("mage_qsj_discretization", "B"),
("mage_stop_criterion_iterations", "R"), ("mage_stop_criterion_iterations", "R"),
("mage_iter_type", "0"), ("mage_iteration_type", "0"),
("mage_smooth_coef", "0"), ("mage_smooth_coef", "0"),
("mage_cfl_max", "-1."), ("mage_cfl_max", "-1."),
("mage_min_height", "0.1"), ("mage_min_height", "0.1"),

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

@ -59,11 +59,11 @@ def init():
"mage_min_timestep": _translate("SolverParameters", "Minimum timestep (second)"), "mage_min_timestep": _translate("SolverParameters", "Minimum timestep (second)"),
"mage_timestep_tra": _translate("SolverParameters", "Time step of writing on .TRA"), "mage_timestep_tra": _translate("SolverParameters", "Time step of writing on .TRA"),
"mage_timestep_bin": _translate("SolverParameters", "Time step of writing on .BIN"), "mage_timestep_bin": _translate("SolverParameters", "Time step of writing on .BIN"),
"mage_implication": _translate("SolverParameters", "Implicitation parameter"), "mage_implicitation": _translate("SolverParameters", "Implicitation parameter"),
"mage_continuity_discretization": _translate("SolverParameters", "Continuity discretization type (S/L)"), "mage_continuity_discretization": _translate("SolverParameters", "Continuity discretization type (S/L)"),
"mage_qsj_discretization": _translate("SolverParameters", "QSJ discretization (A/B)"), "mage_qsj_discretization": _translate("SolverParameters", "QSJ discretization (A/B)"),
"mage_stop_criterion_iterations": _translate("SolverParameters", "Stop criterion iterations (G/A/R)"), "mage_stop_criterion_iterations": _translate("SolverParameters", "Stop criterion iterations (G/A/R)"),
"mage_iter_type": _translate("SolverParameters", "Iteration type"), "mage_iteration_type": _translate("SolverParameters", "Iteration type"),
"mage_smooth_coef": _translate("SolverParameters", "Smoothing coefficient"), "mage_smooth_coef": _translate("SolverParameters", "Smoothing coefficient"),
"mage_cfl_max": _translate("SolverParameters", "Maximun accepted number of CFL"), "mage_cfl_max": _translate("SolverParameters", "Maximun accepted number of CFL"),
"mage_min_height": _translate("SolverParameters", "Minimum water height (meter)"), "mage_min_height": _translate("SolverParameters", "Minimum water height (meter)"),