mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Merge branch 'temperature_test' into dev_dylan
This commit is contained in:
commit
435ccd1f2d
4 files changed
+433
-256
No files matched your search
@@ -216,6 +216,9 @@ class Parameter(SQLSubModel):
|
||||
return new
|
||||
|
||||
def _db_save(self, execute, data=None):
|
||||
if not self.must_be_saved():
|
||||
return True
|
||||
|
||||
ind = data["ind"]
|
||||
solver = data["solver"]
|
||||
|
||||
|
||||
+8
-3
@@ -65,6 +65,8 @@ class Mage(CommandLineSolver):
|
||||
self._cmd_solver = "@path @input -o @output"
|
||||
self._cmd_output = ""
|
||||
|
||||
self._reset_node_names()
|
||||
|
||||
@classmethod
|
||||
def default_parameters(cls):
|
||||
lst = super(Mage, cls).default_parameters()
|
||||
@@ -125,9 +127,11 @@ class Mage(CommandLineSolver):
|
||||
|
||||
_l_alph = len(_alph)
|
||||
|
||||
_nodes_cnt = 0
|
||||
_nodes_names = {}
|
||||
_nodes_views = set()
|
||||
def _reset_node_names(self):
|
||||
"""Reset the node-name registry for a new export."""
|
||||
self._nodes_cnt = 0
|
||||
self._nodes_names = {}
|
||||
self._nodes_views = set()
|
||||
|
||||
def get_reach_name(self, reach):
|
||||
index = self._study.river.get_edge_id(reach) + 1
|
||||
@@ -1005,6 +1009,7 @@ class Mage8(Mage):
|
||||
@timer
|
||||
def export(self, study, repertory, qlog=None, name="0"):
|
||||
self._study = study
|
||||
self._reset_node_names()
|
||||
name = study.name.replace(" ", "_")
|
||||
|
||||
# Define GRA file name
|
||||
|
||||
@@ -82,7 +82,9 @@ class SelectSolverWindow(PamhyrDialog):
|
||||
# solvers = self._config.solvers
|
||||
# solvers mage
|
||||
solvers = list(filter(
|
||||
lambda x: "adists" not in x._type, self._config.solvers
|
||||
lambda x: "adists" not in x._type
|
||||
and "adistt" not in x._type,
|
||||
self._config.solvers
|
||||
))
|
||||
solvers_name = list(
|
||||
map(
|
||||
|
||||
+419
-252
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user