Merge pull request #31 from gregory-halverson/main

making `check_distribution` compatible with `numpy` arrays

Author: gregory-halverson

breathing_earth_system_simulator/check_distribution.py

@@ -11,7 +11,7 @@ class BlankOutputError(Exception):
     pass
 
 def check_distribution(
-        image: Raster,
+        image: Union[Raster, np.ndarray],
         variable: str,
         date_UTC: Union[date, str],
         target: str = None):
@@ -55,13 +55,18 @@ def check_distribution(
         else:
             nan_proportion_string = cl.val(f"{(nan_proportion * 100):0.2f}%")
 
+        if isinstance(image, Raster):
+          nan_value = image.nodata
+        else:
+          nan_value = np.nan
+
         message = "variable " + cl.name(variable) + \
             " on " + cl.time(f"{date_UTC:%Y-%m-%d}") + \
             target_message + \
             " min: " + minimum_string + \
             " mean: " + cl.val(f"{np.nanmean(image):0.3f}") + \
             " max: " + maximum_string + \
-            " nan: " + nan_proportion_string + f" ({cl.val(image.nodata)})"
+            " nan: " + nan_proportion_string + f" ({cl.val(nan_value)})"
 
         if np.all(image == 0):
             message += " all zeros"
@@ -70,4 +75,4 @@ def check_distribution(
             logger.info(message)
 
     if nan_proportion == 1:
-        raise BlankOutputError(f"variable {variable} on {date_UTC:%Y-%m-%d}{target_message} is a blank image")
+        raise BlankOutputError(f"variable {variable} on {date_UTC:%Y-%m-%d}{target_message} is a blank image")

breathing_earth_system_simulator/version.txt

@@ -1 +1 @@
-1.5.1
+1.5.2

pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=60", "setuptools-scm>=8.0", "wheel"]
 
 [project]
 name = "breathing-earth-system-simulator"
-version = "1.5.1"
+version = "1.5.2"
 description = "Breathing Earth System Simulator (BESS) Gross Primary Production (GPP) and Evapotranspiration (ET) Model Python"
 readme = "README.md"
 authors = [