Skip to content

Commit 20b4108

Browse files
gregory-halversongregory-halverson
authored
Merge pull request #42 from JPL-Evapotranspiration-Algorithms/GEOS5FP
v2.4.0 fixing elevation
2 parents 510de2f + 8407019 commit 20b4108

File tree

4 files changed

+22
-3
lines changed

4 files changed

+22
-3
lines changed

‎ECOv002-cal-val-FLiESANN-inputs-single-day.csv‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Unnamed: 0,ID,vegetation,climate,STICinst,BESSinst,MOD16inst,PTJPLSMinst,ETinst,ETinstUncertainty,PET,Rn,ESI,RH,Ta,LST,SM,NDVI,NDVI-UQ,albedo,albedo-UQ,LST_err,view_zenith,Rg,EmisWB,time_utc,solar_time,solar_hour,local_time,LE,LE_filt,LEcorr25,LEcorr50,LEcorr75,LEcorr_ann,H_filt,Hcorr25,Hcorr50,Hcorr75,Hcorr_ann,NETRAD_filt,G_filt,SM_surf,SM_rz,AirTempC,SW_IN,RH_percentage,ESIrn_STIC,ESIrn_PTJPLSM,ESIrn_MOD16,ESIrn_BESS,ESIrn_Unc_ECO,ESIrn_LEcorr50,JET,eco_time_utc,Site Name,Date-Time,Site ID,Name,Lat,Long,Elev,Clim,Veg,MAT,MAP,StartDate,EndDate,LE_count,closure_ratio,geometry,elevation_m,time_UTC,ST_K,ST_C,Ta_C,SWin_Wm2,emissivity,insitu_LE_Wm2,insitu_H_Wm2,insitu_Rn_Wm2,insitu_G_Wm2,insitu_SWin_Wm2,insitu_Rn_daylight_Wm2,insitu_LE_daylight_Wm2,insitu_ET_daylight_kg,date_UTC,SZA_deg,KG_climate,COT,AOT,vapor_gccm,ozone_cm,atmospheric_transmittance,UV_proportion,PAR_proportion,NIR_proportion,UV_diffuse_fraction,PAR_diffuse_fraction,NIR_diffuse_fraction,SWin_TOA_Wm2,UV_Wm2,PAR_Wm2,NIR_Wm2,PAR_diffuse_Wm2,NIR_diffuse_Wm2,PAR_direct_Wm2,NIR_direct_Wm2
2+
417,US-SP1,ENF,Cfa,69.37519,88.15666,157.8836,62.564243,134.5920867919922,37.822815,107.159645,157.8836,0.5885459,0.5210947,13.979148,286.98,0.2354237,0.780939,0.011907275,0.059262488,0.0043518543,0.92,18.842138,255.81815,0.974,2019-01-28 21:00:00,2019-01-28 16:08:10,15.0,2019-01-28 16:00:00,121.827,121.827,67.13768426512307,154.96716137850925,208.94245115028255,160.22925219226204,119.999,66.13029110238702,152.641897102118,205.80729391335876,157.8250308537455,290.447,6.864025,0.431192,0.431192,14.3355,443.404,0.468481,0.4394071961875711,0.3962681557805877,1.0,0.5583648966707119,0.2395613920635202,0.5335471234976062,78.76592500000001,2019-01-28 21:08:10,US-SP1,2019-01-28 21:08:10,US-SP1,Slashpine-Austin Cary- 65yrs nat regen,29.7381,-82.2188,50.0,Cfa,ENF,20.06,1309.77,10/1/18 05:00,1/1/21 04:30,29260,0.69,POINT (-82.2188 29.7381),50.0,2019-01-28 21:08:10,286.98,13.830000000000041,13.979148,[[306.77618 14.513657 436.37036 14.500083 436.37036 ]],0.974,154.96716137850925,152.641897102118,290.447,6.864025,443.404,319.5916648130995,174.64452192984447,2.704268246964529,2019-01-28,[71.46303285],3,[[ 0.07812501 29.7381 0. 29.75 0. ]]," AOT lat lon lat_used lon_used
3+
time
4+
2019-01-28 22:30:00 0.067098 29.7381 -82.2188 29.75 -82.1875"," vapor_kgsqm lat lon lat_used lon_used
5+
time
6+
2019-01-28 21:00:00 0.892289 2.97381 -8.22188 2.975 -8.21875"," ozone_dobson lat lon lat_used lon_used
7+
time
8+
2019-01-28 21:00:00 0.284641 0.029738 -0.082219 0.02975 -0.082187",[[0.70301795 0.03325995 1. 0.03322884 1. ]],[[0.05151009 0.02740597 0.03970877 0.02740946 0.03969026]],[[0.4493852 0.36914727 0.48548484 0.3691522 0.48549432]],[[0.5003791 0.6027657 0.4920569 0.60275745 0.4920888 ]],[[0.6724718 0.99871695 0.51735544 0.9987172 0.5172063 ]],[[0.23107205 0.91286635 0.34884635 0.9128663 0.3486098 ]],[[0.23850797 0.99847627 0.7614393 0.9984757 0.76137745]],[436.37036],[[15.80207 0.39776078 17.327732 0.39743945 17.319654 ]],[[137.86067 5.3576765 211.8512 5.3527374 211.85533 ]],[[153.50438 8.748334 214.71906 8.740033 214.73297 ]],[[31.85575 4.8908424 73.90352 4.8863335 73.85484 ]],[[ 36.61202 8.735003 163.49553 8.72671 163.49284 ]],[[106.00492 0.46683407 137.94768 0.46640396 138.00049 ]],"[[1.16892365e+02 1.33304596e-02 5.12235260e+01 1.33228302e-02
9+
5.12401276e+01]]"
10+
687,US-xJR,OSH,Bsk,52.094456,516.8735,20.800644,58.24502,32.90568542480469,205.51582,59.941467,105.68483,0.9717012,0.3363894,16.092783,293.44,0.16932568,0.13378394,0.010039587,0.10092577,0.01003927,0.84,23.156916,240.34111,0.958,2019-01-28 22:30:00,2019-01-28 15:40:54,15.0,2019-01-28 15:30:00,9.03815482927732,9.03815482927732,11.74197869972539,15.142689202928668,,13.45657824755833,119.330869112325,155.0294888507321,199.9291113524532,280.0640648765075,177.6673677195171,201.78,53.690333333333335,0.0348666666666666,0.06262,17.299860000000002,438.5,0.1681,0.4929227401889183,0.5511199667918281,0.1968176889720123,4.890706641624915,1.9446104043503687,0.075045540702392,55.169737999999995,2019-01-28 22:40:54,US-xJR,2019-01-28 22:40:54,US-xJR,NEON Jornada LTER (JORN),32.5907,-106.8425,1329.0,Bsk,OSH,15.7,271.33,10/1/18 07:00,12/1/22 00:00,38169,0.66,POINT (-106.8425 32.5907),1329.0,2019-01-28 22:40:54,293.44,20.29000000000002,16.092783,[[301.0941 11.12924 420.91544 11.246837 420.91544 ]],0.958,15.142689202928668,199.9291113524532,201.78,53.690333333333335,438.5,217.64729992283753,22.255201816386894,0.33883168624289856,2019-01-28,[72.14213476],2,"[[6.17220486e-03 3.25907000e+01 0.00000000e+00 3.25000000e+01
11+
0.00000000e+00]]"," AOT lat lon lat_used lon_used
12+
time
13+
2019-01-28 22:30:00 0.037649 32.5907 -106.8425 32.5 -106.875"," vapor_kgsqm lat lon lat_used lon_used
14+
time
15+
2019-01-29 0.654387 3.25907 -10.68425 3.25 -10.6875"," ozone_dobson lat lon lat_used lon_used
16+
time
17+
2019-01-29 0.255987 0.032591 -0.106843 0.0325 -0.106875",[[0.71533155 0.02644056 1. 0.02671994 1. ]],[[0.05385479 0.02817844 0.05054206 0.02814697 0.05055377]],[[0.44239604 0.37008405 0.47213525 0.3700347 0.47211814]],[[0.50605106 0.60110116 0.48083675 0.6011801 0.48082882]],[[0.6086619 0.9988578 0.62113637 0.99884915 0.6212431 ]],[[0.26544496 0.9129193 0.5233304 0.9129148 0.5235189 ]],[[0.17297383 0.998428 0.810947 0.9984282 0.8110032 ]],[420.91544],[[16.215359 0.3136046 21.273935 0.31656438 21.27886 ]],[[133.20284 4.1187544 198.72902 4.16172 198.72182 ]],[[152.36899 6.6897993 202.39162 6.761374 202.38828 ]],[[ 35.35802 3.7600904 104.00094 3.7992957 104.03463 ]],[[ 26.355846 6.6792827 164.12888 6.7507467 164.13754 ]],[[97.84482 0.35866404 94.72808 0.36242414 94.68719 ]],"[[1.26013138e+02 1.05166435e-02 3.82627411e+01 1.06272697e-02
18+
3.82507324e+01]]"

