loone-data-prep 0.1.8__tar.gz → 0.1.9__tar.gz

{loone_data_prep-0.1.8 → loone_data_prep-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: loone_data_prep
-Version: 0.1.8
+Version: 0.1.9
 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>

{loone_data_prep-0.1.8 → loone_data_prep-0.1.9}/loone_data_prep/GEOGLOWS_LOONE_DATA_PREP.py

@@ -26,9 +26,9 @@ D2_D = 30
 St_Yr = 2008
 St_M = 1
 St_D = 1
-En_Yr = 2023
-En_M = 3
-En_D = 31
+En_Yr = 2024
+En_M = 9
+En_D = 30
 
 st_year = START_DATE.strftime("%Y")
 st_month = START_DATE.strftime("%m")
@@ -577,7 +577,7 @@ def main(input_dir: str, output_dir: str, ensemble_number: str) -> None:  # , hi
     # Flow dataframe including Inflows, NetFlows, and Outflows (all in m3/day)
     geoglows_flow_df.to_csv(f"{output_dir}/geoglows_flow_df_ens_{ensemble_number}_predicted.csv", index=False)
     # Inflows (cmd)
-    LO_Inflows_BK.to_csv(f"{output_dir}/LO_Inflows_BK.csv", index=False)
+    LO_Inflows_BK.to_csv(f"{output_dir}/LO_Inflows_BK_forecast.csv", index=False)
     # Outflows (cmd)
     Outflows_consd.to_csv(f"{output_dir}/Outflows_consd.csv", index=False)
     # NetFlows (cmd)

{loone_data_prep-0.1.8 → loone_data_prep-0.1.9}/loone_data_prep/LOONE_DATA_PREP.py

@@ -22,9 +22,9 @@ D2_D = 30
 St_Yr = 2008
 St_M = 1
 St_D = 1
-En_Yr = 2023
-En_M = 3
-En_D = 31
+En_Yr = 2024
+En_M = 9
+En_D = 30
 
 # Tp Concentrations Dataframe
 TP_df = None

{loone_data_prep-0.1.8 → loone_data_prep-0.1.9}/loone_data_prep/utils.py

@@ -800,6 +800,7 @@ def nutrient_prediction(
 
 def photo_period(
     workspace: str,
+    file_name: str = "PhotoPeriod",
     phi: float = 26.982052,
     doy: np.ndarray = np.arange(1, 365),
     verbose: bool = False,
@@ -808,6 +809,7 @@ def photo_period(
 
     Args:
         workspace (str): A path to the directory where the file will be generated.
+        file_name (str): The name of the file to be generated.
         phi (float, optional): Latitude of the location. Defaults to 26.982052.
         doy (np.ndarray, optional): An array holding the days of the year that you want the photo period for. Defaults to np.arange(1,365).
         verbose (bool, optional): Print results of each computation. Defaults to False.
@@ -858,7 +860,7 @@ def photo_period(
     photo_period_df["Data"] = P
 
     photo_period_df.to_csv(
-        os.path.join(workspace, "PhotoPeriod.csv"), index=False
+        os.path.join(workspace, f"{file_name}.csv"), index=False
     )
 
 
@@ -936,6 +938,45 @@ def dbhydro_data_is_latest(date_latest: str):
     )
 
 
+def get_synthetic_data(date_start: str, df: pd.DataFrame):
+    """
+    Gets 15 days of synthetic NO and Chla data matching forecast start date.
+    
+    Args:
+        date_start (str): The date to start the forecast
+        df (pd.DataFrame): The dataset containing NO or Chla data
+    
+    Returns:
+        pd.DataFrame, pd.DataFrame: The updated NO or Chla dataset
+    """
+    date_end = date_start + datetime.timedelta(days=15)
+
+    df['date'] = pd.to_datetime(df['date'], format='%Y-%m-%d')
+    # Extract the month and day from the 'date' column
+    df['month_day'] = df['date'].dt.strftime('%m-%d')
+    
+    # Extract the month and day from date_start and date_end
+    start_month_day = date_start.strftime('%m-%d')
+    end_month_day = date_end.strftime('%m-%d')
+    
+    # Filter the DataFrame to include only rows between date_start and date_end for all previous years
+    mask = (df['month_day'] >= start_month_day) & (df['month_day'] <= end_month_day)
+    filtered_data = df.loc[mask]
+    
+    # Group by the month and day, then calculate the average for each group
+    average_values = filtered_data.groupby('month_day')['Data'].mean()
+    
+    average_values_df = pd.DataFrame({
+        'date': pd.date_range(start=date_start, end=date_end),
+        'Data': average_values.values
+    })
+    
+    df = pd.concat([df, average_values_df], ignore_index=True)
+    df.drop(columns=['month_day'], inplace=True)
+        
+    return df
+
+
 if __name__ == "__main__":
     if sys.argv[1] == "get_dbkeys":
         get_dbkeys(

{loone_data_prep-0.1.8 → loone_data_prep-0.1.9}/loone_data_prep.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: loone_data_prep
-Version: 0.1.8
+Version: 0.1.9
 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>

{loone_data_prep-0.1.8 → loone_data_prep-0.1.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "loone_data_prep"
-version = "0.1.8"
+version = "0.1.9"
 description = "Prepare data to run the LOONE model."
 readme = "README.md"
 license = { file = "LICENSE" }