Merge pull request #34 from gregory-halverson/main

fixing verification

Author: gregory-halverson

PTJPLSM/ECOv002-cal-val-PT-JPL-SM-inputs.csv

@@ -0,0 +1,19 @@
+import os
+import pandas as pd
+
+def load_ECOv002_static_tower_PTJPLSM_inputs() -> pd.DataFrame:
+    """
+    Load the input data for the PT-JPL-SM model from the ECOSTRESS Collection 2 Cal-Val dataset.
+    
+    Returns:
+        pd.DataFrame: A DataFrame containing the input data.
+    """
+
+    # Define the path to the input CSV file relative to this module's directory
+    module_dir = os.path.dirname(os.path.abspath(__file__))
+    input_file_path = os.path.join(module_dir, "ECOv002-static-tower-PT-JPL-SM-inputs.csv")
+
+    # Load the input data into a DataFrame
+    inputs_df = pd.read_csv(input_file_path)
+
+    return inputs_df

PTJPLSM/ECOv002-cal-val-PT-JPL-SM-outputs.csv

@@ -2,4 +2,5 @@
 from .generate_PTJPLSM_inputs import generate_PTJPLSM_inputs
 from .process_PTJPLSM_table import process_PTJPLSM_table
 from .ECOv002_calval_PTJPLSM_inputs import load_ECOv002_calval_PTJPLSM_inputs
+from .ECOv002_static_tower_PTJPLSM_inputs import load_ECOv002_static_tower_PTJPLSM_inputs
 from .verify import verify

PTJPLSM/ECOv002_static_tower_PTJPLSM_inputs.py

@@ -29,8 +29,14 @@ def verify() -> bool:
 
     # Columns to compare (model outputs)
     output_columns = [
-        'G', 'Rn_soil', 'LE_soil', 'Rn_canopy', 'PET',
-        'LE_canopy', 'LE_interception', 'LE'
+        "G_Wm2",
+        "Rn_soil_Wm2",
+        "LE_soil_Wm2",
+        "Rn_canopy_Wm2",
+        "PET_Wm2",
+        "LE_canopy_Wm2",
+        "LE_interception_Wm2",
+        "LE_Wm2"
     ]
 
     # Compare each output column and collect mismatches