parouby/Pamhyr2
1
0 Fork 0
mirror of https://gitlab.com/pamhyr/pamhyr2.git synced 2026-10-30 03:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

more work on compare results

Browse Source
This commit is contained in:
Theophile Terraz committed 2025-10-24 16:36:06 +02:00
1 parent 84486c03ed
commit e6dd983f97
3 files changed
+40 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Model/Geometry/ProfileXYZ.py
+12 -36
View File
@@ -841,11 +841,6 @@ class ProfileXYZ(Profile, SQLSubModel):
if zz[i] > z and zz[i+1] <= z:
fact = (z - zz[i]) / (zz[i+1] - zz[i])
y = station[i] + fact * (station[i+1] - station[i])
#y = np.interp(
#z,
#[zz[i+1], zz[i]],
#[station[i+1], station[i]]
#)
start.append(y)
end = []
@@ -856,11 +851,6 @@ class ProfileXYZ(Profile, SQLSubModel):
if zz[i] <= z and zz[i+1] > z:
fact = (z - zz[i]) / (zz[i+1] - zz[i])
y = station[i] + fact * (station[i+1] - station[i])
#y = np.interp(
#z,
#[zz[i], zz[i+1]],
#[station[i], station[i+1]]
#)
end.append(y)
if len(start) != len(end):
@@ -891,38 +881,24 @@ class ProfileXYZ(Profile, SQLSubModel):
# Interpolate points at river left side
if (i_left > 0):
fact = (z - self.point(i_left).z) / (self.point(i_left - 1).z - self.point(i_left).z)
x = self.point(i_left).x + fact * (self.point(i_left - 1).x - self.point(i_left).x)
y = self.point(i_left).y + fact * (self.point(i_left - 1).y - self.point(i_left).y)
#x = np.interp(
#z,
#[self.point(i_left - 1).z, self.point(i_left).z],
#[self.point(i_left - 1).x, self.point(i_left).x]
#)
#y = np.interp(
#z,
#[self.point(i_left).z, self.point(i_left - 1).z],
#[self.point(i_left).y, self.point(i_left - 1).y]
#)
fact = (z - self.point(i_left).z) / (self.point(i_left - 1).z
- self.point(i_left).z)
x = self.point(i_left).x + fact * (self.point(i_left - 1).x
- self.point(i_left).x)
y = self.point(i_left).y + fact * (self.point(i_left - 1).y
- self.point(i_left).y)
pt_left = PointXYZ(x=x, y=y, z=z, name="wl_left")
else:
pt_left = self.point(0)
# Interpolate points at river right side
if (i_right < self.number_points - 1):
fact = (z - self.point(i_right).z) / (self.point(i_right + 1).z - self.point(i_right).z)
x = self.point(i_right).x + fact * (self.point(i_right + 1).x - self.point(i_right).x)
y = self.point(i_right).y + fact * (self.point(i_right + 1).y - self.point(i_right).y)
#x = np.interp(
#z,
#[self.point(i_right).z, self.point(i_right + 1).z],
#[self.point(i_right).x, self.point(i_right + 1).x]
#)
#y = np.interp(
#z,
#[self.point(i_right).z, self.point(i_right + 1).z],
#[self.point(i_right).y, self.point(i_right + 1).y]
#)
fact = (z - self.point(i_right).z) / (self.point(i_right + 1).z -
self.point(i_right).z)
x = self.point(i_right).x + fact * (self.point(i_right + 1).x -
self.point(i_right).x)
y = self.point(i_right).y + fact * (self.point(i_right + 1).y -
self.point(i_right).y)
pt_right = PointXYZ(x=x, y=y, z=z, name="wl_right")
else:
pt_right = self.point(self.number_points - 1)