Skip to content

Commit 0ee9c94

Browse files
making partition variable names consistent with PT-JPL-SM
1 parent 56dff1f commit 0ee9c94

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

PMJPL/model.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ def PMJPL(
463463
results['Ac'] = Ac
464464

465465
# calculate wet latent heat flux (LEi)
466-
LEi_Wm2 = calculate_interception(
466+
LE_interception_Wm2 = calculate_interception(
467467
delta_Pa=delta_Pa,
468468
Ac=Ac,
469469
rho=rho_kgm3,
@@ -475,8 +475,8 @@ def PMJPL(
475475
rvc=rvc,
476476
)
477477

478-
check_distribution(LEi_Wm2, "LEi_Wm2")
479-
results['LEi_Wm2'] = LEi_Wm2
478+
check_distribution(LE_interception_Wm2, "LE_interception_Wm2")
479+
results['LE_interception_Wm2'] = LE_interception_Wm2
480480

481481
# calculate correctance factor (rcorr)
482482
rcorr = calculate_correctance_factor(Ps_Pa, Ta_K)
@@ -566,7 +566,7 @@ def PMJPL(
566566
results["ra"] = ra
567567

568568
# transpiration
569-
LEc_Wm2 = calculate_transpiration(
569+
LE_canopy_Wm2 = calculate_transpiration(
570570
delta_Pa=delta_Pa,
571571
Ac=Ac,
572572
rho_kgm3=rho_kgm3,
@@ -578,8 +578,8 @@ def PMJPL(
578578
rs=rs,
579579
)
580580

581-
check_distribution(LEc_Wm2, "LEc_Wm2")
582-
results['LEc_Wm2'] = LEc_Wm2
581+
check_distribution(LE_canopy_Wm2, "LE_canopy_Wm2")
582+
results['LE_canopy_Wm2'] = LE_canopy_Wm2
583583

584584
# soil evaporation
585585
# aerodynamic resistant constraints from land-cover
@@ -659,13 +659,13 @@ def PMJPL(
659659
results['fSM'] = fSM
660660

661661
# soil evaporation
662-
LEs_Wm2 = rt.clip(wet_soil_evaporation_Wm2 + potential_soil_evaporation_Wm2 * fSM, 0.0, None)
663-
LEs_Wm2 = rt.where(np.isnan(LEs_Wm2), 0.0, LEs_Wm2)
664-
check_distribution(LEs_Wm2, "LEs_Wm2")
665-
results['LEs'] = LEs_Wm2
662+
LE_soil_Wm2 = rt.clip(wet_soil_evaporation_Wm2 + potential_soil_evaporation_Wm2 * fSM, 0.0, None)
663+
LE_soil_Wm2 = rt.where(np.isnan(LE_soil_Wm2), 0.0, LE_soil_Wm2)
664+
check_distribution(LE_soil_Wm2, "LE_soil_Wm2")
665+
results['LE_soil_Wm2'] = LE_soil_Wm2
666666

667667
# sum partitions into total latent heat flux
668-
LE_Wm2 = rt.clip(LEi_Wm2 + LEc_Wm2 + LEs_Wm2, 0.0, Rn_Wm2)
668+
LE_Wm2 = rt.clip(LE_interception_Wm2 + LE_canopy_Wm2 + LE_soil_Wm2, 0.0, Rn_Wm2)
669669
check_distribution(LE_Wm2, "LE_Wm2")
670670
results['LE_Wm2'] = LE_Wm2
671671

pyproject.toml

Lines changed: 1 addition & 1 deletion
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.6.0"
6+
version = "1.7.0"
77
description = "JPL implementation of the MOD16 evapotranspiration algorithm for high resolution instantaneous remote sensing imagery"
88
readme = "README.md"
99
authors = [

0 commit comments

Comments
 (0)