BESS-JPL 1.15.0__tar.gz → 1.16.0__tar.gz

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL/BESS_JPL.py

@@ -6,7 +6,7 @@ import numpy as np
 import rasters as rt
 from rasters import Raster, RasterGeometry
 
-from .check_distribution import check_distribution
+from check_distribution import check_distribution
 
 from sun_angles import calculate_SZA_from_DOY_and_hour
 from solar_apparent_time import solar_day_of_year_for_area, solar_hour_of_day_for_area

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL/canopy_shortwave_radiation.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from .check_distribution import check_distribution
+from check_distribution import check_distribution
 
 
 def canopy_shortwave_radiation(

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL/carbon_water_fluxes.py

@@ -12,25 +12,6 @@ from .soil_energy_balance import soil_energy_balance
 
 PASSES = 1
 
-
-def load_ball_berry_intercept_C3(self, geometry: RasterGeometry) -> Raster:
-    filename = join(abspath(dirname(__file__)), "ball_berry_intercept_C3.tif")
-    image = rt.Raster.open(filename, geometry=geometry, resampling=self.resampling)
-
-    return image
-
-def load_ball_berry_slope_C3(self, geometry: RasterGeometry) -> Raster:
-    filename = join(abspath(dirname(__file__)), "ball_berry_slope_C3.tif")
-    image = rt.Raster.open(filename, geometry=geometry, resampling=self.resampling)
-
-    return image
-
-def load_ball_berry_slope_C4(self, geometry: RasterGeometry) -> Raster:
-    filename = join(abspath(dirname(__file__)), "ball_berry_slope_C4.tif")
-    image = rt.Raster.open(filename, geometry=geometry, resampling=self.resampling)
-
-    return image
-
 def carbon_water_fluxes(
         canopy_temperature_K: np.ndarray,  # canopy temperature in Kelvin
         soil_temperature_K: np.ndarray,  # soil temperature in Kelvin

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL/load_C4_fraction.py

@@ -3,8 +3,12 @@ from os.path import join, abspath, dirname
 import rasters as rt
 from rasters import Raster, RasterGeometry
 
+import numpy as np
+
 def load_C4_fraction(geometry: RasterGeometry = None, resampling: str = "nearest") -> Raster:
     filename = join(abspath(dirname(__file__)), "C4_fraction.tif")
-    image = Raster.open(filename, geometry=geometry, resampling=resampling)
+    image = Raster.open(filename, geometry=geometry, resampling=resampling, nodata=np.nan)
+    image = rt.clip(image, 0, 100)
+    # TODO: scale C4_fraction to be within 0 and 1?
 
     return image

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL/load_NDVI_maximum.py

@@ -3,8 +3,10 @@ from os.path import join, abspath, dirname
 import rasters as rt
 from rasters import Raster, RasterGeometry
 
+import numpy as np
+
 def load_NDVI_maximum(geometry: RasterGeometry = None, resampling: str = "nearest") -> Raster:
     filename = join(abspath(dirname(__file__)), "NDVI_maximum.tif")
-    image = Raster.open(filename, geometry=geometry, resampling=resampling)
+    image = Raster.open(filename, geometry=geometry, resampling=resampling, nodata=np.nan)
 
     return image

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL/load_NDVI_minimum.py

@@ -3,8 +3,10 @@ from os.path import join, abspath, dirname
 import rasters as rt
 from rasters import Raster, RasterGeometry
 
+import numpy as np
+
 def load_NDVI_minimum(geometry: RasterGeometry = None, resampling: str = "nearest") -> Raster:
     filename = join(abspath(dirname(__file__)), "NDVI_minimum.tif")
-    image = Raster.open(filename, geometry=geometry, resampling=resampling)
+    image = Raster.open(filename, geometry=geometry, resampling=resampling, nodata=np.nan)
 
     return image

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL/load_ball_berry_slope_C3.py

@@ -5,6 +5,6 @@ from rasters import Raster, RasterGeometry
 
 def load_ball_berry_slope_C3(geometry: RasterGeometry = None, resampling: str = "nearest") -> Raster:
     filename = join(abspath(dirname(__file__)), "ball_berry_slope_C3.tif")
-    image = Raster.open(filename, geometry=geometry, resampling="nearest")
+    image = Raster.open(filename, geometry=geometry, resampling=resampling)
 
     return image

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL/load_ball_berry_slope_C4.py

@@ -5,6 +5,6 @@ from rasters import Raster, RasterGeometry
 
 def load_ball_berry_slope_C4(geometry: RasterGeometry = None, resampling: str = "nearest") -> Raster:
     filename = join(abspath(dirname(__file__)), "ball_berry_slope_C4.tif")
-    image = Raster.open(filename, geometry=geometry, resampling="nearest")
+    image = Raster.open(filename, geometry=geometry, resampling=resampling)
 
     return image

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL/load_kn.py

@@ -5,6 +5,6 @@ from rasters import Raster, RasterGeometry
 
 def load_kn(geometry: RasterGeometry = None, resampling: str = "nearest") -> Raster:
     filename = join(abspath(dirname(__file__)), "kn.tif")
-    image = Raster.open(filename, geometry=geometry, resampling="nearest")
+    image = Raster.open(filename, geometry=geometry, resampling=resampling)
 
     return image

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL/load_peakVCmax_C3.py

@@ -3,8 +3,10 @@ from os.path import join, abspath, dirname
 import rasters as rt
 from rasters import Raster, RasterGeometry
 
+import numpy as np
+
 def load_peakVCmax_C3(geometry: RasterGeometry = None, resampling: str = "nearest") -> Raster:
     filename = join(abspath(dirname(__file__)), "peakVCmax_C3.tif")
-    image = Raster.open(filename, geometry=geometry, resampling="nearest")
+    image = Raster.open(filename, geometry=geometry, resampling=resampling, nodata=np.nan)
 
     return image

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL/load_peakVCmax_C4.py

@@ -3,8 +3,10 @@ from os.path import join, abspath, dirname
 import rasters as rt
 from rasters import Raster, RasterGeometry
 
+import numpy as np
+
 def load_peakVCmax_C4(geometry: RasterGeometry = None, resampling: str = "nearest") -> Raster:
     filename = join(abspath(dirname(__file__)), "peakVCmax_C4.tif")
-    image = Raster.open(filename, geometry=geometry, resampling="nearest")
+    image = Raster.open(filename, geometry=geometry, resampling=resampling, nodata=np.nan)
 
     return image

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL/model.py

@@ -6,7 +6,7 @@ import numpy as np
 import rasters as rt
 from rasters import Raster, RasterGeometry
 
-from .check_distribution import check_distribution
+from check_distribution import check_distribution
 
 from sun_angles import calculate_SZA_from_DOY_and_hour
 from solar_apparent_time import solar_day_of_year_for_area, solar_hour_of_day_for_area

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BESS-JPL
-Version: 1.15.0
+Version: 1.16.0
 Summary: Breathing Earth System Simulator (BESS) Gross Primary Production (GPP) and Evapotranspiration (ET) Model Python
 Author-email: Gregory Halverson <gregory.h.halverson@jpl.nasa.gov>
 Project-URL: Homepage, https://github.com/JPL-Evapotranspiration-Algorithms/BESS-JPL
@@ -9,6 +9,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: check-distribution
 Requires-Dist: FLiESANN>=1.5.0
 Requires-Dist: gedi-canopy-height>=1.1.0
 Requires-Dist: GEOS5FP>=1.1.1

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL.egg-info/SOURCES.txt

@@ -38,7 +38,6 @@ BESS_JPL/canopy_shortwave_radiation.py
 BESS_JPL/carbon_uptake_efficiency.jpeg
 BESS_JPL/carbon_uptake_efficiency.tif
 BESS_JPL/carbon_water_fluxes.py
-BESS_JPL/check_distribution.py
 BESS_JPL/constants.py
 BESS_JPL/interpolate_C3_C4.py
 BESS_JPL/kn.jpeg

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/BESS_JPL.egg-info/requires.txt

@@ -1,3 +1,4 @@
+check-distribution
 FLiESANN>=1.5.0
 gedi-canopy-height>=1.1.0
 GEOS5FP>=1.1.1

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BESS-JPL
-Version: 1.15.0
+Version: 1.16.0
 Summary: Breathing Earth System Simulator (BESS) Gross Primary Production (GPP) and Evapotranspiration (ET) Model Python
 Author-email: Gregory Halverson <gregory.h.halverson@jpl.nasa.gov>
 Project-URL: Homepage, https://github.com/JPL-Evapotranspiration-Algorithms/BESS-JPL
@@ -9,6 +9,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: check-distribution
 Requires-Dist: FLiESANN>=1.5.0
 Requires-Dist: gedi-canopy-height>=1.1.0
 Requires-Dist: GEOS5FP>=1.1.1

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=60", "setuptools-scm>=8.0", "wheel"]
 
 [project]
 name = "BESS-JPL"
-version = "1.15.0"
+version = "1.16.0"
 description = "Breathing Earth System Simulator (BESS) Gross Primary Production (GPP) and Evapotranspiration (ET) Model Python"
 readme = "README.md"
 authors = [
@@ -14,6 +14,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
+    "check-distribution",
     "FLiESANN>=1.5.0",
     "gedi-canopy-height>=1.1.0",
     "GEOS5FP>=1.1.1",

{bess_jpl-1.15.0 → bess_jpl-1.16.0}/tests/test_import_dependencies.py

@@ -2,6 +2,7 @@ import pytest
 
 # List of dependencies
 dependencies = [
+    "check_distribution",
     "FLiESANN",
     "gedi_canopy_height",
     "GEOS5FP",

bess_jpl-1.15.0/BESS_JPL/check_distribution.py

@@ -1,118 +0,0 @@
-"""
-Replacement for check_distribution package to avoid pycksum dependency.
-
-This module provides data validation functionality that was previously
-provided by the check-distribution package, which depends on pycksum
-that doesn't compile on Python 3.12.
-"""
-
-import logging
-from typing import Union, Optional
-from datetime import datetime
-
-# Try to import numpy, but make it optional
-try:
-    import numpy as np
-    HAS_NUMPY = True
-except ImportError:
-    np = None
-    HAS_NUMPY = False
-
-
-logger = logging.getLogger(__name__)
-
-
-def check_distribution(
-    data: Union["np.ndarray", float, int, None], 
-    name: str, 
-    time_UTC: Optional[datetime] = None
-) -> None:
-    """
-    Check and validate data distribution, logging warnings for invalid values.
-    
-    This function validates input data and logs information about the distribution,
-    including warnings for NaN values, infinite values, and basic statistics.
-    
-    Args:
-        data: The data to validate (numpy array, scalar, or None)
-        name: Name of the variable for logging purposes
-        time_UTC: Optional timestamp for logging context
-        
-    Returns:
-        None
-        
-    Raises:
-        Nothing - this function only logs warnings and information
-    """
-    
-    # Create log prefix with time if provided
-    time_prefix = f"[{time_UTC}] " if time_UTC else ""
-    
-    if data is None:
-        logger.warning(f"{time_prefix}{name}: data is None")
-        return
-    
-    # Handle numpy arrays or array-like objects
-    if hasattr(data, 'shape') and hasattr(data, 'dtype'):
-        # This is likely a numpy array or array-like object
-        
-        if hasattr(data, 'size') and data.size == 0:
-            logger.warning(f"{time_prefix}{name}: array is empty")
-            return
-        
-        if HAS_NUMPY:
-            # Use numpy functions if available
-            # Check for NaN values
-            if np.any(np.isnan(data)):
-                nan_count = np.sum(np.isnan(data))
-                nan_percentage = (nan_count / data.size) * 100
-                logger.warning(f"{time_prefix}{name}: contains {nan_count} NaN values ({nan_percentage:.1f}%)")
-            
-            # Check for infinite values  
-            if np.any(np.isinf(data)):
-                inf_count = np.sum(np.isinf(data))
-                inf_percentage = (inf_count / data.size) * 100
-                logger.warning(f"{time_prefix}{name}: contains {inf_count} infinite values ({inf_percentage:.1f}%)")
-                
-            # Calculate statistics for finite values only
-            finite_data = data[np.isfinite(data)]
-            if len(finite_data) > 0:
-                min_val = np.min(finite_data)
-                max_val = np.max(finite_data)
-                mean_val = np.mean(finite_data)
-                std_val = np.std(finite_data)
-                
-                logger.debug(f"{time_prefix}{name}: shape={data.shape}, "
-                            f"min={min_val:.6f}, max={max_val:.6f}, "
-                            f"mean={mean_val:.6f}, std={std_val:.6f}")
-            else:
-                logger.warning(f"{time_prefix}{name}: no finite values found")
-        else:
-            # Fallback when numpy is not available
-            logger.debug(f"{time_prefix}{name}: array-like data validated (numpy not available for detailed analysis)")
-            
-    else:
-        # Handle scalar values
-        try:
-            # Convert to float to check for NaN/inf
-            float_val = float(data)
-            
-            if HAS_NUMPY:
-                if np.isnan(float_val):
-                    logger.warning(f"{time_prefix}{name}: scalar value is NaN")
-                elif np.isinf(float_val):
-                    logger.warning(f"{time_prefix}{name}: scalar value is infinite")
-                else:
-                    logger.debug(f"{time_prefix}{name}: scalar value = {float_val:.6f}")
-            else:
-                # Basic validation without numpy
-                import math
-                if math.isnan(float_val):
-                    logger.warning(f"{time_prefix}{name}: scalar value is NaN")
-                elif math.isinf(float_val):
-                    logger.warning(f"{time_prefix}{name}: scalar value is infinite")
-                else:
-                    logger.debug(f"{time_prefix}{name}: scalar value = {float_val:.6f}")
-                
-        except (ValueError, TypeError) as e:
-            logger.warning(f"{time_prefix}{name}: cannot convert to float for validation: {e}")