PyPI - BESS-JPL - Versions diffs - 1.15.1__tar.gz → 1.17.0__tar.gz - Mend

BESS-JPL 1.15.1tar.gz → 1.17.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of BESS-JPL might be problematic. Click here for more details.

Files changed (72) hide show

{bess_jpl-1.15.1 → bess_jpl-1.17.0}/BESS_JPL/LAI_from_NDVI.py RENAMED Viewed

@@ -23,7 +23,6 @@ def LAI_from_NDVI(
         Union[Raster, np.ndarray]: Converted LAI data.
     """
     fIPAR = rt.clip(NDVI - 0.05, min_fIPAR, max_fIPAR)
-    fIPAR = np.where(fIPAR == 0, np.nan, fIPAR)
     LAI = rt.clip(-np.log(1 - fIPAR) * (1 / KPAR), min_LAI, max_LAI)
     return LAI

{bess_jpl-1.15.1 → bess_jpl-1.17.0}/BESS_JPL/carbon_water_fluxes.py RENAMED Viewed

@@ -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.1 → bess_jpl-1.17.0}/BESS_JPL/load_C4_fraction.py RENAMED Viewed

@@ -3,8 +3,13 @@ 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)
+    # Scale image to be between 0 and 1
+    image /= 100.0
     return image

{bess_jpl-1.15.1 → bess_jpl-1.17.0}/BESS_JPL/load_NDVI_maximum.py RENAMED Viewed

@@ -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.1 → bess_jpl-1.17.0}/BESS_JPL/load_NDVI_minimum.py RENAMED Viewed

@@ -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.1 → bess_jpl-1.17.0}/BESS_JPL/load_ball_berry_slope_C3.py RENAMED Viewed

@@ -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.1 → bess_jpl-1.17.0}/BESS_JPL/load_ball_berry_slope_C4.py RENAMED Viewed

@@ -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.1 → bess_jpl-1.17.0}/BESS_JPL/load_kn.py RENAMED Viewed

@@ -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.1 → bess_jpl-1.17.0}/BESS_JPL/load_peakVCmax_C3.py RENAMED Viewed

@@ -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.1 → bess_jpl-1.17.0}/BESS_JPL/load_peakVCmax_C4.py RENAMED Viewed

@@ -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.1 → bess_jpl-1.17.0}/BESS_JPL/model.py RENAMED Viewed

@@ -185,7 +185,12 @@ def BESS_JPL(
                 logger.warning(f"Variable '{name}' has a different size: {size} (expected: {reference_size}).")
     # check if any of the FLiES outputs are not given
-    if None in (Rg, VISdiff, VISdir, NIRdiff, NIRdir, UV, albedo_visible, albedo_NIR):
+    flies_variables = [Rg, VISdiff, VISdir, NIRdiff, NIRdir, UV, albedo_visible, albedo_NIR]
+    flies_variables_missing = False
+    for variable in flies_variables:
+        if variable is None:
+            flies_variables_missing = True
+    if flies_variables_missing:
         # load cloud optical thickness if not provided
         if COT is None:
             COT = GEOS5FP_connection.COT(time_UTC=time_UTC, geometry=geometry, resampling=resampling)

{bess_jpl-1.15.1 → bess_jpl-1.17.0}/BESS_JPL.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BESS-JPL
-Version: 1.15.1
+Version: 1.17.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

{bess_jpl-1.15.1 → bess_jpl-1.17.0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BESS-JPL
-Version: 1.15.1
+Version: 1.17.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

{bess_jpl-1.15.1 → bess_jpl-1.17.0}/pyproject.toml RENAMED Viewed

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