Skip to content
GitLab
Commit f4bf8d37 authored by Pierre-Antoine Rouby's avatar Pierre-Antoine Rouby
Browse files

Results: Simplify and fix river bottom display.

parent 6e94d7a7
master 0.0.9 InitialConditions adists_new adists_num adists_release scenarios setup.py terraz_dev v1.2.0rc2 v1.0.2 v1.0.1 v1.0.0 v0.0.8 v0.0.8-patch-2 v0.0.8-patch-1
No related merge requests found
Pipeline #55310 passed with stages
in 58 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 48 additions and 122 deletions
+48 -122
src/View/Results/PlotKPC.py
+ 48
− 122
View file @ f4bf8d37
...@@ -92,130 +92,69 @@ class PlotKPC(PamhyrPlot): ...@@ -92,130 +92,69 @@ class PlotKPC(PamhyrPlot):
self.draw_bottom_geometry(reach) self.draw_bottom_geometry(reach)
def draw_bottom_with_bedload(self, reach): def draw_bottom_with_bedload(self, reach):
kp = reach.geometry.get_kp() self._bedrock = self.sl_compute_bedrock(reach)
z_min = reach.geometry.get_z_min()
z_max = reach.geometry.get_z_max()
initial_sl = self.sl_compute_initial(reach) kp = reach.geometry.get_kp()
current_sl = self.sl_compute_current(reach) z = self.sl_compute_current_z(reach)
max_sl_num = reduce( self.line_bottom, = self.canvas.axes.plot(
lambda acc, sl: max(acc, len(sl)), kp, z,
current_sl, 0 linestyle="solid", lw=1.,
color=self.color_plot_river_bottom,
) )
sl_init, sl = self.sl_completed_layers( self._river_bottom = z
initial_sl, current_sl, max_sl_num
def sl_compute_bedrock(self, reach):
z_min = reach.geometry.get_z_min()
sl = self.sl_compute_initial(reach)
z = list(
map(
lambda z, sl: reduce(
lambda z, h: z - h[0],
sl, z
),
z_min, # Original geometry
sl # Original sediment layers
)
) )
z_sl = self.sl_apply_z_min_to_initial(sl_init, z_min) return z
d_sl = self.sl_compute_diff(sl_init, sl)
final_z_sl = self.sl_apply_diff(reach, z_sl, d_sl) def sl_compute_current_z(self, reach):
final_z_sl = list(reversed(final_z_sl)) z_br = self._bedrock
sl = self.sl_compute_current(reach)
self.line_kp_sl = [] z = list(
for i, z in enumerate(final_z_sl): map(
self.line_kp_sl.append(None) lambda z, sl: reduce(
self.line_kp_sl[i], = self.canvas.axes.plot( lambda z, h: z + h[0],
kp, z, sl, z
linestyle=(
"solid" if i == len(final_z_sl) - 1
else self.linestyle[1:][i // len(self.colors)]
), ),
lw=1., z_br, # Bedrock elevation
color=( sl # Current sediment layers
self.color_plot_river_bottom if i == len(final_z_sl) - 1
else self.colors[i % len(self.colors)]
)
) )
)
self._initial_sl = initial_sl return z
self._river_bottom = final_z_sl[-1]
def sl_compute_initial(self, reach): def sl_compute_initial(self, reach):
""" """
Get SL list for profile p at initial time (initial data) Get SL list for profile p at initial time (initial data)
""" """
return list( return map(
map( lambda p: p.get_ts_key(min(self._timestamps), "sl")[0],
lambda p: p.get_ts_key(min(self._timestamps), "sl")[0], reach.profiles
reach.profiles
)
) )
def sl_compute_current(self, reach): def sl_compute_current(self, reach):
""" """
Get SL list for profile p at current time Get SL list for profile p at current time
""" """
return list( return map(
map( lambda p: p.get_ts_key(self._current_timestamp, "sl")[0],
lambda p: p.get_ts_key(self._current_timestamp, "sl")[0], reach.profiles
reach.profiles
)
)
def sl_completed_layers(self, initial_sl, current_sl, max_sl_num):
sl = []
sl_init = []
for i in range(max_sl_num):
cur = []
cur_init = []
for current, initial in zip(current_sl, initial_sl):
if i < len(initial_sl):
cur.append(current[i][0])
cur_init.append(initial[i][0])
else:
cur.append(0)
cur_init.append(0)
sl.append(cur)
sl_init.append(cur_init)
return sl_init, sl
def sl_apply_z_min_to_initial(self, sl_init, z_min):
"""
Compute sediment layer from initial data in function to profile
z_min
"""
return reduce(
lambda acc, v: acc + [
list(
map(
lambda x, y: y - x,
v, acc[-1]
)
)
],
sl_init, [z_min]
)
def sl_compute_diff(self, sl_init, sl):
return list(
map(
lambda ln0, lni: list(
map(
lambda z0, zi: z0 - zi,
ln0, lni
)
),
sl_init, sl
)
)
def sl_apply_diff(self, reach, z_sl, d_sl):
f = list(map(lambda p: 0, reach.profiles))
return list(
map(
lambda z, d: list(
map(
lambda zn, dn: zn - dn,
z, d
)
),
z_sl, d_sl + [f] # HACK: Add dummy data for last layer
)
) )
def draw_bottom_geometry(self, reach): def draw_bottom_geometry(self, reach):
...@@ -398,27 +337,14 @@ class PlotKPC(PamhyrPlot): ...@@ -398,27 +337,14 @@ class PlotKPC(PamhyrPlot):
def update_bottom_with_bedload(self): def update_bottom_with_bedload(self):
reach = self.results.river.reach(self._current_reach_id) reach = self.results.river.reach(self._current_reach_id)
kp = reach.geometry.get_kp() kp = reach.geometry.get_kp()
z_min = reach.geometry.get_z_min() z = self.sl_compute_current_z(reach)
initial_sl = self._initial_sl self.line_bottom.remove()
current_sl = self.sl_compute_current(reach)
max_sl_num = reduce( self.line_bottom, = self.canvas.axes.plot(
lambda acc, sl: max(acc, len(sl)), kp, z,
current_sl, 0 linestyle="solid", lw=1.,
) color=self.color_plot_river_bottom,
sl_init, sl = self.sl_completed_layers(
initial_sl, current_sl, max_sl_num
) )
z_sl = self.sl_apply_z_min_to_initial(sl_init, z_min) self._river_bottom = z
d_sl = self.sl_compute_diff(sl_init, sl)
final_z_sl = self.sl_apply_diff(reach, z_sl, d_sl)
final_z_sl = list(reversed(final_z_sl))
for i, z in enumerate(final_z_sl):
self.line_kp_sl[i].set_data(kp, z)
self._river_bottom = final_z_sl[-1]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment