ECOv002-calval-tables 1.6.0__py3-none-any.whl → 1.9.0__py3-none-any.whl

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

@@ -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.9.0.dist-info/RECORD

@@ -0,0 +1,20 @@
+ECOv002_calval_tables/ECOv002_calval_tables.py,sha256=6yW19Mvgg94O9rZVCRRjiefjG-a6rwRSyFt-RqiXcIo,170
+ECOv002_calval_tables/__init__.py,sha256=oO0pVascuJs247UwpXq2o23wQPThM1bWEwUhSYiNzMY,60
+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=ArOs2wfiB5mRJecbhUH1EgfPh_HA_kvXQ8rH3loVFjI,3133
+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=j0QrsyCSbkLNGSWhQZ8J6ePBUIuwQrIFdP1fUvdjRoU,635
+ECOv002_calval_tables/version.py,sha256=DOnf2BIAf7HAp9SIUIetrDgRoZDL0o7JuKSiC7_ZT_I,87
+ecov002_calval_tables-1.9.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.9.0.dist-info/METADATA,sha256=kHJaEm-NN208WNqbfTq_aciKkEjlxiNguxy7SgHb1lY,3363
+ecov002_calval_tables-1.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ecov002_calval_tables-1.9.0.dist-info/top_level.txt,sha256=Ps10Nh0VWk-CGqZd2xXwmvGGQ-MEhNaWT0BFGId_M3I,28
+ecov002_calval_tables-1.9.0.dist-info/RECORD,,

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

@@ -1 +1,2 @@
 ECOv002_calval_tables
+tests

tests/test_import_ECOv002_calval_tables.py

@@ -0,0 +1,2 @@
+def test_import_ECOv002_calval_tables():
+    import ECOv002_calval_tables

tests/test_import_dependencies.py

@@ -0,0 +1,17 @@
+import pytest
+
+# List of dependencies
+dependencies = [
+    "pandas",
+    "geopandas",
+    "numpy",
+    "sklearn",
+    "scipy",
+    "matplotlib",
+    "shapely"
+]
+
+# Generate individual test functions for each dependency
+@pytest.mark.parametrize("dependency", dependencies)
+def test_dependency_import(dependency):
+    __import__(dependency)

tests/test_load_calval_table.py

@@ -0,0 +1,14 @@
+import unittest
+import geopandas as gpd
+from ECOv002_calval_tables import load_calval_table
+
+class TestLoadCalvalTable(unittest.TestCase):
+    def test_returns_geodataframe_with_valid_geometry(self):
+        gdf = load_calval_table()
+        self.assertIsInstance(gdf, gpd.GeoDataFrame)
+        self.assertIn('geometry', gdf.columns)
+        self.assertTrue(all(gdf.geometry.geom_type == 'Point'))
+        self.assertTrue(gdf.geometry.is_valid.all())
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_load_metadata_ebc_filt.py

@@ -0,0 +1,15 @@
+import unittest
+import geopandas as gpd
+from ECOv002_calval_tables import load_metadata_ebc_filt
+
+class TestLoadMetadataEbcFilt(unittest.TestCase):
+    def test_returns_geodataframe_with_valid_geometry(self):
+        gdf = load_metadata_ebc_filt()
+        self.assertIsInstance(gdf, gpd.GeoDataFrame)
+        self.assertIn('geometry', gdf.columns)
+        # Check all geometries are valid Points
+        self.assertTrue(all(gdf.geometry.geom_type == 'Point'))
+        self.assertTrue(gdf.geometry.is_valid.all())
+
+if __name__ == "__main__":
+    unittest.main()

ecov002_calval_tables-1.6.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-ECOv002_calval_tables/ECOv002_calval_tables.py,sha256=k8y7TEevSX3Y6NhEU1qg_CySd-f_T4omNNJFc7ZxXcY,135
-ECOv002_calval_tables/__init__.py,sha256=oO0pVascuJs247UwpXq2o23wQPThM1bWEwUhSYiNzMY,60
-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=m9UEz07yIrM-m2PaYv2g_TnBLN5Wjg7yUuMzs-T25Gk,2685
-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=1McpBLyLm8oM-7wA0sDEgEQY_AM_8aisxcDUuKPBrDM,5853
-ECOv002_calval_tables/version.py,sha256=DOnf2BIAf7HAp9SIUIetrDgRoZDL0o7JuKSiC7_ZT_I,87
-ecov002_calval_tables-1.6.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ecov002_calval_tables-1.6.0.dist-info/METADATA,sha256=_bQvh2W1unTzjawE2rtBYJX1Vb252MVH4pa6AxSOWNg,3312
-ecov002_calval_tables-1.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ecov002_calval_tables-1.6.0.dist-info/top_level.txt,sha256=ePbA84g_XQHWQUAQEVo6gmyuW0WLUzPg2IfHyoGqUqg,22
-ecov002_calval_tables-1.6.0.dist-info/RECORD,,