From 07761716e49c36c33ecc24e10ec628c4cd24c0d5 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 24 Apr 2024 09:33:33 +0200
Subject: [PATCH] Solver: Mage: Check is node is enable before BC export.
---
src/Solver/Mage.py | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py
index f8b664fd..59e0b8b7 100644
--- a/src/Solver/Mage.py
+++ b/src/Solver/Mage.py
@@ -282,6 +282,9 @@ class Mage(CommandLineSolver):
if bound.node is None:
continue
+ if not study.river.is_enable_node(bound.node):
+ continue
+
if bound.bctype == "ZD":
AVA.append(bound)
elif bound.bctype == "TD" or bound.bctype == "PC":
@@ -357,13 +360,7 @@ class Mage(CommandLineSolver):
with mage_file_open(os.path.join(repertory, f"{name}.RUG"), "w+") as f:
files.append(f"{name}.RUG")
- edges = study.river.edges()
- edges = list(
- filter(
- lambda e: e.is_enable(),
- edges
- )
- )
+ edges = study.river.enable_edges()
id = 1
for edge in edges:
--
GitLab