From 28e8cb81c6624b909f9c6813d48d181045c1f561 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Fri, 23 Jun 2023 14:42:19 +0200
Subject: [PATCH] Translate: Retranslate flow to discharge.
---
.../InitialConditions/InitialConditions.py | 20 +++++++++----------
src/Solver/Mage.py | 2 +-
.../{PlotFlow.py => PlotDischarge.py} | 0
src/View/InitialConditions/translate.py | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
rename src/View/InitialConditions/{PlotFlow.py => PlotDischarge.py} (100%)
diff --git a/src/Model/InitialConditions/InitialConditions.py b/src/Model/InitialConditions/InitialConditions.py
index 32a2bd68..2620e171 100644
--- a/src/Model/InitialConditions/InitialConditions.py
+++ b/src/Model/InitialConditions/InitialConditions.py
@@ -16,7 +16,7 @@ class Data(object):
self._comment = ""
self._kp = 0.0
- self._flow = 0.0
+ self._discharge = 0.0
self._speed = 0.0
self._elevation = 0.0
self._height = 0.0
@@ -36,8 +36,8 @@ class Data(object):
val = self._kp
elif key == "speed":
val = self._speed
- elif key == "flow":
- val = self._flow
+ elif key == "discharge":
+ val = self._discharge
elif key == "elevation":
val = self._elevation
elif key == "height":
@@ -66,7 +66,7 @@ class Data(object):
min = self._update_get_min()
self._elevation = self._height + min
- def _update_from_flow(self):
+ def _update_from_discharge(self):
min = self._update_get_min()
print("TODO")
@@ -81,9 +81,9 @@ class Data(object):
elif key == "speed":
self._speed = float(value)
# Not supposed to be modified
- elif key == "flow":
- self._flow = float(value)
- self._update_from_flow()
+ elif key == "discharge":
+ self._discharge = float(value)
+ self._update_from_discharge()
elif key == "elevation":
self._elevation = float(value)
self._update_from_elevation()
@@ -178,8 +178,8 @@ class InitialConditions(object):
def get_elevation(self):
return self._data_get("elevation")
- def get_flow(self):
- return self._data_get("flow")
+ def get_discharge(self):
+ return self._data_get("discharge")
def _sort_by_z_and_kp(self, profiles):
profiles.sort(
@@ -229,4 +229,4 @@ class InitialConditions(object):
def generate_discharge(self, discharge:float):
for d in self._data:
- d['flow'] = discharge
+ d['discharge'] = discharge
diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py
index 54a0eb25..b7ddba43 100644
--- a/src/Solver/Mage.py
+++ b/src/Solver/Mage.py
@@ -207,7 +207,7 @@ class Mage(AbstractSolver):
for d in data:
IR = f"{id:>3}"
IS = f"{id_sec:>3}"
- discharge = f"{d['flow']:>10.5f}"
+ discharge = f"{d['discharge']:>10.5f}"
elevation = f"{d['elevation']:>11.6f}"
kp = f"{d['kp']:>9.2f}"
diff --git a/src/View/InitialConditions/PlotFlow.py b/src/View/InitialConditions/PlotDischarge.py
similarity index 100%
rename from src/View/InitialConditions/PlotFlow.py
rename to src/View/InitialConditions/PlotDischarge.py
diff --git a/src/View/InitialConditions/translate.py b/src/View/InitialConditions/translate.py
index 21b4d286..18090daf 100644
--- a/src/View/InitialConditions/translate.py
+++ b/src/View/InitialConditions/translate.py
@@ -9,7 +9,7 @@ table_headers = {
"comment": _translate("LateralContribution", "Comment"),
"kp": _translate("LateralContribution", "KP (m)"),
"speed": _translate("LateralContribution", "Speed (m/s)"),
- "flow": _translate("LateralContribution", "Flow (m³/s)"),
+ "discharge": _translate("LateralContribution", "Discharge (m³/s)"),
"elevation": _translate("LateralContribution", "Elevation (m)"),
"height": _translate("LateralContribution", "Height (m)")
}
--
GitLab