From e86111bd7a325a1e635339094f207457cd4ad755 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 17 Jan 2024 11:23:49 +0100
Subject: [PATCH] Solver: Mage: Fix empty HS error and space in input param.
---
src/Solver/CommandLine.py | 2 +-
src/Solver/Mage.py | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/Solver/CommandLine.py b/src/Solver/CommandLine.py
index 2a6d9ec8..07598c18 100644
--- a/src/Solver/CommandLine.py
+++ b/src/Solver/CommandLine.py
@@ -148,7 +148,7 @@ class CommandLineSolver(AbstractSolver):
"""
cmd = cmd.replace("@install_dir", self._install_dir())
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("@dir", self._process.workingDirectory())
cmd = cmd.replace("@args", " ".join(self.cmd_args(study)))
diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py
index 00d44098..444448c1 100644
--- a/src/Solver/Mage.py
+++ b/src/Solver/Mage.py
@@ -462,6 +462,9 @@ class Mage(CommandLineSolver):
files.append(f"{name}.SIN")
for hs in hydraulic_structures:
+ if hs.input_reach is None:
+ continue
+
if not hs.input_reach.is_enable():
continue
--
GitLab