merge small bugs from sapp

Author: celiaescribe

epm/epm.py

@@ -54,7 +54,7 @@
 import json
 import argparse
 
-from postprocessing.utils import postprocess_output
+from postprocessing.utils import postprocess_output, path_to_extract_results
 import re
 from pathlib import Path
 import sys
@@ -1160,7 +1160,7 @@ def main(test_args=None):
 
     parser.add_argument(
         "--reduced_output",
-        action="store_false",
+        action="store_true",
         help="Enable reduced output (default: False)"
     )
 
@@ -1295,12 +1295,14 @@ def main(test_args=None):
         folder = args.postprocess
 
 
-    postprocess_output(folder, reduced_output=False, folder='postprocessing',
+    postprocess_output(folder, reduced_output=args.reduced_output, folder='postprocessing',
                        selected_scenario=args.plot_selected_scenarios, plot_dispatch=args.plot_dispatch,
                        graphs_folder=args.graphs_folder, montecarlo=args.montecarlo, reduce_definition_csv=True)
 
     # Zip the folder if it exists
+    folder = path_to_extract_results(folder)
     if args.output_zip and folder and os.path.exists(folder):
+        print(f"Compressing results folder {folder}")
         zip_path = folder + '.zip'
         shutil.make_archive(folder, 'zip', folder)
         shutil.rmtree(folder)  # Remove the original folder

epm/generate_report.gms

@@ -928,6 +928,7 @@ pZonesperCountry(c) = sum(zcmap(z,c), 1);
 MaxZonesperCountry = smax(c,pZonesperCountry(c));
 
 $if not set OUTPUT_DIR $set OUTPUT_DIR output_csv
+* create output directory
 
 *$call /bin/sh -c "mkdir -p '%OUTPUT_DIR%'"
 
@@ -960,9 +961,11 @@ embeddedCode Connect:
         "pEnergyByFuelCountry",
         "pEnergyMix",
         "pDemandSupply",
+        "pDemandSupplySeason",
         "pInterchange",
         "pInterconUtilization",
         "pInterchangeCountry",
+        "pCongested",
         "pCapacityPlan",
         "pCapacityByFuel",
         "pCapacityByFuelCountry",