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

Solver: Mage: Fix empty HS error and space in input param.

setup.py
Pierre-Antoine Rouby 2024-01-17 11:23:49 +01:00
parent 870cba5005
commit e86111bd7a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Solver/CommandLine.py
View File

@ -148,7 +148,7 @@ class CommandLineSolver(AbstractSolver):
""" """
cmd = cmd.replace("@install_dir", self._install_dir()) cmd = cmd.replace("@install_dir", self._install_dir())
cmd = cmd.replace("@path", "\"" + path + "\"") cmd = cmd.replace("@path", "\"" + path + "\"")
cmd = cmd.replace("@input", self.input_param()) cmd = cmd.replace("@input", self.input_param().replace(" ", "_"))
cmd = cmd.replace("@output", self.output_param()) cmd = cmd.replace("@output", self.output_param())
cmd = cmd.replace("@dir", self._process.workingDirectory()) cmd = cmd.replace("@dir", self._process.workingDirectory())
cmd = cmd.replace("@args", " ".join(self.cmd_args(study))) cmd = cmd.replace("@args", " ".join(self.cmd_args(study)))

3
src/Solver/Mage.py
View File

@ -462,6 +462,9 @@ class Mage(CommandLineSolver):
files.append(f"{name}.SIN") files.append(f"{name}.SIN")
for hs in hydraulic_structures: for hs in hydraulic_structures:
if hs.input_reach is None:
continue
if not hs.input_reach.is_enable(): if not hs.input_reach.is_enable():
continue continue