‎FLiESANN/run_FLiESANN_inference.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ def run_FLiESANN_inference(
6262
- The function automatically adjusts the input shape to match the model's expected input dimensions.
6363
- TensorFlow warnings and logs are suppressed during model loading and inference.
6464
"""
65-
elevation_km = elevation_m / 1000.0 # Convert elevation from meters to kilometers
66-
6765
import os
6866
import warnings
6967
# Save current TF_CPP_MIN_LOG_LEVEL and TF logger level
@@ -108,6 +106,9 @@ def run_FLiESANN_inference(
108106
elevation_m = np.where(nan_mask, 0, elevation_m)
109107
SZA = np.where(nan_mask, 0, SZA)
110108

109+
# Convert elevation from meters to kilometers after all array processing
110+
elevation_km = elevation_m / 1000.0
111+
111112
# Prepare inputs for the ANN model
112113
inputs = prepare_FLiESANN_inputs(
113114
atype=atype,

generate_input_dataset_single_day.py renamed to generate_FLiES_input_dataset_single_day.py

File renamed without changes.

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ requires = ["setuptools>=60", "setuptools-scm>=8.0", "wheel"]
33

44
[project]
55
name = "FLiESANN"
6-
version = "2.3.0"
6+
version = "2.4.0"
77
description = "Forest Light Environmental Simulator (FLiES) Radiative Transfer Model Artificial Neural Network (ANN) Implementation in Python"
88
readme = "README.md"
99
authors = [

0 commit comments

Comments
 (0)