From 2b6c56110423526815750a7bfbde0dd0e5eb63cf Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Wed, 2 Mar 2022 11:24:09 +0100 Subject: [PATCH] Processing bathy: added hstru (poro) --- swash/processing/bathy.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/swash/processing/bathy.py b/swash/processing/bathy.py index 908e778..26aa1ea 100644 --- a/swash/processing/bathy.py +++ b/swash/processing/bathy.py @@ -26,14 +26,15 @@ hstru = np.loadtxt(root.joinpath(config.get("data", "hstru"))) x_hires = np.arange(-0.5 * bathy_hires.size, 0, 0.5) x_lores = np.arange(-1 * bathy_lores.size, 0, 1) -#x_hstru = np.arange(-1 * hstru.size, 0, 1) +x_hstru = np.arange(-0.5 * hstru.size, 0, 0.5) bathy_hires_pd = pd.Series(bathy_hires.copy(), index=x_hires) bathy_lores_pd = pd.Series(bathy_lores.copy(), index=x_lores) -bathy = bathy_lores_pd -inter = bathy_lores_pd.index.intersection(bathy_hires_pd.index) -bathy[inter] = bathy_hires_pd[inter] +bathy = bathy_lores_pd.reindex( + bathy_lores_pd.index.union(bathy_hires_pd.index) +) +bathy[bathy_hires_pd.index] = bathy_hires_pd if config.getboolean("proc", "plot", fallback=False): if plt is None: @@ -43,7 +44,7 @@ if config.getboolean("proc", "plot", fallback=False): fig, ax = plt.subplots() ax.plot(x_hires, bathy_hires, label="High-res") ax.plot(x_lores, bathy_lores, label="Low-res") - #ax.plot(x_hstru, hstru, label="H stru") + ax.plot(x_hstru, bathy[x_hstru]+hstru, label="H stru") ax.plot(bathy.index, bathy, ls="-.", c="k", label="Combined") ax.grid()