parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

work on auto bondary and init cond

terraz_dev
Theophile Terraz 2025-05-26 14:53:47 +02:00
parent bb3dadc0c7
commit 5aef0bbf3c
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Model/InitialConditions/InitialConditions.py
View File

@ -382,6 +382,8 @@ class InitialConditions(SQLSubModel):
self._data = [] self._data = []
for profile in profiles: for profile in profiles:
width = profile.wet_width(profile.z_min() + height) width = profile.wet_width(profile.z_min() + height)
area = profile.wet_area(profile.z_min() + height)
radius = profile.wet_radius(profile.z_min() + height)
frictions = self._reach.frictions.frictions frictions = self._reach.frictions.frictions
strickler = None strickler = None
if frictions is not None: if frictions is not None:
@ -396,10 +398,13 @@ class InitialConditions(SQLSubModel):
discharge = data_discharge[profile.rk] discharge = data_discharge[profile.rk]
else: else:
discharge = ( discharge = (
((width * 0.8) #((width * 0.8)
* strickler #* strickler
* (height ** (5/3)) #* (height ** (5/3))
* (abs(incline) ** (0.5))) #* (abs(incline) ** (0.5)))
(area * strickler
* (radius ** (2/3))
* (abs(incline) ** (0.5)))
) )
elevation = max( elevation = max(

8
src/View/BoundaryCondition/Edit/Window.py
View File

@ -372,8 +372,12 @@ class EditBoundaryConditionWindow(PamhyrWindow):
if strickler is None: if strickler is None:
strickler = 25.0 strickler = 25.0
height = [(i)*(z_max-z_min)/50 for i in range(51)] height = [(i)*(z_max-z_min)/50 for i in range(51)]
q = [((profile.wet_width(z_min + h) * 0.8) * strickler #q = [((profile.wet_width(z_min + h) * 0.8) * strickler
* (h ** (5/3)) * (abs(self.slope_value) ** (0.5))) #* (h ** (5/3)) * (abs(self.slope_value) ** (0.5)))
#for h in height]
q = [profile.wet_area(z_min + h) * strickler
* (profile.wet_radius(z_min + h) ** (2/3))
* (abs(self.slope_value) ** (0.5))
for h in height] for h in height]
for i in range(len(height)): for i in range(len(height)):
height[i] += z_min height[i] += z_min

1
src/View/Geometry/Table.py
View File

@ -169,7 +169,6 @@ class GeometryReachTableModel(PamhyrTableModel):
self.layoutChanged.emit() self.layoutChanged.emit()
def move_down(self, row, parent=QModelIndex()): def move_down(self, row, parent=QModelIndex()):
print(row)
if row >= self._data.number_profiles-1: if row >= self._data.number_profiles-1:
return return