BESS-JPL 1.8.0__tar.gz → 1.9.0__tar.gz

{bess_jpl-1.8.0 → bess_jpl-1.9.0}/.gitignore

@@ -160,3 +160,4 @@ cython_debug/
 .idea/
 
 .DS_Store
+.venv

{bess_jpl-1.8.0 → bess_jpl-1.9.0}/BESS_JPL/BESS_JPL.py

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

@@ -0,0 +1 @@
+1.9.0

{bess_jpl-1.8.0 → bess_jpl-1.9.0/BESS_JPL.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BESS-JPL
-Version: 1.8.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.8.0 → bess_jpl-1.9.0}/BESS_JPL.egg-info/SOURCES.txt

@@ -63,9 +63,5 @@ BESS_JPL.egg-info/SOURCES.txt
 BESS_JPL.egg-info/dependency_links.txt
 BESS_JPL.egg-info/requires.txt
 BESS_JPL.egg-info/top_level.txt
-BESS_JPL/SZA/__init__.py
-BESS_JPL/SZA/daylight_hours.py
-BESS_JPL/vegetation_conversion/__init__.py
-BESS_JPL/vegetation_conversion/vegetation_conversion.py
 tests/test_import_breathing_earth_system_simulator.py
 tests/test_import_dependencies.py

{bess_jpl-1.8.0/BESS_JPL.egg-info → bess_jpl-1.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BESS-JPL
-Version: 1.8.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.8.0 → bess_jpl-1.9.0}/pyproject.toml

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

bess_jpl-1.8.0/BESS_JPL/SZA/__init__.py

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

bess_jpl-1.8.0/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-1.8.0/BESS_JPL/vegetation_conversion/__init__.py

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

bess_jpl-1.8.0/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)

bess_jpl-1.8.0/BESS_JPL/version.txt

@@ -1 +0,0 @@
-1.8.0