From 1c681b20131e6e1c98c62072476342bc4e6a5a5d Mon Sep 17 00:00:00 2001 From: "stefan.schirmeister" Date: Tue, 14 May 2024 11:26:25 +0200 Subject: [PATCH 1/2] move station specific output to gcs folder --- simba/report.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/simba/report.py b/simba/report.py index 75179fce..0d3a290e 100644 --- a/simba/report.py +++ b/simba/report.py @@ -143,11 +143,19 @@ def generate(schedule, scenario, args): args.propagate_mode_errors=True """ + multiple_gcs = len(scenario.components.grid_connectors) > 1 # generate simulation_timeseries.csv, simulation.json and vehicle_socs.csv in SpiceEV # re-route output paths args.save_soc = args.results_directory / "vehicle_socs.csv" - args.save_results = args.results_directory / "info.json" - args.save_timeseries = args.results_directory / "ts.csv" + if multiple_gcs: + # multiple stations / GCs: bundle station-specific output files in subdirectory + gc_dir = args.results_directory / "gcs" + gc_dir.mkdir(exist_ok=True) + args.save_results = gc_dir / "info.json" + args.save_timeseries = gc_dir / "ts.csv" + else: + args.save_results = args.results_directory / "info.json" + args.save_timeseries = args.results_directory / "ts.csv" generate_reports(scenario, vars(args).copy()) args.save_timeseries = None args.save_results = None From ae393d00b047884f435017d1b8ca41bf9585abfd Mon Sep 17 00:00:00 2001 From: "stefan.schirmeister" Date: Thu, 6 Jun 2024 13:34:15 +0200 Subject: [PATCH 2/2] report: always put gc output files into gcs/ dir --- simba/report.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/simba/report.py b/simba/report.py index 0d3a290e..61978800 100644 --- a/simba/report.py +++ b/simba/report.py @@ -143,19 +143,14 @@ def generate(schedule, scenario, args): args.propagate_mode_errors=True """ - multiple_gcs = len(scenario.components.grid_connectors) > 1 # generate simulation_timeseries.csv, simulation.json and vehicle_socs.csv in SpiceEV # re-route output paths args.save_soc = args.results_directory / "vehicle_socs.csv" - if multiple_gcs: - # multiple stations / GCs: bundle station-specific output files in subdirectory - gc_dir = args.results_directory / "gcs" - gc_dir.mkdir(exist_ok=True) - args.save_results = gc_dir / "info.json" - args.save_timeseries = gc_dir / "ts.csv" - else: - args.save_results = args.results_directory / "info.json" - args.save_timeseries = args.results_directory / "ts.csv" + # bundle station-specific output files in subdirectory + gc_dir = args.results_directory / "gcs" + gc_dir.mkdir(exist_ok=True) + args.save_results = gc_dir / "info.json" + args.save_timeseries = gc_dir / "ts.csv" generate_reports(scenario, vars(args).copy()) args.save_timeseries = None args.save_results = None