From 86252c67d4e38c4a8828296b29e1a0f013a7ca35 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Fri, 8 Apr 2022 12:43:26 +0200 Subject: [PATCH] Updated sws_ola with new format --- olaflow/processing/sws_ola.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/olaflow/processing/sws_ola.py b/olaflow/processing/sws_ola.py index 4a0d4aa..7e69222 100644 --- a/olaflow/processing/sws_ola.py +++ b/olaflow/processing/sws_ola.py @@ -28,12 +28,12 @@ def data(var): return np.load(sws_out.joinpath(f"{var}.npy")) -x = data("xp") -t = data("tsec") +x = data("x") +t = data("t") watl = data("watl") zk = data("zk") -velk = data("velk") +velk, _ = data("velk") vz = data("vz") olaflow_root = pathlib.Path(config.get("olaflow", "root")) @@ -44,7 +44,7 @@ watl_t = interpolate.interp1d(x, watl[680]) alpha_water = np.where(model.z < watl_t(model.x), 1, 0) zk_t = interpolate.interp1d(x, zk[680]) -velk_t = interpolate.interp1d(x, velk[680, :, 0, :])(model.x) +velk_t = interpolate.interp1d(x, velk[680, :, :])(model.x) vz_t = interpolate.interp1d(x, vz[680])(model.x) zk_tl = zk_t(model.x)