BESS-JPL 1.6.0__tar.gz → 1.7.0__tar.gz

bess_jpl-1.6.0/BESS_JPL/BESS.py → bess_jpl-1.7.0/BESS_JPL/BESS_JPL.py

@@ -9,38 +9,46 @@ from rasters import Raster, RasterGeometry
 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
 
 from koppengeiger import load_koppen_geiger
 from gedi_canopy_height import load_canopy_height
 from FLiESANN import FLiESANN
 from GEOS5FP import GEOS5FP
 from MODISCI import MODISCI
+from NASADEM import NASADEM
 
 from .constants import *
-from .vegetation_conversion import LAI_from_NDVI
-from .canopy_shortwave_radiation import canopy_shortwave_radiation
-from .carbon_water_fluxes import carbon_water_fluxes
-from .meteorology import meteorology, SVP_Pa_from_Ta_K
-from .interpolate_C3_C4 import interpolate_C3_C4
-from .calculate_VCmax import calculate_VCmax
-from .load_NDVI_minimum import load_NDVI_minimum
-from .load_NDVI_maximum import load_NDVI_maximum
-from .load_C4_fraction import load_C4_fraction
-from .load_carbon_uptake_efficiency import load_carbon_uptake_efficiency
-from .load_kn import load_kn
-from .load_peakVCmax_C3 import load_peakVCmax_C3
-from .load_peakVCmax_C4 import load_peakVCmax_C4
-from .load_ball_berry_intercept_C3 import load_ball_berry_intercept_C3
-from .load_ball_berry_slope_C3 import load_ball_berry_slope_C3
-from .load_ball_berry_slope_C4 import load_ball_berry_slope_C4
+from .C3_photosynthesis import *
+from .C4_photosynthesis import *
+from .canopy_energy_balance import *
+from .canopy_longwave_radiation import *
+from .canopy_shortwave_radiation import *
+from .carbon_water_fluxes import *
+from .FVC_from_NDVI import *
+from .interpolate_C3_C4 import *
+from .LAI_from_NDVI import *
+from .load_C4_fraction import *
+from .load_carbon_uptake_efficiency import *
+from .load_kn import *
+from .load_NDVI_minimum import *
+from .load_NDVI_maximum import *
+from .load_peakVCmax_C3 import *
+from .load_peakVCmax_C4 import *
+from .load_ball_berry_intercept_C3 import *
+from .load_ball_berry_slope_C3 import *
+from .load_ball_berry_slope_C4 import *
+from .calculate_VCmax import *
+from .meteorology import *
+from .soil_energy_balance import *
 
 logger = logging.getLogger(__name__)
 
