ECOv002-calval-tables 1.7.1__tar.gz → 1.10.0__tar.gz

{ecov002_calval_tables-1.7.1 → ecov002_calval_tables-1.10.0}/ECOv002_calval_tables/load_tables.py

@@ -32,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
 
@@ -58,14 +59,31 @@ 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
+
+def load_times_locations() -> gpd.GeoDataFrame:
+    """
+    Load a GeoDataFrame containing the times and locations of the ECOSTRESS Collection 2 validation dataset.
+    
+    Returns:
+        gpd.GeoDataFrame: GeoDataFrame with time and location information for validation analysis.
+    """
+    calval_gdf = load_calval_table()
+    times_locations_gdf = calval_gdf[["ID", "time_UTC", "geometry"]].copy()
+    return times_locations_gdf

{ecov002_calval_tables-1.7.1 → ecov002_calval_tables-1.10.0}/ECOv002_calval_tables/upscale_to_daylight.py

@@ -3,9 +3,9 @@ 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.LEcorr50,
-        Rn_instantaneous_Wm2=df.NETRAD_filt,
-        G_instantaneous_Wm2=df.G_filt,
+        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
     )

{ecov002_calval_tables-1.7.1 → ecov002_calval_tables-1.10.0}/ECOv002_calval_tables.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ECOv002-calval-tables
-Version: 1.7.1
+Version: 1.10.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

{ecov002_calval_tables-1.7.1 → ecov002_calval_tables-1.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ECOv002-calval-tables
-Version: 1.7.1
+Version: 1.10.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

{ecov002_calval_tables-1.7.1 → ecov002_calval_tables-1.10.0}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "ECOv002-calval-tables"
-version = "1.7.1"
+version = "1.10.0"
 description = "Priestley-Taylor Jet Propulsion Laboratory Soil Moisutre Evapotranspiration Model"
 readme = "README.md"
 authors = [