use also non-gms cfg$ switches in start_bundle_coupled.R

CHANGELOG.md

@@ -39,6 +39,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
     [[#1728](https://github.com/remindmodel/remind/pull/1728)]
 - **scripts** cleanup non-existing realizations from settings_config.csv
     [[#1718](https://github.com/remindmodel/remind/pull/1718)]
+- **scripts** REMIND-MAgPIE start scripts now correctly use all non-gms cfg switches
+    [[#1768](https://github.com/remindmodel/remind/pull/1768)]
 
 ### removed
 

config/tests/scenario_config_coupled_shortCascade.csv

@@ -1,4 +1,4 @@
-title;start;qos;sbatch;magpie_scen;config/scenario_config.csv;magpie_empty;no_ghgprices_land_until;max_iterations;oldrun;path_gdx;path_gdx_ref;path_gdx_bau;path_report;cm_nash_autoconverge_lastrun;path_mif_ghgprice_land;cfg_mag$gms$s56_minimum_cprice;cfg_mag$damping_factor
-TESTTHAT-SSP2-Base;1;auto;--wait --mail-type=FAIL;SSP2|NPI;SDP-MC;TRUE;y2150;2;;;;;;2;;;
-TESTTHAT-SSP2-NDC;1;auto;--wait --mail-type=FAIL;SSP2|NDC;;TRUE;y2150;2;;;;;;2;TESTTHAT-SSP2-Base;;0.80
-TESTTHAT-SSP2-Policy;2;auto;--wait --mail-type=FAIL;SSP2|NDC;SDP-MC;TRUE;y2150;2;TESTTHAT-SSP2-Base;;;;;;output/C_TESTTHAT-SSP2-Base-rem-1/REMIND_generic_C_TESTTHAT-SSP2-Base-rem-1.mif;20;
+title;start;qos;sbatch;magpie_scen;config/scenario_config.csv;magpie_empty;no_ghgprices_land_until;max_iterations;oldrun;path_gdx;path_gdx_ref;path_gdx_bau;path_report;cm_nash_autoconverge_lastrun;path_mif_ghgprice_land;cfg_mag$gms$s56_minimum_cprice;cfg_mag$damping_factor;cfg_mag$gms$s56_cprice_red_factor
+TESTTHAT-SSP2-Base;1;auto;--wait --mail-type=FAIL;SSP2|NPI;SDP-MC;TRUE;y2150;2;;;;;;2;;;;
+TESTTHAT-SSP2-NDC;1;auto;--wait --mail-type=FAIL;SSP2|NDC;;TRUE;y2150;2;;;;;;2;TESTTHAT-SSP2-Base;;0.80;0.5
+TESTTHAT-SSP2-Policy;2;auto;--wait --mail-type=FAIL;SSP2|NDC;SDP-MC;TRUE;y2150;2;TESTTHAT-SSP2-Base;;;;;;output/C_TESTTHAT-SSP2-Base-rem-1/REMIND_generic_C_TESTTHAT-SSP2-Base-rem-1.mif;20;;

start_bundle_coupled.R

@@ -420,7 +420,8 @@ for(scen in common){
   }
 
   # Edit remind main model file, region settings and input data revision based on scenarios table, if cell non-empty
-  for (switchname in intersect(c("model", "regionmapping", "extramappings_historic", "inputRevision"), names(settings_remind))) {
+  cfg_rem_options <- c("model", "regionmapping", "extramappings_historic", "inputRevision", setdiff(names(cfg_rem), c("gms", "output")))
+  for (switchname in intersect(cfg_rem_options, names(settings_remind))) {
     if ( ! is.na(settings_remind[scen, switchname] )) {
       cfg_rem[[switchname]] <- settings_remind[scen, switchname]
     }