Commit 3c9eccdf authored by Pierre-Antoine Rouby's avatar Pierre-Antoine Rouby
Browse files

Solver: Mage: Fix <list>.node error.

Showing with 8 additions and 2 deletions
+8 -2
...@@ -234,7 +234,7 @@ class Mage(CommandLineSolver): ...@@ -234,7 +234,7 @@ class Mage(CommandLineSolver):
def _export_BC(self, t, bounds, repertory, qlog, name="0"): def _export_BC(self, t, bounds, repertory, qlog, name="0"):
files = [] files = []
if len(bounds) == 0 or bounds.node is None: if len(bounds) == 0:
return files return files
if qlog is not None: if qlog is not None:
...@@ -244,6 +244,9 @@ class Mage(CommandLineSolver): ...@@ -244,6 +244,9 @@ class Mage(CommandLineSolver):
files.append(f"{name}.{t}") files.append(f"{name}.{t}")
for bound in bounds: for bound in bounds:
if bound.node is None:
continue
name = f"{bound.node.id:3}".replace(" ", "x") name = f"{bound.node.id:3}".replace(" ", "x")
f.write(f"* {bound.node.name} ({name}) {bound.bctype}\n") f.write(f"* {bound.node.name} ({name}) {bound.bctype}\n")
f.write(f"${name}\n") f.write(f"${name}\n")
...@@ -419,7 +422,7 @@ class Mage(CommandLineSolver): ...@@ -419,7 +422,7 @@ class Mage(CommandLineSolver):
files = [] files = []
reservoirs = study.river.reservoir.lst reservoirs = study.river.reservoir.lst
if len(reservoirs) == 0 or reservoirs.node is None: if len(reservoirs) == 0:
return files return files
if qlog is not None: if qlog is not None:
...@@ -429,6 +432,9 @@ class Mage(CommandLineSolver): ...@@ -429,6 +432,9 @@ class Mage(CommandLineSolver):
files.append(f"{name}.CAS") files.append(f"{name}.CAS")
for reservoir in reservoirs: for reservoir in reservoirs:
if reservoir.node is None:
continue
reservoir.sort() reservoir.sort()
node = reservoir.node node = reservoir.node
name = f"{node.id:3}".replace(" ", "x") name = f"{node.id:3}".replace(" ", "x")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment