From 2eb5d3fb721db74aea46efbb8f814251dd57e291 Mon Sep 17 00:00:00 2001 From: orichters Date: Wed, 2 Aug 2023 10:49:08 +0200 Subject: [PATCH] remove unused switch cm_fixCO2price --- main.gms | 1 - scripts/start/readCheckScenarioConfig.R | 5 +++-- standalone/MOFEX/MOFEX.gms | 2 -- standalone/trade/trade.gms | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/main.gms b/main.gms index 9ee75420b..1915ed637 100755 --- 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 index 420bf2490..07026804e 100644 --- a/scripts/start/readCheckScenarioConfig.R +++ b/scripts/start/readCheckScenarioConfig.R @@ -115,8 +115,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 index b87982797..cf13351c7 100644 --- 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 index 5bf3dea66..dadbb0b08 100644 --- 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