Merge pull request remindmodel#1748 from orichters/fixikea

don't compile IKEA config
dbantje · Jul 16, 2024 · 400aeb7 · 400aeb7
2 parents 8ff4362 + 6c3c914
commit 400aeb7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config/scenario_config_IKEA.csv b/config/scenario_config_IKEA.csv
@@ -2,7 +2,7 @@ title;start;CES_parameters;.comment;optimization;cm_iteration_max;cm_nash_autoco
 testOneRegi-Base_floor1;0;;default global floor cost;testOneRegi;;;;;CHA;0;8;;;;default;;;0;0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;testOneRegi-Base: This is a test scenario which only runs a single region, not to be used in production.
 testOneRegi-Base_floor2;0;;floor cost preserves price structure;testOneRegi;;;;;CHA;0;8;;;;pricestruc;;;0;0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;testOneRegi-Base: This is a test scenario which only runs a single region, not to be used in production.
 testOneRegi-Base_floor3;0;;floor cost simulates tech transfer;testOneRegi;;;;;CHA;0;8;;;;techtrans;;;0;0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;testOneRegi-Base: This is a test scenario which only runs a single region, not to be used in production.
-testOneRegi-Base_500_debug;0;;floor cost simulates tech transfer;testOneRegi;;;1;default;REF;0;8;;;rcp20;default;9;2100;0;0;globallyOptimal;500;diffCurvPhaseIn2Lin;100;2080;9;2;GLO 0.04, EUR_regi 0.15;GLO.(biodiesel 0.14, bioeths 0.14), EUR_regi.(biodiesel 0.15, bioeths 0.15), USA_regi.pc 0.13, REF_regi.pc 0.25, CHA_regi.pc 0.04, (IND_regi,  SSA_regi, OAS_regi).pc 0.001, (IND_regi, SSA_regi, OAS_regi).coalchp 0.001;;;;5;feelhpb 1.05, fehob 1.75, feheb 0.35;feh2_otherInd 1.05, feelhth_otherInd 0.43, feh2_cement 2.2, feelhth_chemicals 1.4, feh2_chemicals 1.05, fehos_cement 2.2;NDC;regiCarbonPrice;2030.EUR_regi.tax.t.FE_wo_b_wo_n_e.all 1.2809;2020.2060.EUR.all.budget.netCO2 25,2020.2050.USA.all.budget.netCO2 37,2020.2050.CHA.all.budget.netCO2 180,2020.2070.JPN.all.budget.netCO2 7,2020.2070.CAZ.all.budget.netCO2 3.5,2020.2070.NEU.all.budget.netCO2 8.5;on;on;EUR_regi, NEU_regi;;1;heat;Mix4;2030;/p/tmp/chengong/ikea_phaseI/remind/output/SSP2-PkBudg500_cost_budget5_2030_2024-04-28_01.17.05/fulldata_5.gdx;SSP2-NPi;SSP2-NPi;;testOneRegi-Base: This is a test scenario which only runs a single region, not to be used in production.
+testOneRegi-Base_500_debug;0;;floor cost simulates tech transfer;testOneRegi;;;1;default;REF;0;8;;;rcp20;default;9;2100;0;0;globallyOptimal;500;diffCurvPhaseIn2Lin;100;2080;9;2;GLO 0.04, EUR_regi 0.15;GLO.(biodiesel 0.14, bioeths 0.14), EUR_regi.(biodiesel 0.15, bioeths 0.15), USA_regi.pc 0.13, REF_regi.pc 0.25, CHA_regi.pc 0.04, (IND_regi,  SSA_regi, OAS_regi).pc 0.001, (IND_regi, SSA_regi, OAS_regi).coalchp 0.001;;;;5;feelhpb 1.05, fehob 1.75, feheb 0.35;feh2_otherInd 1.05, feelhth_otherInd 0.43, feh2_cement 2.2, feelhth_chemicals 1.4, feh2_chemicals 1.05, fehos_cement 2.2;NDC;regiCarbonPrice;2030.EUR_regi.tax.t.FE_wo_b_wo_n_e.all 1.2809;2020.2060.EUR.all.budget.netCO2 25,2020.2050.USA.all.budget.netCO2 37,2020.2050.CHA.all.budget.netCO2 180,2020.2070.JPN.all.budget.netCO2 7,2020.2070.CAZ.all.budget.netCO2 3.5,2020.2070.NEU.all.budget.netCO2 8.5;on;on;EUR_regi, NEU_regi;;1;heat;Mix4;2030;;SSP2-NPi;SSP2-NPi;;testOneRegi-Base: This is a test scenario which only runs a single region, not to be used in production.
 # H12 SSP2EU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 SSP2-NPi-calibrate;0;calibrate;;;;;;;;1;1;;;rcp45;default;;;0;0;;0;NPi;-1;2100;9;2;GLO 0.04, EUR_regi 0.15;CHA_regi.pc 0.001, IND_regi.pc 0.001, SSA_regi.pc 0.001, OAS_regi.pc 0.001, CHA_regi.coalchp 0.001, IND_regi.coalchp 0.001, SSA_regi.coalchp 0.001, OAS_regi.coalchp 0.001;;;;;;;NPi2018;regiCarbonPrice;;;on;on;EUR_regi, NEU_regi;3;;heat;Mix1;2005;;;;;SSP2-NPi-calibrate: This reference policy/baseline scenario follows the Shared Socioeconomic Pathways 2 called Middle of the Road.
 SSP2-NPi-calibrate_floor2;0;calibrate;;;;;;;;1;1;;;rcp45;pricestruc;;;0;0;;0;NPi;-1;2100;9;2;GLO 0.04, EUR_regi 0.15;CHA_regi.pc 0.001, IND_regi.pc 0.001, SSA_regi.pc 0.001, OAS_regi.pc 0.001, CHA_regi.coalchp 0.001, IND_regi.coalchp 0.001, SSA_regi.coalchp 0.001, OAS_regi.coalchp 0.001;;;;;;;NPi2018;regiCarbonPrice;;;on;on;EUR_regi, NEU_regi;3;;heat;Mix1;2005;;;;;SSP2-NPi-calibrate: This reference policy/baseline scenario follows the Shared Socioeconomic Pathways 2 called Middle of the Road.

diff --git a/tests/testthat/test_04-gamscompile.R b/tests/testthat/test_04-gamscompile.R
@@ -33,11 +33,11 @@ test_that("start.R --gamscompile works on all configs and scenarios", {
   expect_true(length(csvfiles) > 0)
   testthat::with_mocked_bindings(
     for (csvfile in csvfiles) {
+      if (grepl("scenario_config_IKEA", csvfile)) next
       test_that(paste("perform start.R --gamscompile with", basename(csvfile)), {
-        startgroup <- if (grepl("scenario_config_IKEA", csvfile)) "1" else "*"
         titletag <- paste0("titletag=TESTTHAT-", gsub(".csv$", "", basename(csvfile)))
         output <- localSystem2("Rscript",
-                             c("start.R", "--gamscompile", paste0("startgroup=", startgroup), titletag, csvfile))
+                             c("start.R", "--gamscompile", "startgroup=*", titletag, csvfile))
         printIfFailed(output)
         expectSuccessStatus(output)
       })