BESS-JPL 1.15.0__py3-none-any.whl → 1.16.0__py3-none-any.whl

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/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/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/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/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/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/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/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/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/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/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/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.dist-info → bess_jpl-1.16.0.dist-info}/METADATA

@@ -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.dist-info → bess_jpl-1.16.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-BESS_JPL/BESS_JPL.py,sha256=-OieL_tZ04yhlv0z3_s9XmrEuAPueIvGON1d1Aj-F2M,1366
+BESS_JPL/BESS_JPL.py,sha256=CTby93_HwhONe2NOlt-8DuqDH7jL9mAc3euuzbouANg,1365
 BESS_JPL/C3_photosynthesis.py,sha256=-ormDycaWttCOoYJdOoOV_zlM6n0nxkgXxj7fyH_mIs,2760
 BESS_JPL/C4_fraction.jpeg,sha256=ECaEYWA8MnNd5z0Yq3beeUCR93KtTDxM8MrH-YYon3Y,2746
 BESS_JPL/C4_fraction.tif,sha256=DFS-J08JCjnf0hi_T_dFridAegVTiU3FGyMBjS9yc1w,25446
@@ -19,27 +19,26 @@ BESS_JPL/ball_berry_slope_C4.tif,sha256=UedoUOnOjBxQ9pAaf5nXgDa8wvKOHVBD3sVToV12
 BESS_JPL/calculate_VCmax.py,sha256=DDZk7v-ME_UtupiPPvTsGqI55-3JUv6i_jDYQozcqzQ,1959
 BESS_JPL/canopy_energy_balance.py,sha256=k7uEm15iv7cG11grvb3hZSgZ45nLbPkeniWJFk7K9rE,6452
 BESS_JPL/canopy_longwave_radiation.py,sha256=TH5YaxyVgVP58moZ0aDGkMukJfcPQQgiYbuCHO6TxPc,3407
-BESS_JPL/canopy_shortwave_radiation.py,sha256=jkMK3iYq1WsebfQWLrESd5ZwZ31vW-EKRpyn92_IxJU,9768
+BESS_JPL/canopy_shortwave_radiation.py,sha256=TzDGFFBVHcZ3s5v-R9pQYeW9PPvYDQ168VdoqtCXh4U,9767
 BESS_JPL/carbon_uptake_efficiency.jpeg,sha256=wz2cLk_4-DRdF71xR2c-cx1MsE0CH-EDWjs2pDJcRF0,704540
 BESS_JPL/carbon_uptake_efficiency.tif,sha256=Nnc8h2ImU6_sip0WzDh3q0BRoBe-CfCbwzDtYo5BSog,819269
-BESS_JPL/carbon_water_fluxes.py,sha256=qkCq_B-_0F9XQz9IDWQBaF-OpiDKIuZmhS7vyYKtYkI,13746
-BESS_JPL/check_distribution.py,sha256=T6lYN_vBCb1duoJ1BZ0XLRXttEI81S4BwK0DKb8KDeI,4508
+BESS_JPL/carbon_water_fluxes.py,sha256=T1E1AHne3lYvkEoasqlM4oLxoSWLWmeJxy1BzrVdPUw,12987
 BESS_JPL/constants.py,sha256=tOYubq17dnLVKhtTI0CJUQAEeROE4KeSBpOVBqZprUU,131
 BESS_JPL/interpolate_C3_C4.py,sha256=adIyk03Yt6SJ_jFCUm6ivK9QpZYw10C3wJKpx1O56Pk,394
 BESS_JPL/kn.jpeg,sha256=wsI40jabT9_iPpQmOxd3GZzfAN7oZ2DubiARmULFUS0,854097
 BESS_JPL/kn.tif,sha256=nZAIAms7LRDVsadxa4z8yRqOudWu3AjJSm6l1T3ywuY,819988
-BESS_JPL/load_C4_fraction.py,sha256=X9GDGTruuCDVV0pnle5kZHrCeS1hftFAgfitvebdDug,364
-BESS_JPL/load_NDVI_maximum.py,sha256=cwVeFlJrBmtEHzP3Mc0P7XMgWFoONW_zQfGCLAfZdoY,366
-BESS_JPL/load_NDVI_minimum.py,sha256=lbaEMz1UWF0l3hT8yp5ZJoMwByyPYBYCuYKoxnn6Dhs,366
+BESS_JPL/load_C4_fraction.py,sha256=Fn8CKMzpvRCenlaVe8or9NnGmNZ-L5l_vdUpbjwcNSw,486
+BESS_JPL/load_NDVI_maximum.py,sha256=CADnbDULc5qW0oR7UgNN9pM0oplz7QMf8Ki09_fbj-o,401
+BESS_JPL/load_NDVI_minimum.py,sha256=RZaLXKxJe2ViEvj76_l-YSLIMyjo54nP4oAe-NEvACs,401
 BESS_JPL/load_ball_berry_intercept_C3.py,sha256=6auXZHej127rhUCFXe7vdEg9C4CosFSHLTcdqKs06Ls,388
