mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Translate: Retranslate flow to discharge.
This commit is contained in:
1 parent
1e8d5c8f4f
commit
28e8cb81c6
4 files changed
+12
-12
No files matched your search
@@ -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
|
||||
Reference in new issue
Block a user