mirror of https://gitlab.com/pamhyr/pamhyr2
Mage: reset node name registry for each export + display only Mage/Rubar solver in hydraulic solvers list
parent
0e1264ca4f
commit
7b2c276643
|
|
@ -65,6 +65,8 @@ class Mage(CommandLineSolver):
|
||||||
self._cmd_solver = "@path @input -o @output"
|
self._cmd_solver = "@path @input -o @output"
|
||||||
self._cmd_output = ""
|
self._cmd_output = ""
|
||||||
|
|
||||||
|
self._reset_node_names()
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def default_parameters(cls):
|
def default_parameters(cls):
|
||||||
lst = super(Mage, cls).default_parameters()
|
lst = super(Mage, cls).default_parameters()
|
||||||
|
|
@ -125,9 +127,11 @@ class Mage(CommandLineSolver):
|
||||||
|
|
||||||
_l_alph = len(_alph)
|
_l_alph = len(_alph)
|
||||||
|
|
||||||
_nodes_cnt = 0
|
def _reset_node_names(self):
|
||||||
_nodes_names = {}
|
"""Reset the node-name registry for a new export."""
|
||||||
_nodes_views = set()
|
self._nodes_cnt = 0
|
||||||
|
self._nodes_names = {}
|
||||||
|
self._nodes_views = set()
|
||||||
|
|
||||||
def get_reach_name(self, reach):
|
def get_reach_name(self, reach):
|
||||||
index = self._study.river.get_edge_id(reach) + 1
|
index = self._study.river.get_edge_id(reach) + 1
|
||||||
|
|
@ -1005,6 +1009,7 @@ class Mage8(Mage):
|
||||||
@timer
|
@timer
|
||||||
def export(self, study, repertory, qlog=None, name="0"):
|
def export(self, study, repertory, qlog=None, name="0"):
|
||||||
self._study = study
|
self._study = study
|
||||||
|
self._reset_node_names()
|
||||||
name = study.name.replace(" ", "_")
|
name = study.name.replace(" ", "_")
|
||||||
|
|
||||||
# Define GRA file name
|
# Define GRA file name
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,9 @@ class SelectSolverWindow(PamhyrDialog):
|
||||||
# solvers = self._config.solvers
|
# solvers = self._config.solvers
|
||||||
# solvers mage
|
# solvers mage
|
||||||
solvers = list(filter(
|
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(
|
solvers_name = list(
|
||||||
map(
|
map(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue