BESS-JPL 1.12.0__tar.gz → 1.14.0__tar.gz

{bess_jpl-1.12.0 → bess_jpl-1.14.0}/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
 
     steps:
       - name: Checkout repository

{bess_jpl-1.12.0 → bess_jpl-1.14.0}/BESS_JPL/model.py

@@ -12,7 +12,7 @@ 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
 
 from koppengeiger import load_koppen_geiger
-from gedi_canopy_height import load_canopy_height
+from gedi_canopy_height import load_canopy_height, GEDI_DOWNLOAD_DIRECTORY
 from FLiESANN import FLiESANN
 from GEOS5FP import GEOS5FP
 from MODISCI import MODISCI
@@ -87,7 +87,9 @@ def BESS_JPL(
         peakVCmax_C3: np.ndarray = None,  # peak maximum carboxylation rate for C3 plants
         peakVCmax_C4: np.ndarray = None,  # peak maximum carboxylation rate for C4 plants
         CI: Union[Raster, np.ndarray] = None,
-        resampling: str = RESAMPLING):  # clumping index
+        MODISCI_connection: MODISCI = None,
+        resampling: str = RESAMPLING,
+        GEDI_download_directory: str = GEDI_DOWNLOAD_DIRECTORY):  # clumping index
     if geometry is None and isinstance(ST_C, Raster):
         geometry = ST_C.geometry
 
@@ -231,9 +233,14 @@ def BESS_JPL(
     if KG_climate is None:
         KG_climate = load_koppen_geiger(geometry=geometry)
 
+
     # load canopy height in meters if not provided
     if canopy_height_meters is None:
-        canopy_height_meters = load_canopy_height(geometry=geometry, resampling=resampling)
+        canopy_height_meters = load_canopy_height(
+            geometry=geometry, 
+            resampling=resampling,
+            source_directory=GEDI_download_directory
+        )
 
     # load CO2 concentration in ppm if not provided
     if Ca is None:
@@ -263,9 +270,11 @@ def BESS_JPL(
     if SZA is None:
         SZA = calculate_SZA_from_DOY_and_hour(geometry.lat, geometry.lon, day_of_year, hour_of_day)
 
+    if MODISCI_connection is None:
+        MODISCI_connection = MODISCI()
+
     if CI is None and geometry is not None:
-        modisci = MODISCI()
-        CI = modisci.CI(geometry=geometry, resampling=resampling)
+        CI = MODISCI_connection.CI(geometry=geometry, resampling=resampling)
 
     # canopy height defaults to zero
     canopy_height_meters = np.where(np.isnan(canopy_height_meters), 0, canopy_height_meters)

bess_jpl-1.14.0/BESS_JPL/version.txt

@@ -0,0 +1 @@
+1.14.0

{bess_jpl-1.12.0 → bess_jpl-1.14.0}/BESS_JPL.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BESS-JPL
-Version: 1.12.0
+Version: 1.14.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.12.0 → bess_jpl-1.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BESS-JPL
-Version: 1.12.0
+Version: 1.14.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.12.0 → bess_jpl-1.14.0}/pyproject.toml

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

bess_jpl-1.12.0/BESS_JPL/version.txt

@@ -1 +0,0 @@
-1.12.0