From 57aca73b4a0c2b1a1d6823cf134355f4c1c12266 Mon Sep 17 00:00:00 2001 From: Olexandr Balyk Date: Fri, 19 Jan 2024 07:02:10 -0500 Subject: [PATCH] Update version of TIM used for benchmark (#164) Co-authored-by: Siddharth Krishna --- .github/workflows/ci.yml | 4 ++-- benchmarks.yml | 5 +++-- utils/run_benchmarks.py | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d2878d2..c7a3b093 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,12 +58,12 @@ jobs: # so that the run_benchmarks.py script runs this model too - uses: actions/checkout@v3 with: - repository: samwebster/times-ireland-model + repository: esma-cgep/tim path: xl2times/benchmarks/xlsx/Ireland - uses: actions/checkout@v3 with: - repository: olejandro/times-ireland-model_gams + repository: esma-cgep/tim-gams path: xl2times/benchmarks/dd/Ireland # ---------- Install GAMS diff --git a/benchmarks.yml b/benchmarks.yml index 7d3b4eea..97df19b8 100644 --- a/benchmarks.yml +++ b/benchmarks.yml @@ -222,6 +222,7 @@ benchmarks: - "uc_nuc_maxcap" - name: Ireland input_folder: Ireland + regions: "IE" inputs: - "VT_IE_AGR.xlsx" - "VT_IE_IND.xlsx" @@ -254,19 +255,19 @@ benchmarks: - "SubRES_TMPL/SubRES_TRA_NewVehicles.xlsx" - "SubRES_TMPL/SubRES_TRA_NewVehicles_Trans.xlsx" - "SysSettings.xlsx" + - "SuppXLS/Scen_A_SYS_SAD_40TS.xlsx" - "SuppXLS/Scen_B_SYS_Additional_Assumptions.xlsx" - "SuppXLS/Scen_B_SYS_Demands.xlsx" - "SuppXLS/Scen_B_SUP_DomBioPot_Baseline.xlsx" - "SuppXLS/Scen_B_IND_Emi_Proc.xlsx" - "SuppXLS/Scen_B_PWR_CCS.xlsx" - "SuppXLS/Scen_B_SRV_DC_EH.xlsx" - - "SuppXLS/Scen_B_SYS_SubAnnual_Data.xlsx" - "SuppXLS/Scen_B_PWR_RNW_Potentials.xlsx" - "SuppXLS/Scen_B_IND_Emissions.xlsx" - "SuppXLS/Scen_B_RSD_Retrofit-Ctrl.xlsx" - "SuppXLS/Scen_B_RSD_UC.xlsx" - "SuppXLS/Scen_B_SRV_UC.xlsx" - - "SuppXLS/Scen_B_PWR_SNSP.xlsx" + - "SuppXLS/Scen_B_PWR_SNSP_Limit.xlsx" - "SuppXLS/Scen_B_SYS_Bio_DelivCost.xlsx" - "SuppXLS/Scen_B_SYS_Historic_Bounds.xlsx" - "SuppXLS/Scen_B_SYS_MaxGrowthRates.xlsx" diff --git a/utils/run_benchmarks.py b/utils/run_benchmarks.py index 7f7f13ee..f2a9a914 100644 --- a/utils/run_benchmarks.py +++ b/utils/run_benchmarks.py @@ -163,6 +163,8 @@ def run_benchmark( csv_folder, ] args += ["--dd"] if run_gams else [] + if "regions" in benchmark: + args.extend(["--regions", benchmark["regions"]]) if "inputs" in benchmark: args.extend((path.join(xl_folder, b) for b in benchmark["inputs"])) else: