mirror of https://gitlab.com/pamhyr/pamhyr2
work on auto bondary and init cond
parent
bb3dadc0c7
commit
5aef0bbf3c
|
|
@ -382,6 +382,8 @@ class InitialConditions(SQLSubModel):
|
|||
self._data = []
|
||||
for profile in profiles:
|
||||
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
|
||||
strickler = None
|
||||
if frictions is not None:
|
||||
|
|
@ -396,9 +398,12 @@ class InitialConditions(SQLSubModel):
|
|||
discharge = data_discharge[profile.rk]
|
||||
else:
|
||||
discharge = (
|
||||
((width * 0.8)
|
||||
* strickler
|
||||
* (height ** (5/3))
|
||||
#((width * 0.8)
|
||||
#* strickler
|
||||
#* (height ** (5/3))
|
||||
#* (abs(incline) ** (0.5)))
|
||||
(area * strickler
|
||||
* (radius ** (2/3))
|
||||
* (abs(incline) ** (0.5)))
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -372,8 +372,12 @@ class EditBoundaryConditionWindow(PamhyrWindow):
|
|||
if strickler is None:
|
||||
strickler = 25.0
|
||||
height = [(i)*(z_max-z_min)/50 for i in range(51)]
|
||||
q = [((profile.wet_width(z_min + h) * 0.8) * strickler
|
||||
* (h ** (5/3)) * (abs(self.slope_value) ** (0.5)))
|
||||
#q = [((profile.wet_width(z_min + h) * 0.8) * strickler
|
||||
#* (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 i in range(len(height)):
|
||||
height[i] += z_min
|
||||
|
|
|
|||
|
|
@ -169,7 +169,6 @@ class GeometryReachTableModel(PamhyrTableModel):
|
|||
self.layoutChanged.emit()
|
||||
|
||||
def move_down(self, row, parent=QModelIndex()):
|
||||
print(row)
|
||||
if row >= self._data.number_profiles-1:
|
||||
return
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue