Translate: Retranslate flow to discharge.

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":
+        elif key == "discharge":
-            val = self._flow
+            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":
+        elif key == "discharge":
-            self._flow = float(value)
+            self._discharge = float(value)
-            self._update_from_flow()
+            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):
+    def get_discharge(self):
-        return self._data_get("flow")
+        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

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}"
 

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)")
 }