-def BESS(
+def BESS_JPL(
         ST_C: Union[Raster, np.ndarray],  # surface temperature in Celsius
         NDVI: Union[Raster, np.ndarray],  # NDVI
         albedo: Union[Raster, np.ndarray],  # surface albedo
-        elevation_km: Union[Raster, np.ndarray],  # elevation in kilometers
+        elevation_km: Union[Raster, np.ndarray] = None,  # elevation in kilometers
         geometry: RasterGeometry = None,
         time_UTC: datetime = None,
         hour_of_day: np.ndarray = None,
@@ -83,6 +91,9 @@ def BESS(
     if geometry is None and isinstance(ST_C, Raster):
         geometry = ST_C.geometry
 
+    if GEOS5FP_connection is None:
+        GEOS5FP_connection = GEOS5FP()
+
     if (day_of_year is None or hour_of_day is None) and time_UTC is not None and geometry is not None:
         day_of_year = solar_day_of_year_for_area(time_UTC=time_UTC, geometry=geometry)
         hour_of_day = solar_hour_of_day_for_area(time_UTC=time_UTC, geometry=geometry)
@@ -90,6 +101,9 @@ def BESS(
     if time_UTC is None and day_of_year is None and hour_of_day is None:
         raise ValueError("no time given between time_UTC, day_of_year, and hour_of_day")
 
+    if elevation_km is None and geometry is not None:
+        elevation_km = NASADEM.elevation_km(geometry=geometry)
+
     # load air temperature in Celsius if not provided
     if Ta_C is None:
         Ta_C = GEOS5FP_connection.Ta_C(time_UTC=time_UTC, geometry=geometry, resampling=resampling)
@@ -138,6 +152,31 @@ def BESS(
     if ball_berry_intercept_C3 is None:
         ball_berry_intercept_C3 = load_ball_berry_intercept_C3(geometry=geometry, resampling=resampling)
 
+    # Create a dictionary of variables to check
+    variables_to_check = {
+        "Rg": Rg,
+        "VISdiff": VISdiff,
+        "VISdir": VISdir,
+        "NIRdiff": NIRdiff,
+        "NIRdir": NIRdir,
+        "UV": UV,
+        "albedo_visible": albedo_visible,
+        "albedo_NIR": albedo_NIR
+    }
+
+    # Check for None values and size mismatches
+    reference_size = None
+    for name, var in variables_to_check.items():
+        if var is None:
+            logger.warning(f"Variable '{name}' is None.")
+        else:
+            # Get the size of the variable if it's a numpy array
+            size = var.shape if isinstance(var, np.ndarray) else None
+            if reference_size is None:
+                reference_size = size  # Set the first non-None size as the reference
+            elif size != reference_size:
+                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):
         # load cloud optical thickness if not provided
@@ -152,8 +191,10 @@ def BESS(
 
         # run FLiES radiative transfer model
         FLiES_results = FLiESANN(
+            time_UTC=time_UTC,
             day_of_year=day_of_year,
             hour_of_day=hour_of_day,
+            geometry=geometry,
             albedo=albedo,
             COT=COT,
             AOT=AOT,
@@ -162,7 +203,6 @@ def BESS(
             elevation_km=elevation_km,
             SZA=SZA,
             KG_climate=KG_climate,
-            geometry=geometry,
             GEOS5FP_connection=GEOS5FP_connection
         )
 
@@ -173,8 +213,19 @@ def BESS(
         NIRdiff = FLiES_results["NIRdiff"]
         NIRdir = FLiES_results["NIRdir"]
         UV = FLiES_results["UV"]
-        albedo_visible = FLiES_results["VIS"]
-        albedo_NIR = FLiES_results["NIR"]
+        # albedo_visible = FLiES_results["VIS"]
+        # albedo_NIR = FLiES_results["NIR"]
+        albedo_NWP = GEOS5FP_connection.ALBEDO(time_UTC=time_UTC, geometry=geometry, resampling=resampling)
+        RVIS_NWP = GEOS5FP_connection.ALBVISDR(time_UTC=time_UTC, geometry=geometry, resampling=resampling)
+        albedo_visible = rt.clip(albedo * (RVIS_NWP / albedo_NWP), 0, 1)
+        check_distribution(albedo_visible, "RVIS")
+        RNIR_NWP = GEOS5FP_connection.ALBNIRDR(time_UTC=time_UTC, geometry=geometry, resampling=resampling)
+        albedo_NIR = rt.clip(albedo * (RNIR_NWP / albedo_NWP), 0, 1)
+        check_distribution(albedo_NIR, "RNIR")
+        PARDir = VISdir
+        check_distribution(PARDir, "PARDir")
+    else:
+        logger.info("using given FLiES output as BESS parameters")
 
     # load koppen geiger climate classification if not provided
     if KG_climate is None:
@@ -210,7 +261,7 @@ def BESS(
 
     # calculate solar zenith angle if not provided
     if SZA is None:
-        SZA = calculate_SZA_from_DOY_and_hour(lat, lon, day_of_year, hour_of_day)
+        SZA = calculate_SZA_from_DOY_and_hour(geometry.lat, geometry.lon, day_of_year, hour_of_day)
 
     if CI is None and geometry is not None:
         modisci = MODISCI()
@@ -323,7 +374,6 @@ def BESS(
     for var_name, var_value in canopy_radiation_outputs.items():
         check_distribution(var_value, var_name, time_UTC)
 
-
     canopy_temperature_K = canopy_temperature_C + 273.15
     soil_temperature_K = soil_temperature_C + 273.15
 
@@ -376,7 +426,6 @@ def BESS(
     for var_name, var_value in carbon_water_fluxes_outputs.items():
         check_distribution(var_value, var_name, time_UTC)
 
-
     GPP_C4, LE_C4, LE_soil_C4, LE_canopy_C4, Rn_C4, Rn_soil_C4, Rn_canopy_C4 = carbon_water_fluxes(
         canopy_temperature_K=canopy_temperature_K,  # canopy temperature in Kelvin
         soil_temperature_K=soil_temperature_K,  # soil temperature in Kelvin
@@ -431,6 +480,9 @@ def BESS(
     GPP = np.clip(interpolate_C3_C4(GPP_C3, GPP_C4, C4_fraction), 0, 50)
     GPP = np.where(np.isnan(ST_K), np.nan, GPP)
 
+    if isinstance(geometry, RasterGeometry):
+        GPP = Raster(GPP, geometry=geometry)
+
     # upscale from instantaneous to daily
 
     # upscale GPP to daily

bess_jpl-1.7.0/BESS_JPL/version.txt

@@ -0,0 +1 @@
+1.7.0

{bess_jpl-1.6.0 → bess_jpl-1.7.0/BESS_JPL.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BESS-JPL
-Version: 1.6.0
+Version: 1.7.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
@@ -10,13 +10,15 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: check-distribution
-Requires-Dist: FLiESANN>=1.4.1
+Requires-Dist: FLiESANN>=1.4.2
 Requires-Dist: gedi-canopy-height>=1.1.0
 Requires-Dist: GEOS5FP>=1.1.1
 Requires-Dist: koppengeiger>=1.0.4
 Requires-Dist: MODISCI>=1.3.0
+Requires-Dist: NASADEM
 Requires-Dist: numpy
 Requires-Dist: rasters
+Requires-Dist: solar-apparent-time>=1.3.2
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
 Requires-Dist: pytest>=6.0; extra == "dev"

{bess_jpl-1.6.0 → bess_jpl-1.7.0}/BESS_JPL.egg-info/SOURCES.txt

@@ -4,13 +4,14 @@ Dockerfile
 LICENSE
 Li_2023_RSE.pdf
 MANIFEST.in
+Processing BESS with rasters with default parameters.ipynb
 Processing BESS with rasters.ipynb
 README.md
 makefile
+processing_BESS_with_rasters_and_default_parameters.py
 pyproject.toml
 .github/workflows/ci.yml
 .github/workflows/python-publish.yml
-BESS_JPL/BESS.py
 BESS_JPL/BESS_JPL.py
 BESS_JPL/C3_photosynthesis.py
 BESS_JPL/C4_fraction.jpeg

{bess_jpl-1.6.0 → bess_jpl-1.7.0}/BESS_JPL.egg-info/requires.txt

@@ -1,11 +1,13 @@
 check-distribution
-FLiESANN>=1.4.1
+FLiESANN>=1.4.2
 gedi-canopy-height>=1.1.0
 GEOS5FP>=1.1.1
 koppengeiger>=1.0.4
 MODISCI>=1.3.0
+NASADEM
 numpy
 rasters
+solar-apparent-time>=1.3.2
 
 [dev]
 build

{bess_jpl-1.6.0/BESS_JPL.egg-info → bess_jpl-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BESS-JPL
-Version: 1.6.0
+Version: 1.7.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
@@ -10,13 +10,15 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: check-distribution
-Requires-Dist: FLiESANN>=1.4.1
+Requires-Dist: FLiESANN>=1.4.2
 Requires-Dist: gedi-canopy-height>=1.1.0
 Requires-Dist: GEOS5FP>=1.1.1
 Requires-Dist: koppengeiger>=1.0.4
 Requires-Dist: MODISCI>=1.3.0
+Requires-Dist: NASADEM
 Requires-Dist: numpy
 Requires-Dist: rasters
+Requires-Dist: solar-apparent-time>=1.3.2
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
 Requires-Dist: pytest>=6.0; extra == "dev"