BESS-JPL 1.15.1__py3-none-any.whl → 1.17.0__py3-none-any.whl

BESS_JPL/LAI_from_NDVI.py

@@ -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/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,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/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

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

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

@@ -4,7 +4,7 @@ BESS_JPL/C4_fraction.jpeg,sha256=ECaEYWA8MnNd5z0Yq3beeUCR93KtTDxM8MrH-YYon3Y,274
 BESS_JPL/C4_fraction.tif,sha256=DFS-J08JCjnf0hi_T_dFridAegVTiU3FGyMBjS9yc1w,25446
 BESS_JPL/C4_photosynthesis.py,sha256=kITtT2kW1JkYY5v8wpMUhmxfBaJMr_uGk6go5P6w0ag,2029
 BESS_JPL/FVC_from_NDVI.py,sha256=LYI1ESsrO8UxlPOr_dxJYDeUsrwjVAwrV_OhL-tcAWc,567
-BESS_JPL/LAI_from_NDVI.py,sha256=amEQ9J2Yd_p1R57H9_-UhIvmZMpR0ZYPOhRRRIXpxPc,831
+BESS_JPL/LAI_from_NDVI.py,sha256=uwV1voc2q45hmsSHzIhehA3ZHLivzSeoST-ht9ecSIE,783
 BESS_JPL/NDVI_maximum.jpeg,sha256=6kc0-eE_WOU31bUztdjoWsZ3ZmqHAG-ZwS7lMiZyBGA,763946
 BESS_JPL/NDVI_maximum.tif,sha256=yRgdpB-xoVNMveIUapCrnGAwHX7WkH6pVXu4HECuFfc,19664541
 BESS_JPL/NDVI_minimum.jpeg,sha256=AfpRU8PikwExBJ2IdcFKewg6aTcp3gx3y3EQMzeA7vg,644871
@@ -22,23 +22,23 @@ BESS_JPL/canopy_longwave_radiation.py,sha256=TH5YaxyVgVP58moZ0aDGkMukJfcPQQgiYbu
 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/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=g1NpACWIKhq9TtABqHLGvxxSFwMZ9vb27nanVE8Sf1A,493
+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=0JNCOeflASxA6iy70ppFuCkATPDnBDza2cQrJtHLtRY,22810
+BESS_JPL/model.py,sha256=clIpapmr_i-oZAvc-4TdUDIHumoehsaYJWZNmVhBBuw,22993
 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
@@ -46,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.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-bess_jpl-1.15.1.dist-info/METADATA,sha256=rdUSpnCKyokULMfGO6E-eozn8MujX-2Qd8W8ufJN4U8,6347
-bess_jpl-1.15.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bess_jpl-1.15.1.dist-info/top_level.txt,sha256=GaKnzt-BBktYn1o-w4Qzh_jHxse4Y3ACOxZQrB2ufhc,9
-bess_jpl-1.15.1.dist-info/RECORD,,
+bess_jpl-1.17.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+bess_jpl-1.17.0.dist-info/METADATA,sha256=3906m_oz7FCNHjyaq8IKvdIFLw1oBZQdz-5Zrc6R6MQ,6347
+bess_jpl-1.17.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bess_jpl-1.17.0.dist-info/top_level.txt,sha256=GaKnzt-BBktYn1o-w4Qzh_jHxse4Y3ACOxZQrB2ufhc,9
+bess_jpl-1.17.0.dist-info/RECORD,,