BESS-JPL 1.7.0__py3-none-any.whl → 1.9.0__py3-none-any.whl

BESS_JPL/BESS_JPL.py

@@ -48,12 +48,12 @@ 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] = None,  # elevation in kilometers
         geometry: RasterGeometry = None,
         time_UTC: datetime = None,
         hour_of_day: np.ndarray = None,
         day_of_year: np.ndarray = None,
         GEOS5FP_connection: GEOS5FP = None,
+        elevation_km: Union[Raster, np.ndarray] = None,  # elevation in kilometers
         Ta_C: Union[Raster, np.ndarray] = None,  # air temperature in Celsius
         RH: Union[Raster, np.ndarray] = None,  # relative humidity as a proportion
         NDVI_minimum: Union[Raster, np.ndarray] = None,  # minimum NDVI
@@ -514,6 +514,7 @@ def BESS_JPL(
         "Rn": Rn,
         "Rn_soil": Rn_soil,
         "Rn_canopy": Rn_canopy,
+        "G": G,
         "LE": LE,
         "LE_soil": LE_soil,
         "LE_canopy": LE_canopy

BESS_JPL/version.txt

@@ -1 +1 @@
-1.7.0
+1.9.0

{bess_jpl-1.7.0.dist-info → bess_jpl-1.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BESS-JPL
-Version: 1.7.0
+Version: 1.9.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.7.0.dist-info → bess_jpl-1.9.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-BESS_JPL/BESS_JPL.py,sha256=ziycbcQ65bLB9s5CUP2J1CIAC-uvrrWCzdPJaC-8qZs,22295
+BESS_JPL/BESS_JPL.py,sha256=jF3Gb7IexnXlaj-Y0Obi0_ftGpnKv1IcitYxyvoMDBo,22311
 BESS_JPL/C3_photosynthesis.py,sha256=-ormDycaWttCOoYJdOoOV_zlM6n0nxkgXxj7fyH_mIs,2760
 BESS_JPL/C4_fraction.jpeg,sha256=ECaEYWA8MnNd5z0Yq3beeUCR93KtTDxM8MrH-YYon3Y,2746
 BESS_JPL/C4_fraction.tif,sha256=DFS-J08JCjnf0hi_T_dFridAegVTiU3FGyMBjS9yc1w,25446
@@ -43,13 +43,9 @@ BESS_JPL/peakVCmax_C3.tif,sha256=ax6wCOPc_ovgJJl9YRjPWNY13OCGlzs2djXqwob_U7A,158
 BESS_JPL/peakVCmax_C4.jpeg,sha256=s7dhpcD573KW9Se4mejDeSzbSHqPtQY2EL6KJKt7ZIo,961497
 BESS_JPL/peakVCmax_C4.tif,sha256=EST4_yy-HHYmazIv--RePL_bhLejMWql6hoV9EE38ok,1556928
 BESS_JPL/soil_energy_balance.py,sha256=5TKDVkKYJ8jhjuiwbRva_03fi_0gTM0IAKbSm4WhWnY,944
-BESS_JPL/version.txt,sha256=LBlAk30Td33A8sWokJIf8T6YuRqenUQ6QmUdjQ2LRI0,5
-BESS_JPL/SZA/__init__.py,sha256=crvPY6xMapE42hEd78jJWvW0NRfyzairRy75goNd6co,18
-BESS_JPL/SZA/daylight_hours.py,sha256=QkYUvq6-6JwNcErtg_WKQB93MAbwFokL9gSzrTwJVC4,2480
-BESS_JPL/vegetation_conversion/__init__.py,sha256=8gnz0yK_euCV0TtVGDrSGaVfx4g0EJCG2J68ppuA5oc,37
-BESS_JPL/vegetation_conversion/vegetation_conversion.py,sha256=PYus-c7zA-POa8gRDm7WzwLimWS-wKk1Mr6jkh590EU,2411
-bess_jpl-1.7.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-bess_jpl-1.7.0.dist-info/METADATA,sha256=Q5NcGaYCyZ9KgAbzdEztGh9fpIXO_sl8ZnBoM3CmeBw,6339
-bess_jpl-1.7.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-bess_jpl-1.7.0.dist-info/top_level.txt,sha256=GaKnzt-BBktYn1o-w4Qzh_jHxse4Y3ACOxZQrB2ufhc,9
-bess_jpl-1.7.0.dist-info/RECORD,,
+BESS_JPL/version.txt,sha256=dxfL-Qxjo7CWAIdjoCBmI5kW-pkW-YJU0ao7JHCDD80,5
+bess_jpl-1.9.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+bess_jpl-1.9.0.dist-info/METADATA,sha256=Ohmaq90iop6JHFhbzkdOJGHO-xM2u-Eg-d4piwmKOio,6339
+bess_jpl-1.9.0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+bess_jpl-1.9.0.dist-info/top_level.txt,sha256=GaKnzt-BBktYn1o-w4Qzh_jHxse4Y3ACOxZQrB2ufhc,9
+bess_jpl-1.9.0.dist-info/RECORD,,

{bess_jpl-1.7.0.dist-info → bess_jpl-1.9.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

BESS_JPL/SZA/__init__.py

@@ -1 +0,0 @@
-from .SZA import *

BESS_JPL/SZA/daylight_hours.py

@@ -1,74 +0,0 @@
-"""
-This module calculates sunrise hour and daylight hours.
-
-Developed by Gregory Halverson in the Jet Propulsion Laboratory Year-Round Internship Program (Columbus Technologies and Services, ANRE Tech.), in coordination with the ECOSTRESS mission and master's thesis studies at California State University, Northridge.
-"""
-import warnings
-from numpy import tan, cos, sin, pi, arccos, where, radians, degrees
-
-__author__ = 'Gregory Halverson'
-
-
-def day_angle_rad_from_doy(doy):
-    """
-    This function calculates day angle in radians from day of year between 1 and 365.
-    """
-    return (2 * pi * (doy - 1)) / 365
-
-
-def solar_dec_deg_from_day_angle_rad(day_angle_rad):
-    """
-    This function calculates solar declination in degrees from day angle in radians. 
-    """
-    return (0.006918 - 0.399912 * cos(day_angle_rad) + 0.070257 * sin(day_angle_rad) - 0.006758 * cos(
-        2 * day_angle_rad) + 0.000907 * sin(2 * day_angle_rad) - 0.002697 * cos(3 * day_angle_rad) + 0.00148 * sin(
-        3 * day_angle_rad)) * (180 / pi)
-
-
-def sha_deg_from_doy_lat(doy, latitude):
-    """
-    This function calculates sunrise hour angle in degrees from latitude in degrees and day of year between 1 and 365. 
-    """
-    # calculate day angle in radians
-    day_angle_rad = day_angle_rad_from_doy(doy)
-
-    # calculate solar declination in degrees
-    solar_dec_deg = solar_dec_deg_from_day_angle_rad(day_angle_rad)
-
-    # convert latitude to radians
-    latitude_rad = radians(latitude)
-
-    # convert solar declination to radians
-    solar_dec_rad = radians(solar_dec_deg)
-
-    # calculate cosine of sunrise angle at latitude and solar declination
-    # need to keep the cosine for polar correction
-    sunrise_cos = -tan(latitude_rad) * tan(solar_dec_rad)
-
-    # calculate sunrise angle in radians from cosine
-    warnings.filterwarnings('ignore')
-    sunrise_rad = arccos(sunrise_cos)
-    warnings.resetwarnings()
-
-    # convert to degrees
-    sunrise_deg = degrees(sunrise_rad)
-
-    # apply polar correction
-    sunrise_deg = where(sunrise_cos >= 1, 0, sunrise_deg)
-    sunrise_deg = where(sunrise_cos <= -1, 180, sunrise_deg)
-
-    return sunrise_deg
-
-
-def sunrise_from_sha(sha_deg):
-    """
-    This function calculates sunrise hour from sunrise hour angle in degrees. 
-    """
-    return 12.0 - (sha_deg / 15.0)
-
-
-def daylight_from_sha(sha_deg):
-    """
-    This function calculates daylight hours from sunrise hour angle in degrees.
-    """
-    return (2.0 / 15.0) * sha_deg

BESS_JPL/vegetation_conversion/__init__.py

@@ -1 +0,0 @@
-from .vegetation_conversion import *

BESS_JPL/vegetation_conversion/vegetation_conversion.py

@@ -1,71 +0,0 @@
-from typing import Union
-import numpy as np
-import rasters as rt
-from rasters import Raster
-
-KPAR = 0.5
-MIN_FIPAR = 0.0
-MAX_FIPAR = 1.0
-MIN_LAI = 0.0
-MAX_LAI = 10.0
-
-def FVC_from_NDVI(NDVI: Union[Raster, np.ndarray]) -> Union[Raster, np.ndarray]:
-    """
-    Convert Normalized Difference Vegetation Index (NDVI) to Fractional Vegetation Cover (FVC).
-
-    Parameters:
-        NDVI (Union[Raster, np.ndarray]): Input NDVI data.
-
-    Returns:
-        Union[Raster, np.ndarray]: Converted FVC data.
-    """
-    NDVIv = 0.52  # +- 0.03
-    NDVIs = 0.04  # +- 0.03
-    FVC = rt.clip((NDVI - NDVIs) / (NDVIv - NDVIs), 0.0, 1.0)
-
-    return FVC
-
-def LAI_from_NDVI(
-        NDVI: Union[Raster, np.ndarray],
-        min_fIPAR: float = MIN_FIPAR,
-        max_fIPAR: float = MAX_FIPAR,
-        min_LAI: float = MIN_LAI,
-        max_LAI: float = MAX_LAI) -> Union[Raster, np.ndarray]:
-    """
-    Convert Normalized Difference Vegetation Index (NDVI) to Leaf Area Index (LAI).
-
-    Parameters:
-        NDVI (Union[Raster, np.ndarray]): Input NDVI data.
-
-    Returns:
-        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
-
-def SAVI_from_NDVI(NDVI: Union[Raster, np.ndarray]) -> Union[Raster, np.ndarray]:
-    """
-    Linearly calculates Soil-Adjusted Vegetation Index from ST_K.
-    :param NDVI: normalized difference vegetation index clipped between 0 and 1
-    :return: soil-adjusted vegetation index
-    """
-    return NDVI * 0.45 + 0.132
-
-def fAPAR_from_SAVI(SAVI: Union[Raster, np.ndarray]) -> Union[Raster, np.ndarray]:
-    """
-    Linearly calculates fraction of absorbed photosynthetically active radiation from soil-adjusted vegetation index.
-    :param SAVI: soil adjusted vegetation index
-    :return: fraction of absorbed photosynthetically active radiation
-    """
-    return rt.clip(SAVI * 1.3632 + -0.048, 0, 1)
-
-def fIPAR_from_NDVI(NDVI: Union[Raster, np.ndarray]) -> Union[Raster, np.ndarray]:
-    """
-    Calculate fraction of intercepted photosynthetically active radiation from normalized difference vegetation index
-    :param NDVI: normalized difference vegetation index
-    :return: fraction of intercepted photosynthetically active radiation
-    """
-    return rt.clip(rt.clip(NDVI, 0, 1) - 0.05, 0, 1)