Merge pull request #50 from Daafip/dev

fixing issues with parameter

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 
+  - new version of HBV bmi which adds snow 
+### 1.7.1
+  - bug fix with definitions of state variable names

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 = "[email protected]" },
 ]

src/ewatercycle_HBV/model.py

@@ -23,13 +23,15 @@
     "Tlag",
     "Kf",
     "Ks",
+    "FM",
 )
 
 HBV_STATES = (
     "Si",
     "Su",
     "Sf",
-    "Ss"
+    "Ss",
+    "Sp",
 )
 
 class HBVMethods(eWaterCycleModel):
@@ -106,6 +108,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()
@@ -228,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"
     )