ECOv002-calval-tables 1.7.1__py3-none-any.whl → 1.10.0__py3-none-any.whl

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/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.dist-info → ecov002_calval_tables-1.10.0.dist-info}/METADATA

@@ -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.dist-info → ecov002_calval_tables-1.10.0.dist-info}/RECORD

@@ -3,18 +3,18 @@ ECOv002_calval_tables/__init__.py,sha256=oO0pVascuJs247UwpXq2o23wQPThM1bWEwUhSYi
 ECOv002_calval_tables/combined_eco_flux_EC_filtered.csv,sha256=uSRv1CBMJKUWBgtMlRHB1359kiUFUL1ez2c4m7C4DxU,745225
 ECOv002_calval_tables/ec_lib.py,sha256=0k7CldHMFrcq77OqsXdreJQNEVUHVMCAHmUWNo-63fA,24676
 ECOv002_calval_tables/error_funcs.py,sha256=WFsoYvZyJVF-ppBn0BV2JJADPZN48OJBG2QZ6Lt3uCk,11275
-ECOv002_calval_tables/load_tables.py,sha256=mm41qAMhq7OUpzVeEnEbb2zX240RVOFr3rUe2qhmHqU,2775
+ECOv002_calval_tables/load_tables.py,sha256=K-53mq0E_GOLkkkOSwmKlVKqzl0U3VFIFBXRZDaCdOk,3568
 ECOv002_calval_tables/metadata_ebc_filt.csv,sha256=74AeCH5DG2Zu8ZFBXUZAW95hlsCjK9K3t6BWRRReR3s,13975
 ECOv002_calval_tables/plot_funcs.py,sha256=asu43YEtWhNehBRKx5ujIiqNn6iePbXW6fC_8Tl8yzI,23988
 ECOv002_calval_tables/plot_single_model.py,sha256=NDCGmY5SfjhTzoH9NKa3uSH_QLvqdWdM-J7QMxKFkpo,5890
-ECOv002_calval_tables/upscale_to_daylight.py,sha256=LrnZ0loI0o30bpT4coET7fmWMzHFVpaylZTfrdv4OqE,622
+ECOv002_calval_tables/upscale_to_daylight.py,sha256=j0QrsyCSbkLNGSWhQZ8J6ePBUIuwQrIFdP1fUvdjRoU,635
 ECOv002_calval_tables/version.py,sha256=DOnf2BIAf7HAp9SIUIetrDgRoZDL0o7JuKSiC7_ZT_I,87
-ecov002_calval_tables-1.7.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ecov002_calval_tables-1.10.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 tests/test_import_ECOv002_calval_tables.py,sha256=aGFA47BrECJroPH92aO5lT53TPNSd6TI1A9uNVT8pRY,74
 tests/test_import_dependencies.py,sha256=zrPUyx8ikAIdpKVESnanD57T_ttXGE2lca9VoVCSBnM,339
 tests/test_load_calval_table.py,sha256=1ioR2yzv8EfWEU2fSqNZv0yaJPgIn03IAOtacF1td3M,499
 tests/test_load_metadata_ebc_filt.py,sha256=PrBxmR85Q_TgWHZx2sBrtvrlsoCm9FMkGFwSU1ySIVc,561
-ecov002_calval_tables-1.7.1.dist-info/METADATA,sha256=F72ebTYBgNLbegVh7QGyXL9UIq2IP1CRbgrUhyibyt8,3363
-ecov002_calval_tables-1.7.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ecov002_calval_tables-1.7.1.dist-info/top_level.txt,sha256=Ps10Nh0VWk-CGqZd2xXwmvGGQ-MEhNaWT0BFGId_M3I,28
-ecov002_calval_tables-1.7.1.dist-info/RECORD,,
+ecov002_calval_tables-1.10.0.dist-info/METADATA,sha256=KkLB2nA7hFWsRSv5DMwlO0GQjvekf_LaDIx4IAKnWew,3364
+ecov002_calval_tables-1.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ecov002_calval_tables-1.10.0.dist-info/top_level.txt,sha256=Ps10Nh0VWk-CGqZd2xXwmvGGQ-MEhNaWT0BFGId_M3I,28
+ecov002_calval_tables-1.10.0.dist-info/RECORD,,