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

Solver, Meshing: Mage: Add some exit condition.

setup.py
Pierre-Antoine Rouby 2024-01-22 10:53:00 +01:00
parent 19ad9c4d1a
commit 03c3c37435
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Meshing/Mage.py
View File

@ -182,6 +182,9 @@ class MeshingWithMage(AMeshingTool):
########### ###########
def meshing(self, reach, step: float = 50): def meshing(self, reach, step: float = 50):
if reach is None or len(reach.profiles) == 0:
return reach
with tempfile.TemporaryDirectory() as tmp: with tempfile.TemporaryDirectory() as tmp:
st_file = self.export_reach_to_st(reach, tmp) st_file = self.export_reach_to_st(reach, tmp)
m_file = st_file.rsplit(".ST", 1)[0] + ".M" m_file = st_file.rsplit(".ST", 1)[0] + ".M"

7
src/Solver/Mage.py
View File

@ -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: if len(bounds) == 0 or bounds.node is None:
return files return files
if qlog is not None: if qlog is not None:
@ -351,6 +351,9 @@ class Mage(CommandLineSolver):
frictions = edge.frictions frictions = edge.frictions
for friction in frictions.frictions: for friction in frictions.frictions:
if friction.begin_strickler is None:
continue
num = f"{id:>3}" num = f"{id:>3}"
bkp = f"{friction.begin_kp:>10.3f}" bkp = f"{friction.begin_kp:>10.3f}"
ekp = f"{friction.end_kp:>10.3f}" ekp = f"{friction.end_kp:>10.3f}"
@ -416,7 +419,7 @@ class Mage(CommandLineSolver):
files = [] files = []
reservoirs = study.river.reservoir.lst reservoirs = study.river.reservoir.lst
if len(reservoirs) == 0: if len(reservoirs) == 0 or reservoirs.node is None:
return files return files
if qlog is not None: if qlog is not None: