loone-data-prep 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

loone_data_prep/LOONE_DATA_PREP.py

@@ -386,8 +386,17 @@ def main(input_dir: str, output_dir: str) -> None:
 
     # RFVol acft
     # Create File (RF_Volume)
-    RFVol = pd.DataFrame(RF_data['date'], columns=['date'])
-    RFVol['RFVol_acft'] = (RF_data['average_rainfall'].values/12) * LO_Stg_Sto_SA_df['SA_acres'].values
+    # Merge the DataFrames on date to ensure matching rows
+    RF_data_copy = RF_data.copy()
+    LO_Stg_Sto_SA_df_copy = LO_Stg_Sto_SA_df.copy()
+    RF_data_copy['date'] = pd.to_datetime(RF_data_copy['date'])
+    LO_Stg_Sto_SA_df_copy['date'] = pd.to_datetime(LO_Stg_Sto_SA_df_copy['date'])
+    merged_rf_sa = pd.merge(RF_data_copy[['date', 'average_rainfall']], 
+                            LO_Stg_Sto_SA_df_copy[['date', 'SA_acres']], 
+                            on='date', how='inner')
+    
+    RFVol = pd.DataFrame(merged_rf_sa['date'], columns=['date'])
+    RFVol['RFVol_acft'] = (merged_rf_sa['average_rainfall'].values/12) * merged_rf_sa['SA_acres'].values
     date_reference = RFVol['date'].iloc[0]
     date_inserts = [date_reference - datetime.timedelta(days=2), date_reference - datetime.timedelta(days=1)]
     df_insert = pd.DataFrame(data={'date': date_inserts, 'RFVol_acft': [0.0, 0.0]})
@@ -396,8 +405,17 @@ def main(input_dir: str, output_dir: str) -> None:
 
     # ETVol acft
     # Create File (ETVol)
-    ETVol = pd.DataFrame(ET_data['date'], columns=['date'])
-    ETVol['ETVol_acft'] = (ET_data['average_ETPI'].values/12) * LO_Stg_Sto_SA_df['SA_acres'].values
+    # Merge the DataFrames on date to ensure matching rows
+    ET_data_copy = ET_data.copy()
+    LO_Stg_Sto_SA_df_copy = LO_Stg_Sto_SA_df.copy()
+    ET_data_copy['date'] = pd.to_datetime(ET_data_copy['date'])
+    LO_Stg_Sto_SA_df_copy['date'] = pd.to_datetime(LO_Stg_Sto_SA_df_copy['date'])
+    merged_et_sa = pd.merge(ET_data_copy[['date', 'average_ETPI']],
+                            LO_Stg_Sto_SA_df_copy[['date', 'SA_acres']], 
+                            on='date', how='inner')
+
+    ETVol = pd.DataFrame(merged_et_sa['date'], columns=['date'])
+    ETVol['ETVol_acft'] = (merged_et_sa['average_ETPI'].values/12) * merged_et_sa['SA_acres'].values
     date_reference = ETVol['date'].iloc[0]
     date_inserts = [date_reference - datetime.timedelta(days=2), date_reference - datetime.timedelta(days=1)]
     df_insert = pd.DataFrame(data={'date': date_inserts, 'ETVol_acft': [0.0, 0.0]})

{loone_data_prep-1.2.0.dist-info → loone_data_prep-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: loone_data_prep
-Version: 1.2.0
+Version: 1.2.2
 Summary: Prepare data to run the LOONE model.
 Author-email: Osama Tarabih <osamatarabih@usf.edu>
 Maintainer-email: Michael Souffront <msouffront@aquaveo.com>, James Dolinar <jdolinar@aquaveo.com>
@@ -24,10 +24,11 @@ Requires-Dist: numpy<2
 Requires-Dist: pandas
 Requires-Dist: scipy
 Requires-Dist: geoglows>=2.0.0
-Requires-Dist: herbie-data[extras]
+Requires-Dist: herbie-data[extras]==2025.5.0
 Requires-Dist: openmeteo_requests
 Requires-Dist: requests_cache
 Requires-Dist: retry-requests
+Requires-Dist: eccodes==2.42.0
 Dynamic: license-file
 
 LOONE_DATA_PREP

{loone_data_prep-1.2.0.dist-info → loone_data_prep-1.2.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 loone_data_prep/GEOGLOWS_LOONE_DATA_PREP.py,sha256=gfpnaOTjZ-YhWqOEvOaDvear4_59IbqARpLyg2Y_c8U,35851
-loone_data_prep/LOONE_DATA_PREP.py,sha256=ABq0_n-gR3fRV057mrxHV0WFYZZ3L7y8yzz8XRGWsck,68304
+loone_data_prep/LOONE_DATA_PREP.py,sha256=vEWcGHKN10ipLk9o5I5aKu_LPfDyFW3HBJ8GgqISYjA,69315
 loone_data_prep/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 loone_data_prep/data_analyses_fns.py,sha256=BZ7famrSKoUfExQvZfbl72CyADHLb-zzgdWZ-kLJxcQ,4603
 loone_data_prep/utils.py,sha256=UlNc84ofh3ZY3lYsgQmDsgGgohXIBwZ0bK9rX6SgGF4,35730
@@ -30,8 +30,8 @@ loone_data_prep/water_quality_data/wq.py,sha256=sl6G3iDCk6QUzpHTXPHpRZNMBG0-wHuc
 loone_data_prep/weather_data/__init__.py,sha256=TX58EPgGRzEK_LmLze79lC4L7kU_j3yZf5_iC4nOIP4,45
 loone_data_prep/weather_data/get_all.py,sha256=aCufuxORU51XhXt7LN9wN_V4qtjNt1qRC1UKlI2b3Ko,6918
 loone_data_prep/weather_data/weather.py,sha256=hvceksrGSnDkCjheBVBuPgY1DrdR0ZAtrFB-K2tYTtk,12043
-loone_data_prep-1.2.0.dist-info/licenses/LICENSE,sha256=rR1QKggtQUbAoYu2SW1ouI5xPqt9g4jvRRpZ0ZfnuqQ,1497
-loone_data_prep-1.2.0.dist-info/METADATA,sha256=UXh1hwLfeVVQmC7wQwtBRamiGsbj0gYToF0rmgdNra4,4270
-loone_data_prep-1.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-loone_data_prep-1.2.0.dist-info/top_level.txt,sha256=wDyJMJiCO5huTAuNmvxpjFxtvGaq_8Tr4hFFcXf8jLE,16
-loone_data_prep-1.2.0.dist-info/RECORD,,
+loone_data_prep-1.2.2.dist-info/licenses/LICENSE,sha256=rR1QKggtQUbAoYu2SW1ouI5xPqt9g4jvRRpZ0ZfnuqQ,1497
+loone_data_prep-1.2.2.dist-info/METADATA,sha256=TXDEk9S3JrVE4o70xf0jBywvi-krSKVi3R7X8eweu4M,4311
+loone_data_prep-1.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+loone_data_prep-1.2.2.dist-info/top_level.txt,sha256=wDyJMJiCO5huTAuNmvxpjFxtvGaq_8Tr4hFFcXf8jLE,16
+loone_data_prep-1.2.2.dist-info/RECORD,,