BESS-JPL 1.12.0__py3-none-any.whl → 1.14.0__py3-none-any.whl

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/version.txt

@@ -1 +1 @@
-1.12.0
+1.14.0

{bess_jpl-1.12.0.dist-info → bess_jpl-1.14.0.dist-info}/METADATA

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

@@ -38,16 +38,16 @@ 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/meteorology.py,sha256=xIPQnIk9wGJPy8esJyxn35d6c_7UyiNuWTJXDnuSwf8,6995
-BESS_JPL/model.py,sha256=5UGo6cgllw0L-yYVKKoG9aHaYl6e2dJJw2AIjasZ990,22311
+BESS_JPL/model.py,sha256=WMUvWfG4ykuDE4wXwt6Tm7dMXWa1x69sCX4VwfumULM,22592
 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
 BESS_JPL/peakVCmax_C4.tif,sha256=EST4_yy-HHYmazIv--RePL_bhLejMWql6hoV9EE38ok,1556928
 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=Mxzh5cMxieiKK6Wumg40QSiWjBtcZD5bNkE_sBZZg10,6
-bess_jpl-1.12.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-bess_jpl-1.12.0.dist-info/METADATA,sha256=3ymV7ML6GNrH9tcw8NkTdOzXUG_bn2-Tre70JiZRfkk,6340
-bess_jpl-1.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bess_jpl-1.12.0.dist-info/top_level.txt,sha256=GaKnzt-BBktYn1o-w4Qzh_jHxse4Y3ACOxZQrB2ufhc,9
-bess_jpl-1.12.0.dist-info/RECORD,,
+BESS_JPL/version.txt,sha256=RbLZ3HRjNFvW-intziwQiZdlsdIv7hN9kC7dC9m_LTc,6
+bess_jpl-1.14.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+bess_jpl-1.14.0.dist-info/METADATA,sha256=1Ufu_DEGzbWHkhGA7skFaG4C2YK-rGoPBqVqiNCGnJo,6340
+bess_jpl-1.14.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bess_jpl-1.14.0.dist-info/top_level.txt,sha256=GaKnzt-BBktYn1o-w4Qzh_jHxse4Y3ACOxZQrB2ufhc,9
+bess_jpl-1.14.0.dist-info/RECORD,,