fix small bug in loading non-camels data

README.md

@@ -47,5 +47,5 @@ Adding `.finalize()` method - clears up the directory. Especially useful for DA.
 - make sure you also include the alpha value which is a model output from the run, defaults to 1.26 but varies per catchment. Eq1 of camels paper.
 ### v1.3.2. - 1.3.3
 - now correctly slices the ds to given start and end time whoops
-### v1.3.4 - 1.3.8
+### v1.3.4 - 1.3.9
 - formalises forcing: either `.txt`  or (two) `.nc` forcing supplied & run corresponding code

pyproject.toml

@@ -10,7 +10,7 @@ name = "ewatercycle-HBV"
 description = "Implementation of HBV for eWaterCycle"
 readme = "README.md"
 license = "Apache-2.0"
-version = "1.3.8"
+version = "1.3.9"
 authors = [
   { name = "David Haasnoot", email = "davidhaasnoot@gmail.com" },
 ]

src/ewatercycle_HBV/__init__.py

@@ -1 +1 @@
-__version__ = "1.3.8"
+__version__ = "1.3.9"

src/ewatercycle_HBV/forcing.py

@@ -65,20 +65,15 @@ class HBVForcing(DefaultForcing):
     """
 
     # either a forcing file is supplied
-    forcing_file: Optional[str] = "forcing.txt"
+    forcing_file: Optional[str] = ".txt"
     # or pr and pev are supplied seperately - can also be the same dataset
-    pr: Optional[str] = "forcing.nc"
-    pev: Optional[str] = "forcing.nc"
+    pr: Optional[str] = ".nc"
+    pev: Optional[str] = ".nc"
     alpha: Optional[float] = 1.26 # varies per catchment, mostly 1.26?
     test_data_bool: bool = False # allows to use self.from_test_txt()
-
-
-    # intended use
-    # if test data:
 
 
     #self.from_camels_txt()
-
     # @classmethod
     # def _build_recipe(
     #     cls,
@@ -96,22 +91,17 @@ class HBVForcing(DefaultForcing):
     #     )
     def forcing_txt_defined(self):
         """""test whether user defined forcing file"""
-        try:
-            self.forcing_file
-        except NameError:
-            return False
-        else:
+        if len(self.forcing_file) > 4:
             return True
+        else:
+            return False
 
     def forcing_nc_defined(self):
         """""test whether user defined forcing file"""
-        try:
-            self.pr
-            self.pev
-        except NameError:
-            return False
-        else:
+        if (len(self.pr) > 3) and (len(self.pev) > 3):
             return True
+        else:
+            return False
 
     # TODO Implement this to take .txt and add them?
     def from_test_txt(self) -> xr.Dataset: