From 756d69ac8e3d031c2dd8609bcf4342d7ab53c7f9 Mon Sep 17 00:00:00 2001 From: Rolf Hut Date: Fri, 17 Jan 2025 11:19:56 +0100 Subject: [PATCH 1/3] fix: change var name of pev to evspsblpot in forcing file --- book/2_modelling_advanced_ewatercycle/hbv_bmi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/2_modelling_advanced_ewatercycle/hbv_bmi.py b/book/2_modelling_advanced_ewatercycle/hbv_bmi.py index 37337bd..fab64b4 100644 --- a/book/2_modelling_advanced_ewatercycle/hbv_bmi.py +++ b/book/2_modelling_advanced_ewatercycle/hbv_bmi.py @@ -50,7 +50,7 @@ def initialize(self, config_file: str) -> None: self.P = load_var(self.config["precipitation_file"], "pr") # add Tas, Tmin and Tmax support for snow component ??! - self.EP = load_var(self.config["potential_evaporation_file"], "pev") + self.EP = load_var(self.config["potential_evaporation_file"], "evspsblpot") # set up times self.Ts = self.P['time'].astype("datetime64[s]") From 5959a4705b9ed7d3ddc9679a95747ac5c06bac59 Mon Sep 17 00:00:00 2001 From: Mark Melotto <70904313+MarkMelotto@users.noreply.github.com> Date: Thu, 13 Feb 2025 11:49:06 +0100 Subject: [PATCH 2/3] Update hbv_bmi.py changed the "pev" in the docstring to "evspsblpot" --- book/2_modelling_advanced_ewatercycle/hbv_bmi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/2_modelling_advanced_ewatercycle/hbv_bmi.py b/book/2_modelling_advanced_ewatercycle/hbv_bmi.py index fab64b4..6f14fe7 100644 --- a/book/2_modelling_advanced_ewatercycle/hbv_bmi.py +++ b/book/2_modelling_advanced_ewatercycle/hbv_bmi.py @@ -38,7 +38,7 @@ def initialize(self, config_file: str) -> None: Requires atleast: --------------------- 'precipitation_file': xarray with "pr" variable & time component - 'potential_evaporation_file': xarray with "pev" variable of same nature as pr + 'potential_evaporation_file': xarray with "evspsblpot" variable of same nature as pr 'parameters': list of 8 parameters by a ',' 'initial_storage' list of 4 storage parameters split by a ',' @@ -499,4 +499,4 @@ def load_var(ncfile: str | Path, varname: str) -> xr.DataArray: if data[varname].attrs['units'] == 'kg m-2 s-1': data[varname] = data[varname] * 24 * 3600 #mm/day #data[varname].attrs['units'] = 'mm d-1' TODO, fix. - return data[varname] \ No newline at end of file + return data[varname] From 754de0af8b8e2de77fa555db1cc6ab7cef1635ad Mon Sep 17 00:00:00 2001 From: Mark Melotto <70904313+MarkMelotto@users.noreply.github.com> Date: Fri, 14 Feb 2025 13:43:57 +0100 Subject: [PATCH 3/3] Update book/2_modelling_advanced_ewatercycle/hbv_bmi.py removed to do Co-authored-by: Bart Schilperoort --- book/2_modelling_advanced_ewatercycle/hbv_bmi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/2_modelling_advanced_ewatercycle/hbv_bmi.py b/book/2_modelling_advanced_ewatercycle/hbv_bmi.py index 6f14fe7..331fe65 100644 --- a/book/2_modelling_advanced_ewatercycle/hbv_bmi.py +++ b/book/2_modelling_advanced_ewatercycle/hbv_bmi.py @@ -498,5 +498,5 @@ def load_var(ncfile: str | Path, varname: str) -> xr.DataArray: if "units" in data[varname].attrs: if data[varname].attrs['units'] == 'kg m-2 s-1': data[varname] = data[varname] * 24 * 3600 #mm/day - #data[varname].attrs['units'] = 'mm d-1' TODO, fix. + data[varname].attrs["units"] = "mm d-1" return data[varname]