mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Solver: Mage: Fix mage export.
This commit is contained in:
1 parent
645a76b0e8
commit
420d766ae5
1 file changed
+5
-17
+5
-17
@@ -250,12 +250,7 @@ class Mage(CommandLineSolver):
|
||||
|
||||
# Generate sediment additional data if available
|
||||
sediment = ""
|
||||
if profile.sl is None:
|
||||
return
|
||||
|
||||
if profile.sl.is_deleted():
|
||||
return
|
||||
|
||||
if profile.sl is not None and not profile.sl.is_deleted():
|
||||
if not any(filter(lambda f: ".GRA" in f, files)):
|
||||
files.append(self._gra_file)
|
||||
|
||||
@@ -283,12 +278,8 @@ class Mage(CommandLineSolver):
|
||||
# Generate sediment additional data if available
|
||||
sediment = ""
|
||||
prev = point.z
|
||||
if point.sl is None:
|
||||
return
|
||||
|
||||
if point.sl.is_deleted():
|
||||
return
|
||||
|
||||
if point.sl is not None and not point.sl.is_deleted():
|
||||
# Number of layers
|
||||
nl = len(point.sl)
|
||||
sediment = f"{nl:>3}"
|
||||
@@ -701,18 +692,15 @@ class Mage(CommandLineSolver):
|
||||
|
||||
nb_cv = 0
|
||||
for hs in hydraulic_structures:
|
||||
if not hs.enabled or hs.is_deleted():
|
||||
continue
|
||||
|
||||
if hs.input_reach is None:
|
||||
continue
|
||||
|
||||
if not hs.input_reach.is_enable() or hs.input_reach.is_deleted():
|
||||
continue
|
||||
|
||||
if not hs.enabled:
|
||||
continue
|
||||
|
||||
if hs.is_deleted():
|
||||
continue
|
||||
|
||||
for bhs in hs.basic_structures:
|
||||
if bhs.enabled:
|
||||
logger.info(bhs._type)
|
||||
|
||||
Reference in new issue
Block a user