Merge pull request #1369 from orichters/cm_fixCO2price

remove unused switch cm_fixCO2price
remindmodel · Aug 8, 2023 · f00eb86 · f00eb86
2 parents 04f9504 + 2eb5d3f
commit f00eb86
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/main.gms b/main.gms
@@ -1639,7 +1639,6 @@ $setglobal cm_CES_configuration  indu_subsectors-buil_simple-tran_edge_esm-POP_p
 $setglobal c_CES_calibration_iterations  10     !!  def  =  10
 $setglobal c_CES_calibration_industry_FE_target  1
 $setglobal c_testOneRegi_region  EUR       !! def = EUR  !! regexp = [A-Z]{3}
-$setglobal cm_fixCO2price  off !! def = off
 
 *' @stop
 

diff --git a/scripts/start/readCheckScenarioConfig.R b/scripts/start/readCheckScenarioConfig.R
@@ -144,8 +144,9 @@ readCheckScenarioConfig <- function(filename, remindPath = ".", testmode = FALSE
        "cm_BioImportTax_EU" = "Use more flexible cm_import_tax switch instead, see https://github.com/remindmodel/remind/issues/1157",
        "cm_trdcst" = "Now always fixed to 1.5, see https://github.com/remindmodel/remind/pull/1052",
        "cm_trdadj" = "Now always fixed to 2, see https://github.com/remindmodel/remind/pull/1052",
-       "cm_OILRETIRE" = "Now always on by default, see https://github.com/remindmodel/remind/pull/1102"
-     )
+       "cm_OILRETIRE" = "Now always on by default, see https://github.com/remindmodel/remind/pull/1102",
+       "cm_fixCO2price" = "Was never in use, removed in https://github.com/remindmodel/remind/pull/1369",
+     NULL)
     for (i in intersect(names(forbiddenColumnNames), unknownColumnNames)) {
       if (testmode) {
         warning("Column name ", i, " in remind settings is outdated. ", forbiddenColumnNames[i])

diff --git a/standalone/MOFEX/MOFEX.gms b/standalone/MOFEX/MOFEX.gms
@@ -496,8 +496,6 @@ $setglobal cm_DAC_eff  off !! def = off
 
 $setglobal cm_sehe_upper  off !! def = off 
 
-$setglobal cm_fixCO2price  off !! def = off
-
 $setglobal cm_feShareLimits  off  !! def = off
 
 $setglobal c_fuelprice_init  off !! def = off

diff --git a/standalone/trade/trade.gms b/standalone/trade/trade.gms
@@ -501,8 +501,6 @@ $setglobal cm_DAC_eff  off !! def = off
 
 $setglobal cm_sehe_upper  off !! def = off 
 
-$setglobal cm_fixCO2price  off !! def = off
-
 $setglobal cm_feShareLimits  off  !! def = off
 
 $setglobal c_fuelprice_init  off !! def = off