ECOv002-calval-tables 1.6.0__tar.gz → 1.9.0__tar.gz

{ecov002_calval_tables-1.6.0 → ecov002_calval_tables-1.9.0}/ECOv002_calval_tables/ECOv002_calval_tables.py

@@ -3,3 +3,4 @@ from .error_funcs import *
 from .plot_funcs import *
 from .ec_lib import *
 from .plot_single_model import *
+from .upscale_to_daylight import *

{ecov002_calval_tables-1.6.0 → ecov002_calval_tables-1.9.0}/ECOv002_calval_tables/load_tables.py

@@ -6,6 +6,8 @@ import geopandas as gpd
 
 from shapely.geometry import Point
 
+from .upscale_to_daylight import upscale_to_daylight
+
 def load_combined_eco_flux_ec_filtered() -> pd.DataFrame:
     """
     Load the filtered eddy covariance (EC) flux dataset used for ECOSTRESS Collection 2 ET product validation.
@@ -30,6 +32,7 @@ def load_metadata_ebc_filt() -> gpd.GeoDataFrame:
     
     geometry = [Point(xy) for xy in zip(df['Long'], df['Lat'])]
     gdf = gpd.GeoDataFrame(df, geometry=geometry, crs="EPSG:4326")
+    gdf["elevation_m"] = gdf["Elev"]
 
     return gdf
 
@@ -56,12 +59,20 @@ def load_calval_table() -> gpd.GeoDataFrame:
 
     merged_df["time_UTC"] = merged_df["eco_time_utc"]
     merged_df["ST_K"] = np.array(merged_df.LST)
-    merged_df["ST_C"] = merged_df.ST_K - 273.15
+    merged_df["ST_C"] = np.array(merged_df.ST_K - 273.15)
     merged_df["Ta_C"] = np.array(merged_df.Ta)
     merged_df["SWin_Wm2"] = np.array(merged_df.Rg)
     merged_df["emissivity"] = np.array(merged_df.EmisWB)
 
+    merged_df["insitu_LE_Wm2"] = np.array(merged_df.LEcorr50)
+    merged_df["insitu_H_Wm2"] = np.array(merged_df.Hcorr50)
+    merged_df["insitu_Rn_Wm2"] = np.array(merged_df.NETRAD_filt)
+    merged_df["insitu_G_Wm2"] = np.array(merged_df.G_filt)
+    merged_df["insitu_SWin_Wm2"] = np.array(merged_df.SW_IN)   
+
     # Convert merged DataFrame to GeoDataFrame
     gdf = gpd.GeoDataFrame(merged_df, geometry=merged_df["geometry"], crs="EPSG:4326")
     
+    gdf = upscale_to_daylight(gdf)
+
     return gdf

{ecov002_calval_tables-1.6.0 → ecov002_calval_tables-1.9.0}/ECOv002_calval_tables/plot_single_model.py

@@ -109,5 +109,6 @@ def quick_look_plot_single_model(
     fig.legend(handles=scatter_handles, loc='lower center', bbox_to_anchor=(0.5, -0.05), ncol=7, title='Vegetation Type',fontsize=10)
     # Adjust layout for better appearance
     fig.tight_layout()
-    # Return the figure object for display in Jupyter notebooks
+    # Prevent automatic display in Jupyter by closing the figure before returning
+    plt.close(fig)
     return fig

ecov002_calval_tables-1.9.0/ECOv002_calval_tables/upscale_to_daylight.py

@@ -0,0 +1,18 @@
+import pandas as pd
+from daylight_evapotranspiration import daylight_ET_from_instantaneous_LE
+
+def upscale_to_daylight(df: pd.DataFrame, prefix: str = "insitu_") -> pd.DataFrame:
+    daylight_results = daylight_ET_from_instantaneous_LE(
+        LE_instantaneous_Wm2=df.insitu_LE_Wm2,
+        Rn_instantaneous_Wm2=df.insitu_Rn_Wm2,
+        G_instantaneous_Wm2=df.insitu_G_Wm2,
+        time_UTC=df.time_UTC,
+        geometry=df.geometry
+    )
+    
+    daylight_results_prefixed = {f"{prefix}{k}": v for k, v in daylight_results.items()}
+    
+    for key, value in daylight_results_prefixed.items():
+        df[key] = value
+
+    return df

{ecov002_calval_tables-1.6.0 → ecov002_calval_tables-1.9.0}/ECOv002_calval_tables.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ECOv002-calval-tables
-Version: 1.6.0
+Version: 1.9.0
 Summary: Priestley-Taylor Jet Propulsion Laboratory Soil Moisutre Evapotranspiration Model
 Author-email: Gregory Halverson <gregory.h.halverson@jpl.nasa.gov>, Zoe Pierrat <zoe.a.pierrat@jpl.nasa.gov>
 Project-URL: Homepage, https://github.com/gregory-halverson/ECOv002-calval-tables
@@ -9,6 +9,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: daylight-evapotranspiration>=v1.3.4
 Requires-Dist: pandas
 Requires-Dist: geopandas
 Requires-Dist: numpy

{ecov002_calval_tables-1.6.0 → ecov002_calval_tables-1.9.0}/ECOv002_calval_tables.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ ECOv002_calval_tables/load_tables.py
 ECOv002_calval_tables/metadata_ebc_filt.csv
 ECOv002_calval_tables/plot_funcs.py
 ECOv002_calval_tables/plot_single_model.py
+ECOv002_calval_tables/upscale_to_daylight.py
 ECOv002_calval_tables/version.py
 ECOv002_calval_tables.egg-info/PKG-INFO
 ECOv002_calval_tables.egg-info/SOURCES.txt

{ecov002_calval_tables-1.6.0 → ecov002_calval_tables-1.9.0}/ECOv002_calval_tables.egg-info/requires.txt

@@ -1,3 +1,4 @@
+daylight-evapotranspiration>=v1.3.4
 pandas
 geopandas
 numpy

{ecov002_calval_tables-1.6.0 → ecov002_calval_tables-1.9.0}/ECOv002_calval_tables.egg-info/top_level.txt

@@ -1 +1,3 @@
 ECOv002_calval_tables
+dist
+tests

{ecov002_calval_tables-1.6.0 → ecov002_calval_tables-1.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ECOv002-calval-tables
-Version: 1.6.0
+Version: 1.9.0
 Summary: Priestley-Taylor Jet Propulsion Laboratory Soil Moisutre Evapotranspiration Model
 Author-email: Gregory Halverson <gregory.h.halverson@jpl.nasa.gov>, Zoe Pierrat <zoe.a.pierrat@jpl.nasa.gov>
 Project-URL: Homepage, https://github.com/gregory-halverson/ECOv002-calval-tables
@@ -9,6 +9,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: daylight-evapotranspiration>=v1.3.4
 Requires-Dist: pandas
 Requires-Dist: geopandas
 Requires-Dist: numpy

{ecov002_calval_tables-1.6.0 → ecov002_calval_tables-1.9.0}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "ECOv002-calval-tables"
-version = "1.6.0"
+version = "1.9.0"
 description = "Priestley-Taylor Jet Propulsion Laboratory Soil Moisutre Evapotranspiration Model"
 readme = "README.md"
 authors = [
@@ -15,6 +15,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
+    "daylight-evapotranspiration>=v1.3.4",
     "pandas",
     "geopandas",
     "numpy",
@@ -39,5 +40,8 @@ dev = [
 [tool.setuptools.package-data]
 ECOv002_calval_tables = ["*.csv"]
 
+[tool.setuptools.packages.find]
+exclude = ["notebooks*"]
+
 [project.urls]
 "Homepage" = "https://github.com/gregory-halverson/ECOv002-calval-tables"