From 0a82fe6411d7fc0c0d519dd16f3d8d4511bcaea1 Mon Sep 17 00:00:00 2001 From: Marvin Axness Date: Sat, 29 Mar 2025 20:18:54 +0100 Subject: [PATCH 1/2] Small fixes for 6hourly data processing --- SimulationClass.py | 2 +- filename_utils.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SimulationClass.py b/SimulationClass.py index 3be3191..a71b998 100755 --- a/SimulationClass.py +++ b/SimulationClass.py @@ -47,7 +47,7 @@ def process_short_name(freq, short_name, simulation, experiment, file_manager): @timing_decorator def process_simulation(experiment, simulation_path): - frequencies = ["03-Daily"] + frequencies = ["02-6Hourly"] # Should create the Simulation Class portfolio = generate_portfolio.generate_portfolio(simulation_path, frequencies) diff --git a/filename_utils.py b/filename_utils.py index 750ccef..baf9f9b 100755 --- a/filename_utils.py +++ b/filename_utils.py @@ -27,10 +27,10 @@ def create_start_and_end_date(freq, end_date): start_date_final = dt - relativedelta(months=6) start_date_final = start_date_final.strftime("%Y%m%d") else: - end_date_final = end_date - dt = datetime.strptime(end_date_aux, "%Y%m%d%h") + end_date_aux = str(end_date) + dt = datetime.strptime(end_date_aux, "%Y%m%d%H") start_date_final = dt - relativedelta(months=6) - start_date_final = start_date_final.strftime("%Y%m%d%h") + start_date_final = start_date_final.strftime("%Y%m%d%H") return start_date_final, end_date_final -- GitLab From 4afe89b06af830fb6c730a8742f217bc5f080006 Mon Sep 17 00:00:00 2001 From: Marvin Axness Date: Sat, 29 Mar 2025 20:20:36 +0100 Subject: [PATCH 2/2] Change only valid for 6hourly output --- filename_utils.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/filename_utils.py b/filename_utils.py index baf9f9b..ce23c40 100755 --- a/filename_utils.py +++ b/filename_utils.py @@ -29,6 +29,9 @@ def create_start_and_end_date(freq, end_date): else: end_date_aux = str(end_date) dt = datetime.strptime(end_date_aux, "%Y%m%d%H") + end_date_final = dt - relativedelta(hours=6) # Only valid for 6 hourly output + end_date_final = end_date_final.strftime("%Y%m%d%H") + start_date_final = dt - relativedelta(months=6) start_date_final = start_date_final.strftime("%Y%m%d%H") -- GitLab