From ffbd2e24131f5b610d18fef99d9b6c4c0b3cc677 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 13 Dec 2023 16:38:09 +0100
Subject: [PATCH] Mage: Minor code style refactoring.
---
src/Solver/Mage.py | 53 ++++++++++++++++++++++------------------------
1 file changed, 25 insertions(+), 28 deletions(-)
diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py
index 4b989720..84eae693 100644
--- a/src/Solver/Mage.py
+++ b/src/Solver/Mage.py
@@ -442,14 +442,9 @@ class Mage(CommandLineSolver):
sin_dict = {
"ND": "*",
- "S1": "D",
- "S2": "T",
- "S3": "T",
- "OR": "O",
- "OC": "B",
- "OV": "F",
- "V1": "V",
- "V2": "W",
+ "S1": "D", "S2": "T", "S3": "T",
+ "OR": "O", "OC": "B", "OV": "F",
+ "V1": "V", "V2": "W",
"BO": "A",
"UD": "X",
"PO": "P",
@@ -466,32 +461,34 @@ class Mage(CommandLineSolver):
files.append(f"{name}.SIN")
for hs in hydraulic_structures:
- if hs.input_reach.is_enable:
- f.write(
- '* ouvrage au pk ' +
- f"{hs.input_kp:>12.1f}" + ' ' +
- hs.name + '\n'
- )
+ if not hs.input_reach.is_enable():
+ continue
- for bhs in hs.basic_structures:
- reach_id = study.river.get_edge_id(hs.input_reach) + 1
- param_str = ' '.join(
- [
- f'{p:>10.3f}'
- for p in self._export_SIN_parameters(bhs)
- ]
- )
+ f.write(
+ '* ouvrage au pk ' +
+ f"{hs.input_kp:>12.1f}" + ' ' +
+ hs.name + '\n'
+ )
- f.write(
- f"{sin_dict[bhs._type]} " +
- f"{reach_id} {hs.input_kp:>12.3f} {param_str} " +
- f"{bhs.name}\n"
- )
+ for bhs in hs.basic_structures:
+ reach_id = study.river.get_edge_id(hs.input_reach) + 1
+ param_str = ' '.join(
+ [
+ f'{p:>10.3f}'
+ for p in self._export_SIN_parameters(bhs)
+ ]
+ )
+
+ f.write(
+ f"{sin_dict[bhs._type]} " +
+ f"{reach_id} {hs.input_kp:>12.3f} {param_str} " +
+ f"{bhs.name}\n"
+ )
return files
def _export_SIN_parameters(self, bhs):
- res = [9999.999]*5
+ res = [9999.999] * 5
if len(bhs) == 5:
res = self._export_SIN_parameters_5(bhs)
--
GitLab