-BESS_JPL/load_ball_berry_slope_C3.py,sha256=6yNdyouDXgryMcCevyuDfVqQJc8XdL7Z2454F5Y9Nvw,379
-BESS_JPL/load_ball_berry_slope_C4.py,sha256=gbDO8f8DYgzoWYMGr8zS5vWjGNLky4DWnMTHyOGguDk,379
+BESS_JPL/load_ball_berry_slope_C3.py,sha256=9nmbdkGnJ7UWXwktpkE8rL1LGA1vi71YZdzpme04P84,380
+BESS_JPL/load_ball_berry_slope_C4.py,sha256=lsKwrkbChEm3sspUgAXjm86Q4VBirwFOZStiO9NuGx8,380
 BESS_JPL/load_carbon_uptake_efficiency.py,sha256=RbWxLbqHnxiHw7XHyFBuWRToc8hDjUR6EUUntiJfe0M,390
-BESS_JPL/load_kn.py,sha256=_IE7w_VfahubfqjvgE6F6HCO0SizcpMu104_7ZXOiaw,345
-BESS_JPL/load_peakVCmax_C3.py,sha256=ISaCyaN81F3CyYbYwUqvUfQ_vjn4_jCpt1_x_b4fY5o,365
-BESS_JPL/load_peakVCmax_C4.py,sha256=8vtjEiJKCqSK04DfTs8Zgn-rWwGucmeeLMzblLT1U-Y,365
+BESS_JPL/load_kn.py,sha256=39RkQkkdmey0IPInziJI0kSiI8alRk5Hz42pzm-qihU,346
+BESS_JPL/load_peakVCmax_C3.py,sha256=A-Wg4PjPgogfpRsAMo6ZNEXM7G3KbnF7ZRV3k_jTtEA,401
+BESS_JPL/load_peakVCmax_C4.py,sha256=iVmJTitkMkB4AjfjanAi3yv1lWO4sSF6J7cjuRmaCwU,401
 BESS_JPL/meteorology.py,sha256=xIPQnIk9wGJPy8esJyxn35d6c_7UyiNuWTJXDnuSwf8,6995
-BESS_JPL/model.py,sha256=ioCuQXPO3tbhF-PXlCm1I7oo1Apno2FRjAANm0ShLG8,22811
+BESS_JPL/model.py,sha256=0JNCOeflASxA6iy70ppFuCkATPDnBDza2cQrJtHLtRY,22810
 BESS_JPL/peakVCmax_C3.jpeg,sha256=nVvwLx8JyRhtm5lWRW93HLz0mInshEdOCJ1tAdcFqa8,1006133
 BESS_JPL/peakVCmax_C3.tif,sha256=ax6wCOPc_ovgJJl9YRjPWNY13OCGlzs2djXqwob_U7A,1583598
 BESS_JPL/peakVCmax_C4.jpeg,sha256=s7dhpcD573KW9Se4mejDeSzbSHqPtQY2EL6KJKt7ZIo,961497
@@ -47,8 +46,8 @@ BESS_JPL/peakVCmax_C4.tif,sha256=EST4_yy-HHYmazIv--RePL_bhLejMWql6hoV9EE38ok,155
 BESS_JPL/process_BESS_table.py,sha256=TYsDEZNELGdUc0xkB1MRQIDkVonNL5d49q7Zl1iaJvo,1472
 BESS_JPL/soil_energy_balance.py,sha256=5TKDVkKYJ8jhjuiwbRva_03fi_0gTM0IAKbSm4WhWnY,944
 BESS_JPL/version.txt,sha256=-Q2F9kDoBjnO1g1dZcNwbI4pu99GLJDvdHkxmPdU4JU,6
-bess_jpl-1.15.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-bess_jpl-1.15.0.dist-info/METADATA,sha256=N6XioN8Coziy-RjHi-pXGw_CRN4KWqhwyCzBpG7HPec,6313
-bess_jpl-1.15.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bess_jpl-1.15.0.dist-info/top_level.txt,sha256=GaKnzt-BBktYn1o-w4Qzh_jHxse4Y3ACOxZQrB2ufhc,9
-bess_jpl-1.15.0.dist-info/RECORD,,
+bess_jpl-1.16.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+bess_jpl-1.16.0.dist-info/METADATA,sha256=q1qsKhcEH3_yB_Xo3AHDQORDQyuXM0Y6tpqNPqNsivU,6347
+bess_jpl-1.16.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bess_jpl-1.16.0.dist-info/top_level.txt,sha256=GaKnzt-BBktYn1o-w4Qzh_jHxse4Y3ACOxZQrB2ufhc,9
+bess_jpl-1.16.0.dist-info/RECORD,,

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}")