Skip to content

Commit ed258e8

Browse files
fixing relative surface wetness parameterization
1 parent 9db8a71 commit ed258e8

File tree

3 files changed

+12
-86
lines changed

3 files changed

+12
-86
lines changed

PMJPL/PMJPL.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
from priestley_taylor import delta_Pa_from_Ta_C
3838
from PTJPL import calculate_relative_surface_wetness
39+
from PTJPL import RH_THRESHOLD, MIN_FWET
3940

4041
from .constants import *
4142
from .parameters import MOD16_parameter_from_IGBP
@@ -88,7 +89,9 @@ def PMJPL(
8889
elevation_km: Union[Raster, np.ndarray] = None,
8990
delta_Pa: Union[Raster, np.ndarray] = None,
9091
lambda_Jkg: Union[Raster, np.ndarray] = None,
91-
gamma_Jkg: Union[Raster, np.ndarray, float] = None) -> Dict[str, Raster]:
92+
gamma_Jkg: Union[Raster, np.ndarray, float] = None,
93+
RH_threshold: float = RH_THRESHOLD,
94+
min_fwet: float = MIN_FWET) -> Dict[str, Raster]:
9295
results = {}
9396

9497
if geometry is None and isinstance(NDVI, Raster):
@@ -243,7 +246,12 @@ def PMJPL(
243246

244247
# calculate relative surface wetness (fwet)
245248
# from relative humidity
246-
fwet = calculate_relative_surface_wetness(RH)
249+
fwet = calculate_relative_surface_wetness(
250+
RH=RH,
251+
RH_threshold=RH_threshold,
252+
min_fwet=min_fwet
253+
)
254+
247255
results['fwet'] = fwet
248256

249257
logger.info("calculating PM-MOD resistances")

PMJPL/fwet.py

Lines changed: 0 additions & 82 deletions
This file was deleted.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
33

44
[project]
55
name = "PM-JPL"
6-
version = "1.5.0"
6+
version = "1.5.1"
77
description = "JPL implementation of the MOD16 evapotranspiration algorithm for high resolution instantaneous remote sensing imagery"
88
readme = "README.md"
99
authors = [
@@ -32,7 +32,7 @@ dependencies = [
3232
"numpy",
3333
"pandas",
3434
"priestley-taylor",
35-
"PTJPL>=1.5.0",
35+
"PTJPL>=1.5.1",
3636
"rasters>=1.4.6",
3737
"SEBAL-soil-heat-flux",
3838
"sun-angles>=1.3.0",

0 commit comments

Comments
 (0)