Merge branch 'develop' of github.com:remindmodel/remind into develop

CHANGELOG.md

@@ -4,8 +4,25 @@
 All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+
 ## [Unreleased]
 
+### input data/calibration
+
+### changed
+-
+
+### added
+-
+
+### removed
+-
+
+### fixed
+-
+
+## [3.4.0] - 2024-12-11
+
 ### input data/calibration
 - new input data rev6.84 [[#1757](https://github.com/remindmodel/remind/pull/1757)]
 - new input data rev6.95 in US$2017[[#1812]] (https://github.com/remindmodel/remind/pull/1812) 
@@ -37,6 +54,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
     [[#1881](https://github.com/remindmodel/remind/pull/1881)]
 
 ### added
+- **config** add ScenarioMIP config
+    [[#1894](https://github.com/remindmodel/remind/pull/1894)] and [[#1920](https://github.com/remindmodel/remind/pull/1920)]
 - **32_power** increase minimum required dispatchable back-up capacity for VRE integration
     [[#1789](https://github.com/remindmodel/remind/pull/1789)]
 - **33_CDR** added ocean alkalinity enhancement to the CDR portfolio (OAE is turned off by default)
@@ -78,7 +97,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
     [[#1871](https://github.com/remindmodel/remind/pull/1871)]
 
 ### fixed
-- included CCS from plastic waste incineration in CCS mass flows so it is
+- **30_biomass** reset 1st gen. biofuel bound from 2045 to 2030
+    [[#1890](https://github.com/remindmodel/remind/pull/1890)]
+- **37_industry** included CCS from plastic waste incineration in CCS mass flows so it is
     subject to injection constraints (but did not add CCS costs, see
     https://github.com/remindmodel/development_issues/issues/274
 - **MAGICC7** fix climate data for time before cm_startyear on reference run
@@ -91,8 +112,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
     [[#1768](https://github.com/remindmodel/remind/pull/1768)]
 - **scripts** limit slurm runtime of output.R scripts to 2 hours
     [[#1783](https://github.com/remindmodel/remind/pull/1783)]
-- **30_biomass** reset 1st gen. biofuel bound from 2045 to 2030
-    [[#1890](https://github.com/remindmodel/remind/pull/1890)]
 
 ### removed
 - **45_carbonprice** removed superseded realizations linear, exponential and diffCurvPhaseIn2Lin

CITATION.cff

@@ -271,8 +271,8 @@ abstract: REMIND (REgional Model of Investment and Development) is a numerical
   technology, policy and climate constraints. It also accounts for regional trade 
   characteristics on goods, energy fuels, and emissions allowances. All greenhouse 
   gas emissions due to human activities are represented in the model.
-version: "3.3.2.dev1145"
-date-released: 2024-12-05
+version: "3.4.0.dev18"
+date-released: 2024-12-14
 repository-code: https://github.com/remindmodel/remind
 keywords:
   - energy

DESCRIPTION

@@ -53,7 +53,7 @@ Imports:
     ncdf4,
     nleqslv,
     optparse,
-    piamenv (>= 0.5.4),
+    piamenv (>= 0.6.0),
     piamInterfaces (>= 0.34.1),
     piamPlotComparison (>= 0.0.10),
     piamutils,

config/conopt3.op6

@@ -0,0 +1,10 @@
+rtnwtr = 1.e-7;
+lfnicr = 1000;
+lfstal = 1000;
+lfilog = 500;
+rtredg = 1.d-6;
+rvhess 100;
+lfdegi 500;
+lfnsup 7000;
+rtmins 0.0009765625;
+rtnwmi = 1.d-9;

config/default.cfg

@@ -28,10 +28,10 @@ cfg$regionmapping <- "config/regionmappingH12.csv"
 cfg$extramappings_historic <- ""
 
 #### Current input data revision (<mainrevision>.<subrevision>) ####
-cfg$inputRevision <- "7.16"
+cfg$inputRevision <- "7.19"
 
 #### Current CES parameter and GDX revision (commit hash) ####
-cfg$CESandGDXversion <- "5452a611b8add9f439df0a98a27277a306ece286"
+cfg$CESandGDXversion <- "cfe76b2cb670aee30490e8191a5498ff8b0b6421"
 
 #### Force the model to download new input data ####
 cfg$force_download <- FALSE
@@ -69,7 +69,7 @@ cfg$validationmodel_name <- "VALIDATIONREMIND"
 
 #### model version of the overall model (used for run statistics only).
 # automatically generated for development versions, updated by hand for releases
-cfg$model_version <- "3.3.2.dev1145"
+cfg$model_version <- "3.4.0.dev18"
 
 #### settings ####
 cfg$gms <- list()
@@ -136,6 +136,7 @@ cfg$files2export$start <- c("config/conopt3.opt",
                             "config/conopt3.op2",
                             "config/conopt3.op3",
                             "config/conopt3.op4",
+                            "config/conopt3.op6",
                             "config/conopt3.op9",
                             "core/input/historical/historical.mif",
                             "scripts/input/exoGAINSAirpollutants.R",

config/scenario_config_coupled.csv

@@ -7,7 +7,7 @@ SSP2_lowEn-NDC;0;;;;SSP2|NDC|nocc_hist|rcp4p5;y2150;;;;1;;
 SSP2_lowEn-NPi2025;0;;;;SSP2|NPI|nocc_hist|rcp4p5;y2150;;;;1;;
 SSP2_lowEn-PkBudg1000;0;;;;SSP2|NDC|nocc_hist|rcp2p6;y2030;;;;1;;
 SSP2_lowEn-PkBudg650;0;;;;SSP2|NDC|nocc_hist|rcp1p9;y2030;;;;1;;
-SSP2-EcBudg400;0;;;;SSP2|NDC|nocc_hist|rcp2p6;y2035;;;;1;;
+SSP2-EcBudg400;0;;;;SSP2|NDC|nocc_hist|rcp2p6;y2030;;;;1;;
 SSP2-NDC;0;;;;SSP2|NDC|nocc_hist|rcp4p5;y2150;;;;1;;
 SSP2-NPi;0;;;;SSP2|NPI|nocc_hist|rcp4p5;y2150;;;;1;;
 SSP2-NPi2025;0;;;;SSP2|NPI|nocc_hist|rcp4p5;y2150;;;;1;;

config/scenario_config_coupled_ScenarioMIP.csv

@@ -1,40 +1,37 @@
-title;start;copyConfigFrom;oldrun;path_report;qos;config/scenario_config.csv;no_ghgprices_land_until;var_luc;path_gdx;path_gdx_bau;path_gdx_ref;cfg_mag$gms$s15_elastic_demand;cfg_mag$gms$s32_npi_ndc_reversal;cfg_mag$gms$s35_npi_ndc_reversal
-SMIPv04-H-SSP3-rollBack-def;1;;;;;SSP3|NPI|nocc_hist|rcp4p5;y2150;raw;;;;1;2030;2030
-SMIPv04-M-SSP2-NPi2025-def;1;;;;;SSP2|NPI|nocc_hist|rcp4p5;y2150;raw;;;;1;;
-SMIPv04-ML-SSP2-PkBudg2000-def;1;;;;;SSP2|NPI|nocc_hist|rcp4p5;y2045;raw;;;;1;;
-SMIPv04-L-SSP2-PkBudg1000-def;1;;;;;SSP2|NDC|nocc_hist|rcp2p6;y2035;raw;;;;1;;
-SMIPv04-VLHO-SSP2-EcBudg400-def;1;;;;;SSP2|NDC|nocc_hist|rcp2p6;y2035;raw;;;;1;;
-SMIPv04-VLLO-SSP1-PkBudg750-def;1;;;;;SDP-MC|SSP1-POP-GDP|NDC|nocc_hist|rcp1p9;y2030;raw;;;;1;;
-SMIPv04-M-SSP2-NPi2020-var;1;SMIPv04-M-SSP2-NPi2025-def;;;;;;;;;;1;;
-SMIPv04-M-SSP2-NDC_sy2030-var;1;;;;;SSP2|NDC|nocc_hist|rcp4p5;y2150;raw;;;;1;;
-SMIPv04-M-SSP2-NDC_sy2025-var;1;;;;;SSP2|NDC|nocc_hist|rcp4p5;y2150;raw;;;;1;;
-SMIPv04-L-SSP2-PkBudg1000-var_2030NPi;1;SMIPv04-L-SSP2-PkBudg1000-def;;;;;;;;;;1;;
-SMIPv04-L-SSP2-PkBudg1000-var_2030flexible;1;SMIPv04-L-SSP2-PkBudg1000-def;;;;;;;;;;1;;
-SMIPv04-H-SSP5-rollBack-var;0;;;;;SSP5|NPI|nocc_hist|rcp4p5;y2150;raw;;;;1;2030;2030
-SMIPv04-M-SSP1-NPi2025-var;0;;;;;SSP1|NPI|nocc_hist|rcp4p5;y2150;raw;;;;1;;
-SMIPv04-M-SSP1-NPi2020-var;0;;;;;SSP1|NPI|nocc_hist|rcp4p5;y2150;raw;;;;1;;
-SMIPv04-M-SSP1-NDC_sy2030-var;0;;;;;SSP1|NDC|nocc_hist|rcp4p5;y2150;raw;;;;1;;
-SMIPv04-M-SSP1-NDC_sy2025-var;0;;;;;SSP1|NDC|nocc_hist|rcp4p5;y2150;raw;;;;1;;
-SMIPv04-M-SSP2_lowEn-NPi2025-var;1;SMIPv04-M-SSP2-NPi2025-def;;;;;;;;;;1;;
-SMIPv04-M-SSP3-NPi2025-var;0;;;;;SSP3|NPI|nocc_hist|rcp4p5;y2150;raw;;;;1;;
-SMIPv04-M-SSP5-NPi2025-var;0;;;;;SSP5|NPI|nocc_hist|rcp4p5;y2150;raw;;;;1;;
-SMIPv04-L-SSP1-PkBudg1000-var;0;;;;;SSP1|NDC|nocc_hist|rcp2p6;y2035;raw;;;;1;;
-SMIPv04-VLLO-SSP2-PkBudg750-var;1;;;;;SDP-MC|SSP2-POP-GDP|NDC|nocc_hist|rcp1p9;y2030;raw;;;;1;;
-SMIPv04-VLLO-SSP2_lowEn-PkBudg750-var;1;;;;;SDP-MC|SSP2-POP-GDP|NDC|nocc_hist|rcp1p9;y2030;raw;;;;1;;
-RIKEN-VLLO-SSP2-PkBudg650-def;1;;;;;SSP2|NDC|nocc_hist|rcp1p9;y2030;raw;;;;1;;
-SMIPv04-L-SSP2-PkBudg1000-var_yr2035;1;SMIPv04-L-SSP2-PkBudg1000-def;;;;;;;;;;1;;
-SMIPv04-L-SSP2-PkBudg1000-var_yr2050;1;SMIPv04-L-SSP2-PkBudg1000-def;;;;;;;;;;1;;
-SMIPv04-VLHO-SSP2-EcBudg400-var_yr2035;1;SMIPv04-VLHO-SSP2-EcBudg400-def;;;;;;;;;;1;;
-SMIPv04-VLHO-SSP2-EcBudg400-var_yr2050;1;SMIPv04-VLHO-SSP2-EcBudg400-def;;;;;;;;;;1;;
-SMIPv04-VLLO-SSP1-PkBudg750-var_yr2035;1;SMIPv04-VLLO-SSP1-PkBudg750-def;;;;;;;;;;1;;
-SMIPv04-H-SSP3-rollBack-var_EWoff;1;SMIPv04-H-SSP3-rollBack-def;;;;;;;;;;1;2030;2030
-SMIPv04-M-SSP2-NPi2025-var_EWoff;1;SMIPv04-M-SSP2-NPi2025-def;;;;;;;;;;1;;
-SMIPv04-ML-SSP2-PkBudg2000-var_EWoff;1;SMIPv04-ML-SSP2-PkBudg2000-def;;;;;;;;;;1;;
-SMIPv04-L-SSP2-PkBudg1000-var_EWoff;1;SMIPv04-L-SSP2-PkBudg1000-def;;;;;;;;;;1;;
-SMIPv04-VLHO-SSP2-EcBudg400-var_EWoff;1;SMIPv04-VLHO-SSP2-EcBudg400-def;;;;;;;;;;1;;
-SMIPv04-VLLO-SSP1-PkBudg750-var_EWoff;1;SMIPv04-VLLO-SSP1-PkBudg750-def;;;;;;;;;;1;;
-SMIPv04-VLLO-SSP1-PkBudg750-var_CESMkUps;1;SMIPv04-VLLO-SSP1-PkBudg750-def;;;;;;;;;;1;;
-SMIPv04-VLLO-SSP1-PkBudg750-var_ProdCost;1;SMIPv04-VLLO-SSP1-PkBudg750-def;;;;;;;;;;1;;
-SMIPv04-VLLO-SSP1-PkBudg750-var_bioenergy_SustTax1p75;1;SMIPv04-VLLO-SSP1-PkBudg750-def;;;;;;;;;;1;;
-SMIPv04-VLLO-SSP1-PkBudg750-var_tradecostBio0p5;1;SMIPv04-VLLO-SSP1-PkBudg750-def;;;;;;;;;;1;;
-SMIPv04-VLLO-SSP1-PkBudg750-var_maxProdBiolc100;1;SMIPv04-VLLO-SSP1-PkBudg750-def;;;;;;;;;;1;;
+title;start;copyConfigFrom;oldrun;path_report;qos;config/scenario_config.csv;no_ghgprices_land_until;var_luc;path_gdx;path_gdx_bau;path_gdx_ref;cfg_mag$gms$s15_elastic_demand;cfg_mag$gms$s32_aff_plantation;cfg_mag$gms$s32_npi_ndc_reversal;cfg_mag$gms$s35_npi_ndc_reversal
+SMIPv04-H-SSP3-rollBack-def;0,SSP3,H,default;;;;;SSP3|NPI|nocc_hist;y2150;;;;;1;0;2030;2030
+SMIPv04-M-SSP2-NPi2025-def;0,SSP2,M,default;;;;;SSP2|NPI|nocc_hist;y2150;;;;;1;0;;
+SMIPv04-ML-SSP2-PkBudg1500-def;0,SSP2,ML,default;;;;;SSP2|NPI|nocc_hist;y2040;;;;;1;0;;
+SMIPv04-L-SSP2-PkBudg1000-def;0,SSP2,L,default;;;;;SSP2|NDC|nocc_hist;y2030;;;;;1;0;;
+SMIPv04-VLHO-SSP2-EcBudg400-def;0,SSP2,VLHO,default;;;;;SSP2|NDC|nocc_hist;y2030;;;;;1;0;;
+SMIPv04-VLLO-SSP1-PkBudg650-def;0,SSP1,VLLO,default;;;;;SDP-MC|SSP1-POP-GDP|NDC|nocc_hist;y2030;;;;;1;0;;
+SMIPv04-M-SSP1-NPi2025-var;0,SSP1,M;;;;;SSP1|NPI|nocc_hist;y2150;;;;;1;0;;
+SMIPv04-M-SSP2_lowEn-NPi2025-var;0,SSP2_lowEn,M;SMIPv04-M-SSP2-NPi2025-def;;;;;;;;;;;;;
+SMIPv04-M-SSP3-NPi2025-var;0,SSP3,M;;;;;SSP3|NPI|nocc_hist;y2150;;;;;1;0;;
+SMIPv04-L-SSP1-PkBudg1000-var;0,SSP1,L;;;;;SSP1|NDC|nocc_hist;y2030;;;;;1;0;;
+SMIPv04-VLLO-SSP2-PkBudg650-var;0,SSP2,VLLO;;;;;SDP-MC|SSP2-POP-GDP|NDC|nocc_hist;y2030;;;;;1;0;;
+SMIPv04-VLLO-SSP2_lowEn-PkBudg650-var;0,SSP2_lowEn,VLLO;;;;;SDP-MC|SSP2-POP-GDP|NDC|nocc_hist;y2030;;;;;1;0;;
+RIKEN-VLLO-SSP2-PkBudg650-def;0,SSP2,VLLO;;;;;SSP2|NDC|nocc_hist;y2030;;;;;1;0;;
+SMIPv04-L-SSP2-PkBudg1000-var_yr2035;0,SSP2,L;SMIPv04-L-SSP2-PkBudg1000-def;;;;;;;;;;;;;
+SMIPv04-L-SSP2-PkBudg1000-var_yr2050;0,SSP2,L;SMIPv04-L-SSP2-PkBudg1000-def;;;;;;;;;;;;;
+SMIPv04-VLHO-SSP2-EcBudg400-var_yr2035;0,SSP2,VLHO;SMIPv04-VLHO-SSP2-EcBudg400-def;;;;;;;;;;;;;
+SMIPv04-VLHO-SSP2-EcBudg400-var_yr2050;0,SSP2,VLHO;SMIPv04-VLHO-SSP2-EcBudg400-def;;;;;;;;;;;;;
+SMIPv04-VLLO-SSP1-PkBudg650-var_yr2035;0,SSP1,VLLO;SMIPv04-VLLO-SSP1-PkBudg650-def;;;;;;;;;;;;;
+SMIPv04-VLLO-SSP2-PkBudg650-var_yr2035;0,SSP2,VLLO;SMIPv04-VLLO-SSP2-PkBudg650-var;;;;;;;;;;;;;
+SMIPv04-H-SSP3-rollBack-var_EWoff;0,SSP3,H;SMIPv04-H-SSP3-rollBack-def;;;;;;;;;;;;;
+SMIPv04-M-SSP2-NPi2025-var_EWoff;0,SSP2,M;SMIPv04-M-SSP2-NPi2025-def;;;;;;;;;;;;;
+SMIPv04-ML-SSP2-PkBudg1500-var_EWoff;0,SSP2,ML;SMIPv04-ML-SSP2-PkBudg1500-def;;;;;;;;;;;;;
+SMIPv04-L-SSP2-PkBudg1000-var_EWoff;0,SSP2,L;SMIPv04-L-SSP2-PkBudg1000-def;;;;;;;;;;;;;
+SMIPv04-VLHO-SSP2-EcBudg400-var_EWOAEoff;0,SSP2,VLHO;SMIPv04-VLHO-SSP2-EcBudg400-def;;;;;;;;;;;;;
+SMIPv04-VLLO-SSP1-PkBudg650-var_EWoff;0,SSP1,VLLO;SMIPv04-VLLO-SSP1-PkBudg650-def;;;;;;;;;;;;;
+SMIPv04-VLLO-SSP2-PkBudg650-var_EWoff;0,SSP2,VLLO;SMIPv04-VLLO-SSP2-PkBudg650-var;;;;;;;;;;;;;
+SMIPv04-VLHO-SSP2-EcBudg400-var_NPi;0,SSP2,VLHO;;;;;SSP2|NPI|nocc_hist;y2030;;;;;1;0;;
+SMIPv04-VLHO-SSP2-EcBudg400-var_plantation;0,SSP2,VLHO;SMIPv04-VLHO-SSP2-EcBudg400-def;;;;;;;;;;;1;;
+SMIPv04-VLHO-SSP2-EcBudg400-var_plantation_NPi;0,SSP2,VLHO;SMIPv04-VLHO-SSP2-EcBudg400-var_NPi;;;;;;;;;;;1;;
+SMIPv04-VLLO-SSP1-PkBudg650-var_no1stgen_phaseout;0,SSP1,VLLO;SMIPv04-VLLO-SSP1-PkBudg650-def;;;;;;;;;;;;;
+SMIPv04-H-SSP3-rollBack-var_raw_luc;0,SSP3,H;SMIPv04-H-SSP3-rollBack-def;;;;;;raw;;;;;;;
+SMIPv04-M-SSP2-NPi2025-var_raw_luc;0,SSP2,M;SMIPv04-M-SSP2-NPi2025-def;;;;;;raw;;;;;;;
+SMIPv04-ML-SSP2-PkBudg1500-var_raw_luc;0,SSP2,ML;SMIPv04-ML-SSP2-PkBudg1500-def;;;;;;raw;;;;;;;
+SMIPv04-L-SSP2-PkBudg1000-var_raw_luc;0,SSP2,L;SMIPv04-L-SSP2-PkBudg1000-def;;;;;;raw;;;;;;;
+SMIPv04-VLHO-SSP2-EcBudg400-var_raw_luc;0,SSP2,VLHO;SMIPv04-VLHO-SSP2-EcBudg400-def;;;;;;raw;;;;;;;
+SMIPv04-VLLO-SSP1-PkBudg650-var_raw_luc;0,SSP1,VLLO;SMIPv04-VLLO-SSP1-PkBudg650-def;;;;;;raw;;;;;;;

core/bounds.gms

@@ -310,10 +310,12 @@ vm_cap.up("2025",regi,"elh2","1")= 20 * pm_eta_conv("2025",regi,"elh2")*pm_gdp("
 
 *** bounds on biomass technologies
 *' set upper bounds on biomass gasification for h2 production, which is not deployed as of 2025
-*' set maximum of 0.1 EJ/yr production by 2030 for each technology
+*' allow for small production of 0.1 EJ/yr at by 2030 for each technology globally, distributed to regions by GDP share
 vm_cap.up("2030",regi,"bioh2","1")= 0.1 / 3.66 * 1e3 / 8760 * pm_gdp("2030",regi) / sum(regi2,pm_gdp("2030",regi2));
 vm_cap.up("2030",regi,"bioh2c","1")= 0.1 / 3.66 * 1e3 / 8760 * pm_gdp("2030",regi) / sum(regi2,pm_gdp("2030",regi2));
-
+*' allow zero vm_deltaCap for bio-H2 up to 2030 to be consistent with above bounds
+vm_deltaCap.lo(t,regi,"bioh2","1")$(t.val le 2030) = 0;
+vm_deltaCap.lo(t,regi,"bioh2c","1")$(t.val le 2030) = 0;
 
 *** fix capacities for advanced bio carbon capture technologies to zero in 2020 (i.e. no BECCS in 2020)
 vm_cap.fx("2020",regi,te,rlf)$(teBio(te) AND teCCS(te)) = 0;

core/equations.gms

@@ -754,19 +754,14 @@ q_emiCdrAll(t,regi)..
 
 
 ***------------------------------------------------------
-*' Total regional emissions are the sum of emissions from technologies, MAC-curves, CDR-technologies and emissions that are exogenously given for REMIND.
+*' Total regional emissions are computed as the sum of total emissions over all emission markets.
 ***------------------------------------------------------
-*LB* calculate total emissions for each region at each time step
-q_emiAll(t,regi,emi(enty))..
-  vm_emiAll(t,regi,enty)
+q_emiAll(t,regi,emi)..
+  vm_emiAll(t,regi,emi)
   =e=
-    vm_emiTe(t,regi,enty)
-  + vm_emiMac(t,regi,enty)
-  + vm_emiCdr(t,regi,enty)
-  + pm_emiExog(t,regi,enty)
+  sum(emiMkt, vm_emiAllMkt(t,regi,emi,emiMkt))
 ;
 
-
 ***------------------------------------------------------
 *' Total regional emissions in CO2 equivalents that are part of the climate policy  are computed based on regional GHG
 *' emissions from different sectors(energy system, non-energy system, exogenous, CDR technologies).

main.gms

@@ -76,7 +76,6 @@
 *' OUTPUT
 *' ```
 *'
-*'
 *' The GAMS code follows a Coding Etiquette:
 *'
 *' #### Naming conventions:
@@ -715,13 +714,14 @@ parameter
 parameter
   cm_fetaxscen              "choice of final energy tax path, subsidy path and inconvenience cost path, values other than zero enable final energy tax"
 ;
-  cm_fetaxscen        = 3;         !! def = 3  !! regexp = [0-4]
+  cm_fetaxscen        = 3;         !! def = 3  !! regexp = [0-5]
 *' even if set to 0, the PE inconvenience cost per SO2-cost for coal are always on if module 21_tax is on
 *' * (0): no tax, sub, inconv
 *' * (1): constant t,s,i (used in SSP 5 and ADVANCE WP3.1 HighOilSub)
 *' * (2): converging tax, phased out sub (-2030), no inconvenience cost so far (used in SSP 1)
 *' * (3): constant tax, phased out sub (-2050), no inconvenience cost so far (used in SSP 2)
 *' * (4): constant tax, phased out sub (-2030), no inconvenience cost so far (used in SDP)
+*' * (5): roll back of final energy taxes to get back to a no-policy case (previously known as BAU)
 *'
 parameter
   cm_distrBeta              "elasticity of tax revenue redistribution"
@@ -1702,12 +1702,16 @@ $setglobal cm_taxCO2_regiDiff         initialSpread10    !! def = "initialSpread
 *** cm_taxCO2_regiDiff_endYr "switch for choosing convergence year of regionally differentiated carbon prices when using initialSpread10 or initialSpread20 in 45_carbonprice/functionalForm"
 *** Setting cm_taxCO2_regiDiff_endYr to GLO 2050, IND 2070, SSA 2100 means that convergence year is delayed for IND to 2070 and for SSA to 2100
 $setglobal cm_taxCO2_regiDiff_endYr   "GLO 2050"    !! def = "GLO 2050"
-*** cm_co2_tax_interpolation "switch for interpolation between (a) carbonprice trajectory given by path_gdx_ref and (b) carbonprice trajectory defined in 45_carbonprice"
+*** cm_co2_tax_interpolation "switch for interpolation between (a) carbonprice trajectory given by path_gdx_ref (or manually chosen regional carbon price in cm_startyear - see cm_taxCO2_startYearValue) and (b) carbonprice trajectory defined in 45_carbonprice"
 *** (off): no interpolation, i.e. (b) is used from cm_startyear onward
 *** (one_step): linear interpolation within 10 years between (a) and (b). For example, if cm_startyear = 2030, it uses (a) until 2025, the average of (a) and (b) in 2030, and (b) from 2035.
 *** (two_steps): linear interpolation within 15 years between (a) and (b). For example, if cm_startyear = 2030, it uses (a) until 2025, weighted averages of (a) and (b) in 2030 and 2035, and (b) from 2040.
 *** Setting cm_co2_tax_interpolation to GLO.2025.2050 2, EUR.2025.2040 1 means that interpolation between (a) and (b) in quadratic [exponent = 2], starts in 2025, and ends in 2050 for all regions, except for Europe that has linear interpolation [exponent = 1] starting in 2025 and ending in 2040
-$setglobal cm_taxCO2_interpolation  off    !! def = "one_step"
+$setglobal cm_taxCO2_interpolation  off    !! def = "off"
+*** cm_taxCO2_startYearValue  "switch for manually choosing regional carbon prices in cm_startyear that are used as starting point for interpolation"
+*** (off): no manual values provided, i.e. carbonprice trajectory given by path_gdx_ref is used for interpolation
+*** Setting cm_taxCO2_startYearValue to GLO 50, SSA 5, CHA 40 means that in cm_startyear, SSA has carbon price of 5$/tCO2,  CHA has carbon price of 40$/tCO2, and all other regions have carbon price of 50$/tCO2.
+$setglobal cm_taxCO2_startYearValue !! def = "off"
 *** cm_taxCO2_lowerBound_path_gdx_ref "switch for choosing if carbon price trajectories from path_gdx_ref are used as lower bound"
 *** (on): carbon price trajectories (pm_taxCO2eq) from path_gdx_ref is used as lower bound for pm_taxCO2eq
 *** (off): no lower bound

modules/21_tax/on/datainput.gms

@@ -37,6 +37,17 @@ $include "./modules/21_tax/on/input/f21_tax_convergence.cs4r"
 $offdelim
   /
 ;
+Parameter f21_tax_convergence_rollback(tall,all_regi,all_enty) "Tax convergence level for specific regions, year and final energy type"
+  /
+$ondelim
+$include "./modules/21_tax/on/input/f21_tax_convergence_rollback.cs4r"
+$offdelim
+  /
+;
+if(cm_fetaxscen eq 5,
+f21_tax_convergence(ttot,regi,enty) = f21_tax_convergence_rollback(ttot,regi,enty);
+);
+
 Parameter f21_max_fe_sub(tall,all_regi,all_enty) "maximum final energy subsidy levels (in $/Gj) from REMIND version prior to rev. 5429"
   /
 $ondelim
@@ -82,14 +93,15 @@ p21_tau_pe2se_sub(tall,regi,te)= 0;
 *RP* FILE changed by hand after introduction of SO2 taxes and inconvenience penalties on 2012-03-08
 *** Values try to account for excessive water use, further pollution
 *** Taxes are given in USD(2005) and converted to USD(2017) per GJ 
+if(cm_fetaxscen ne 5,
 p21_tau_pe2se_tax(ttot,regi,"igcc")$(ttot.val ge 2005)       = sm_D2005_2_D2017 * 0.25;
 p21_tau_pe2se_tax(ttot,regi,"igccc")$(ttot.val ge 2005)      = sm_D2005_2_D2017 * 0.25;
 p21_tau_pe2se_tax(ttot,regi,"coalftrec")$(ttot.val ge 2005)  = sm_D2005_2_D2017 * 1.0;
 p21_tau_pe2se_tax(ttot,regi,"coalftcrec")$(ttot.val ge 2005) = sm_D2005_2_D2017 * 1.0;
 p21_tau_pe2se_tax(ttot,regi,"coalh2")$(ttot.val ge 2005)     = sm_D2005_2_D2017 * 0.5;
 p21_tau_pe2se_tax(ttot,regi,"coalh2c")$(ttot.val ge 2005)    = sm_D2005_2_D2017 * 0.5;
 p21_tau_pe2se_tax(ttot,regi,"coalgas")$(ttot.val ge 2005)    = sm_D2005_2_D2017 * 0.5;
-
+);
 ***cb20110923 rescaling of PE2SE parameters from $/GJ to trillion $ / TWa 
 p21_tau_pe2se_tax(ttot,regi,te)$(ttot.val ge 2005)    = p21_tau_pe2se_tax(ttot,regi,te)    * 0.001 / sm_EJ_2_TWa;
 p21_tau_pe2se_sub(ttot,regi,te)$(ttot.val ge 2005)    = p21_tau_pe2se_sub(ttot,regi,te)    * 0.001 / sm_EJ_2_TWa;

modules/21_tax/on/input/files

@@ -5,4 +5,5 @@ f21_prop_fe_sub.cs4r
 f21_tau_pe_sub.cs4r
 f21_max_pe_sub.cs4r
 f21_tax_convergence.cs4r
+f21_tax_convergence_rollback.cs4r