Expand TIM benchmarks (#284)

Adds more benchmarks based on TIMES-Ireland Model; closes #35
etsap-TIMES · Jan 17, 2025 · 1f189c8 · 1f189c8
1 parent acc0ed9
commit 1f189c8
Show file tree

Hide file tree

Showing 2 changed files with 232 additions and 9 deletions.
diff --git a/benchmarks.yml b/benchmarks.yml
@@ -269,8 +269,124 @@ benchmarks:
       - "uc_growth"
       - "uc_nuc_maxcap"
     include_dummy_imports: true
-  - name: Ireland
-    input_folder: Ireland
+  - name: TIMES-IE-all
+    input_folder: TIM
+    regions: "IE"
+    inputs:
+      - "VT_IE_AGR.xlsx"
+      - "VT_IE_IND.xlsx"
+      - "VT_IE_PWR.xlsx"
+      - "VT_IE_RSD.xlsx"
+      - "VT_IE_SRV.xlsx"
+      - "VT_IE_SUP.xlsx"
+      - "VT_IE_TRA.xlsx"
+      - "BY_Trans.xlsx"
+      - "SetRules.xlsx"
+      - "SuppXLS/Trades/ScenTrade__Trade_Links.xlsx"
+      - "SubRES_TMPL/SubRES_IND_CCS.xlsx"
+      - "SubRES_TMPL/SubRES_IND_CCS_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_PWR_DH.xlsx"
+      - "SubRES_TMPL/SubRES_PWR_DH_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_PWR_NewTechs.xlsx"
+      - "SubRES_TMPL/SubRES_PWR_NewTechs_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_RSD_NewTechs.xlsx"
+      - "SubRES_TMPL/SubRES_RSD_NewTechs_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_RSD-Retrofit.xlsx"
+      - "SubRES_TMPL/SubRES_RSD-Retrofit_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_SRV_DC_ExcessHeat.xlsx"
+      - "SubRES_TMPL/SubRES_SRV_DC_ExcessHeat_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_SRV_NewTechs.xlsx"
+      - "SubRES_TMPL/SubRES_SRV_NewTechs_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_SUP_BioRefineries.xlsx"
+      - "SubRES_TMPL/SubRES_SUP_BioRefineries_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_SUP_H2NewTechs.xlsx"
+      - "SubRES_TMPL/SubRES_SUP_H2NewTechs_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_SYS_OtherNewTechs.xlsx"
+      - "SubRES_TMPL/SubRES_SYS_OtherNewTechs_Trans.xlsx"
+      - "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_IND_Emi_Proc.xlsx"
+      - "SuppXLS/Scen_B_IND_Emissions.xlsx"
+      - "SuppXLS/Scen_B_IND_Mitigations.xlsx"
+      - "SuppXLS/Scen_B_PWR_CCS.xlsx"
+      - "SuppXLS/Scen_B_PWR_RNW_Potentials.xlsx"
+      - "SuppXLS/Scen_B_PWR_SNSP_Limit.xlsx"
+      - "SuppXLS/Scen_B_RSD_Retrofit-Ctrl.xlsx"
+      - "SuppXLS/Scen_B_RSD_UC.xlsx"
+      - "SuppXLS/Scen_B_RSD_UnitBoilers.xlsx"
+      - "SuppXLS/Scen_B_SRV_DC_EH.xlsx"
+      - "SuppXLS/Scen_B_SRV_UC.xlsx"
+      - "SuppXLS/Scen_B_SUP_DomBioPot_Baseline.xlsx"
+      - "SuppXLS/Scen_B_SYS_Additional_Assumptions.xlsx"
+      - "SuppXLS/Scen_B_SYS_Bio_DelivCost.xlsx"
+      - "SuppXLS/Scen_B_SYS_Demands.xlsx"
+      - "SuppXLS/Scen_B_SYS_Historic_Bounds.xlsx"
+      - "SuppXLS/Scen_B_SYS_MaxGrowthRates.xlsx"
+      - "SuppXLS/Scen_B_TRA_EV_Parity.xlsx"
+      - "SuppXLS/Scen_B_TRA_Emissions.xlsx"
+      - "SuppXLS/Scen_B_TRA_F_ModalShares.xlsx"
+      - "SuppXLS/Scen_B_TRA_NewCars_Retirement.xlsx"
+      - "SuppXLS/Scen_B_TRA_P_ModalShares.xlsx"
+      - "SuppXLS/Scen_B_TRA_Stock_Retirement.xlsx"
+      - "SuppXLS/Scen_PWR_NoBioCCS.xlsx"
+      - "SuppXLS/Scen_PWR_UnitCommitment.xlsx"
+      - "SuppXLS/Scen_SYS_CarbonBudget.xlsx"
+      - "SuppXLS/Scen_SYS_CarbonBudget_Sector.xlsx"
+      - "SuppXLS/Scen_SYS_Demands_LED.xlsx"
+      - "SuppXLS/Scen_SYS_WAM_Emissions.xlsx"
+      - "SuppXLS/Scen_TRA_P_ModalShares_LED.xlsx"
+    dd_folder: TIM/model
+    dd_files:
+      - "base-bulk"
+      - "ind_ccs"
+      - "pwr_dh"
+      - "pwr_newtechs"
+      - "rsd_newtechs"
+      - "rsd-retrofit"
+      - "srv_dc_excessheat"
+      - "srv_newtechs"
+      - "sup_biorefineries"
+      - "sup_h2newtechs"
+      - "sys_othernewtechs"
+      - "tra_newvehicles"
+      - "syssettings"
+      - "a_sys_sad_40ts"
+      - "b_ind_emi_proc-bulk"
+      - "b_ind_emissions-bulk"
+      - "b_ind_mitigations"
+      - "b_pwr_ccs"
+      - "b_pwr_rnw_potentials"
+      - "b_pwr_snsp_limit"
+      - "b_rsd_retrofit-ctrl"
+      - "b_rsd_uc"
+      - "b_rsd_unitboilers"
+      - "b_srv_dc_eh"
+      - "b_srv_uc"
+      - "b_sup_dombiopot_baseline"
+      - "b_sys_additional_assumptions"
+      - "b_sys_bio_delivcost"
+      - "b_sys_demands-bulk"
+      - "b_sys_historic_bounds"
+      - "b_sys_maxgrowthrates"
+      - "b_tra_ev_parity"
+      - "b_tra_emissions"
+      - "b_tra_f_modalshares"
+      - "b_tra_newcars_retirement"
+      - "b_tra_p_modalshares"
+      - "b_tra_stock_retirement"
+      - "pwr_nobioccs"
+      - "pwr_unitcommitment"
+      - "sys_carbonbudget"
+      - "sys_carbonbudget_sector"
+      - "sys_demands_led"
+      - "sys_wam_emissions"
+      - "tra_p_modalshares_led"
+      - "milestonyr"
+    include_dummy_imports: true
+  - name: TIMES-IE-NoM
+    input_folder: TIM
     regions: "IE"
     inputs:
       - "VT_IE_AGR.xlsx"
@@ -327,7 +443,7 @@ benchmarks:
       - "SuppXLS/Scen_B_TRA_Emissions.xlsx"
       - "SuppXLS/Scen_B_TRA_EV_Parity.xlsx"
       - "SuppXLS/Scen_B_TRA_F_ModalShares.xlsx"
-    dd_folder: Ireland/model
+    dd_folder: TIM/model
     dd_files:
       - "base"
       - "pwr_dh"
@@ -364,6 +480,113 @@ benchmarks:
       - "b_tra_emissions"
       - "b_tra_ev_parity"
       - "b_tra_f_modalshares"
+      - "milestonyr"
+    include_dummy_imports: true
+  - name: TIMES-IE-MCB
+    input_folder: TIM
+    regions: "IE"
+    inputs:
+      - "VT_IE_AGR.xlsx"
+      - "VT_IE_IND.xlsx"
+      - "VT_IE_PWR.xlsx"
+      - "VT_IE_RSD.xlsx"
+      - "VT_IE_SRV.xlsx"
+      - "VT_IE_SUP.xlsx"
+      - "VT_IE_TRA.xlsx"
+      - "BY_Trans.xlsx"
+      - "SetRules.xlsx"
+      - "SuppXLS/Trades/ScenTrade__Trade_Links.xlsx"
+      - "SubRES_TMPL/SubRES_IND_CCS.xlsx"
+      - "SubRES_TMPL/SubRES_IND_CCS_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_PWR_DH.xlsx"
+      - "SubRES_TMPL/SubRES_PWR_DH_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_PWR_NewTechs.xlsx"
+      - "SubRES_TMPL/SubRES_PWR_NewTechs_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_RSD_NewTechs.xlsx"
+      - "SubRES_TMPL/SubRES_RSD_NewTechs_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_RSD-Retrofit.xlsx"
+      - "SubRES_TMPL/SubRES_RSD-Retrofit_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_SRV_DC_ExcessHeat.xlsx"
+      - "SubRES_TMPL/SubRES_SRV_DC_ExcessHeat_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_SRV_NewTechs.xlsx"
+      - "SubRES_TMPL/SubRES_SRV_NewTechs_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_SUP_BioRefineries.xlsx"
+      - "SubRES_TMPL/SubRES_SUP_BioRefineries_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_SUP_H2NewTechs.xlsx"
+      - "SubRES_TMPL/SubRES_SUP_H2NewTechs_Trans.xlsx"
+      - "SubRES_TMPL/SubRES_SYS_OtherNewTechs.xlsx"
+      - "SubRES_TMPL/SubRES_SYS_OtherNewTechs_Trans.xlsx"
+      - "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_IND_Mitigations.xlsx"
+      - "SuppXLS/Scen_B_PWR_CCS.xlsx"
+      - "SuppXLS/Scen_B_SRV_DC_EH.xlsx"
+      - "SuppXLS/Scen_B_PWR_RNW_Potentials.xlsx"
+      - "SuppXLS/Scen_B_SYS_Historic_Bounds.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_Limit.xlsx"
+      - "SuppXLS/Scen_B_SYS_Bio_DelivCost.xlsx"
+      - "SuppXLS/Scen_B_SYS_MaxGrowthRates.xlsx"
+      - "SuppXLS/Scen_B_RSD_UnitBoilers.xlsx"
+      - "SuppXLS/Scen_B_TRA_P_ModalShares.xlsx"
+      - "SuppXLS/Scen_B_TRA_NewCars_Retirement.xlsx"
+      - "SuppXLS/Scen_SYS_CarbonBudget.xlsx"
+      - "SuppXLS/Scen_B_TRA_Stock_Retirement.xlsx"
+      - "SuppXLS/Scen_SYS_CarbonBudget_Sector.xlsx"
+      - "SuppXLS/Scen_B_TRA_Emissions.xlsx"
+      - "SuppXLS/Scen_B_TRA_EV_Parity.xlsx"
+      - "SuppXLS/Scen_B_TRA_F_ModalShares.xlsx"
+    dd_folder: TIM/model
+    dd_files:
+      - "base-bulk"
+      - "ind_ccs"
+      - "pwr_dh"
+      - "pwr_newtechs"
+      - "rsd_newtechs"
+      - "rsd-retrofit"
+      - "srv_dc_excessheat"
+      - "srv_newtechs"
+      - "sup_biorefineries"
+      - "sup_h2newtechs"
+      - "sys_othernewtechs"
+      - "tra_newvehicles"
+      - "syssettings"
+      - "a_sys_sad_40ts"
+      - "b_sys_additional_assumptions"
+      - "b_sys_demands"
+      - "b_sup_dombiopot_baseline"
+      - "b_ind_emi_proc-bulk"
+      - "b_ind_mitigations"
+      - "b_pwr_ccs"
+      - "b_srv_dc_eh"
+      - "b_pwr_rnw_potentials"
+      - "b_sys_historic_bounds"
+      - "b_ind_emissions-bulk"
+      - "b_rsd_retrofit-ctrl"
+      - "b_rsd_uc"
+      - "b_srv_uc"
+      - "b_pwr_snsp_limit"
+      - "b_sys_bio_delivcost"
+      - "b_sys_maxgrowthrates"
+      - "b_rsd_unitboilers"
+      - "b_tra_p_modalshares"
+      - "b_tra_newcars_retirement"
+      - "sys_carbonbudget"
+      - "b_tra_stock_retirement"
+      - "sys_carbonbudget_sector"
+      - "b_tra_emissions"
+      - "b_tra_ev_parity"
+      - "b_tra_f_modalshares"
+      - "milestonyr"
     include_dummy_imports: true
   - name: TIMES-NZ-KEA
     input_folder: TIMES-NZ

diff --git a/setup-benchmarks.sh b/setup-benchmarks.sh
@@ -7,10 +7,10 @@ set -eo pipefail
 # Commit SHA for each repository:
 REF_TIMES_model="b488fb07f0899ee8b7e710c230b1a9414fa06f7d"
 REF_demos_xlsx="34a2a5c044cc0bbea1357de50db2f5f02d575181"
-REF_demos_dd="82f03395b5ffa70f37de94525d0aca605c092803"
-REF_tim="5fffa7cb894078a3ffad22d8fff3e3f6f7c73f2c"
-REF_tim_gams="0d6d1283408f207d997d917294c0ff4722b33d87"
-REF_TIMES_NZ="64c48461690fd2458d112b97c68e788c63490461"
+REF_demos_dd="2848a8a8e2fdcf0cdf7f83eefbdd563b0bb74e86"
+REF_tim_xlsx="e820d8002adc6b1526a3bffcc439219b28d0eed5"
+REF_tim_gams="cfe2628dbb5974b99c8a5664a9358849324e31ac"
+REF_TIMES_NZ="4170d720e1c5cb0e31537a3168188169209ceb4d"
 
 # If no GitHub token is provided, try to clone using SSH
 if [ -z "$GH_PAT_DEMOS_XLSX" ]; then
@@ -59,8 +59,8 @@ repositories=(
     "etsap-TIMES/TIMES_model|TIMES_model|$REF_TIMES_model"
     "olejandro/demos-dd|benchmarks/dd|$REF_demos_dd"
     "olejandro/demos-xlsx|benchmarks/xlsx|$REF_demos_xlsx|true"
-    "esma-cgep/tim|benchmarks/xlsx/Ireland|$REF_tim"
-    "esma-cgep/tim-gams|benchmarks/dd/Ireland|$REF_tim_gams"
+    "esma-cgep/tim|benchmarks/xlsx/TIM|$REF_tim_xlsx"
+    "esma-cgep/tim-gams|benchmarks/dd/TIM|$REF_tim_gams"
     "olejandro/TIMES-NZ-Model-Files|benchmarks/TIMES-NZ|$REF_TIMES_NZ"
 )