From 1584f7691a37231dd0702991dab657fee29459c8 Mon Sep 17 00:00:00 2001 From: Daafip Date: Mon, 8 Apr 2024 10:21:19 +0200 Subject: [PATCH 1/3] update units tasmean attributes --- src/ewatercycle_HBV/model.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ewatercycle_HBV/model.py b/src/ewatercycle_HBV/model.py index 45d6be2..9bbd885 100644 --- a/src/ewatercycle_HBV/model.py +++ b/src/ewatercycle_HBV/model.py @@ -106,6 +106,7 @@ def _make_cfg_file(self, **kwargs) -> Path: ds['tasmean'] = ds['tas'] if ds['tasmean'].mean().values > 200: # adjust for kelvin units ds['tasmean'] -= 273.15 + attributes.update({'units':'degC'}) ds['tasmean'].attrs = attributes ds.to_netcdf(temporary_tasmean_file) ds.close() From 4c46a692e5d10e38cc04e4e23dfd61125b732e86 Mon Sep 17 00:00:00 2001 From: Daafip Date: Mon, 8 Apr 2024 10:41:10 +0200 Subject: [PATCH 2/3] adding new params properly, new docker to match bug fix 1.4.1 --- src/ewatercycle_HBV/model.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ewatercycle_HBV/model.py b/src/ewatercycle_HBV/model.py index 9bbd885..8923437 100644 --- a/src/ewatercycle_HBV/model.py +++ b/src/ewatercycle_HBV/model.py @@ -23,13 +23,15 @@ "Tlag", "Kf", "Ks", + "FM", ) HBV_STATES = ( "Si", "Su", "Sf", - "Ss" + "Ss", + "Sp", ) class HBVMethods(eWaterCycleModel): @@ -229,5 +231,5 @@ def unlink(self): class HBV(ContainerizedModel, HBVMethods): """The HBV eWaterCycle model, with the Container Registry docker image.""" bmi_image: ContainerImage = ContainerImage( - "ghcr.io/daafip/hbv-bmi-grpc4bmi:v1.4.0" + "ghcr.io/daafip/hbv-bmi-grpc4bmi:v1.4.1" ) From ec93d140ef1d93efe10cd2057c511e03031e6a11 Mon Sep 17 00:00:00 2001 From: Daafip Date: Mon, 8 Apr 2024 10:45:26 +0200 Subject: [PATCH 3/3] new version info --- CHANGELOG.md | 4 +++- pyproject.toml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ed8dfa..1f0cb53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,4 +37,6 @@ Adding `.finalize()` method - clears up the directory. Especially useful for DA. #### 1.6.1 - bug fix occuring when loading makkink data ### 1.7.0 - - new version of HBV bmi which adds snow \ No newline at end of file + - new version of HBV bmi which adds snow +### 1.7.1 + - bug fix with definitions of state variable names \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 7d1c3d0..58bed7d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ name = "ewatercycle-HBV" description = "Implementation of HBV for eWaterCycle" readme = "README.md" license = "Apache-2.0" -version = "1.7.0" +version = "1.7.1" authors = [ { name = "David Haasnoot", email = "davidhaasnoot@gmail.com" }, ]