new 45/NPi+NDC with EUR 2030, ELEVATE2p3 config, fix coupled tests, adjust units 2005->2017

CHANGELOG.md

@@ -24,15 +24,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - moved to edgeTransport 2.0 version [[#1749](https://github.com/remindmodel/remind/pull/1749)]
 - **scripts** in readCheckScenarioConfig(), do not automatically remove path_gdx_bau if allegedly 'not needed'
     [[#1809](https://github.com/remindmodel/remind/pull/1809)]
+- **scripts** adjust MAgPIE coupling to US$2005 -> 2017 shift
+    [[#1851](https://github.com/remindmodel/remind/pull/1851)]
 - **core** changed adjustment cost of geohe (central heat pumps), elh2 (electrolysis), MeOH (FT-Synthesis: H2-to-Liquids)
     and h22ch4 (methanation: H2-to-Gas) to better reflect upscaling dynamics
     [[#1823](https://github.com/remindmodel/remind/pull/1823)]
 
 ### added
-- **50_damages**, **51_internalizeDamages** add KotzWenz realization based on Kotz & Wenz (2024)
-    [[#1601](https://github.com/remindmodel/remind/pull/1601)]
+- **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)
+    [[#1777](https://github.com/remindmodel/remind/pull/1777)]
 - **45_carbonprice** added realizations diffExp2Lin and diffLin2Lin
     [[#1723](https://github.com/remindmodel/remind/pull/1723)]
+-_**45_carbonprice** added realizations NPi2025_EUR55 and NPiexpo
+    [[#1851](https://github.com/remindmodel/remind/pull/1851)]
+- **50_damages**, **51_internalizeDamages** add KotzWenz realization based on Kotz & Wenz (2024)
+    [[#1601](https://github.com/remindmodel/remind/pull/1601)]
+- **config** add ELEVATE2p3 config
+    [[#1851](https://github.com/remindmodel/remind/pull/1851)]
 - **scripts** define defaults for script selections in output.R
     [[#1739](https://github.com/remindmodel/remind/pull/1739)]
 - **scripts** fail transparently on duplicated column names in `scenario_config*.csv` files
@@ -47,16 +57,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - **testthat** fail if manipulating main.gms with default cfg drops/changes switches and comments
     [[#1764](https://github.com/remindmodel/remind/pull/1764)] and
     [[#1767](https://github.com/remindmodel/remind/pull/1767)]
-- **33_CDR** added ocean alkalinity enhancement to the CDR portfolio (OAE is turned off by default)
-    [[#1777](https://github.com/remindmodel/remind/pull/1777)]
-- **32_power** increase minimum required dispatchable back-up capacity for VRE integration
-    [[#1789](https://github.com/remindmodel/remind/pull/1789)]
 - **scripts** integrate automated scenario validation via piamValidation as output script
     [[#1790](https://github.com/remindmodel/remind/pull/1790)]
 - **scripts** add interactive plotting script 'selectPlots'
     [[#1815](https://github.com/remindmodel/remind/pull/1815)]
 - **scripts** in readCheckScenarioConfig() while running tests, check if all scenarios stated in path_gdx* columns exist
     [[#1818](https://github.com/remindmodel/remind/pull/1818)]
+- **scripts** fail transparently if cm_startyear is earlier than that of path_gdx_ref
+    [[#1851](https://github.com/remindmodel/remind/pull/1851)]
 
 ### fixed
 - included CCS from plastic waste incineration in CCS mass flows so it is

DESCRIPTION

@@ -53,13 +53,13 @@ Imports:
     ncdf4,
     nleqslv,
     optparse,
-    piamenv (>= 0.4.0),
+    piamenv (>= 0.5.4),
     piamInterfaces (>= 0.34.1),
     piamPlotComparison (>= 0.0.10),
     piamutils,
     plotly,
     purrr,
-    quitte (>= 0.3137.1),
+    quitte (>= 0.3137.2),
     R.utils,
     raster,
     readr,

Makefile

@@ -79,6 +79,7 @@ test:            ## Test if the model compiles and runs without running a full
 test-fix:        ## First run codeCheck interactively, then test if the model compiles and runs without
                  ## running a full scenario. Tests take about 15 minutes to run.
 	$(info Tests take about 18 minutes to run, please be patient)
+	@./scripts/utils/SOFEOF
 	@Rscript -e 'rlang::with_options(warn = 1, invisible(gms::codeCheck(strict = TRUE, interactive = TRUE))); testthat::test_dir("tests/testthat");'
 	@echo "Do not forget to commit possible changes done by codeCheck to not_used.txt files"
 	@git add -p modules/*/*/not_used.txt

config/gdx-files/files

@@ -1,9 +1,6 @@
 indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP2-GDP_gdp_SSP2-En_gdp_SSP2-Kap_debt_limit-Reg_62eff8f7.gdx
 indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP2-GDP_gdp_SSP2-En_gdp_SSP2-Kap_debt_limit-Reg_2b1450bc.gdx
 indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP1-GDP_gdp_SSP1-En_gdp_SSP1-Kap_debt_limit-Reg_62eff8f7.gdx
-indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SDP_MC-GDP_gdp_SDP_MC-En_gdp_SDP_MC-Kap_debt_limit-Reg_62eff8f7.gdx
-indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SDP_RC-GDP_gdp_SDP_RC-En_gdp_SDP_RC-Kap_debt_limit-Reg_62eff8f7.gdx
-indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SDP_EI-GDP_gdp_SDP_EI-En_gdp_SDP_EI-Kap_debt_limit-Reg_62eff8f7.gdx
 indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP5-GDP_gdp_SSP5-En_gdp_SSP5-Kap_debt_limit-Reg_62eff8f7.gdx
 indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP2-GDP_gdp_SSP2-En_gdp_SSP2_lowEn-Kap_debt_limit-Reg_62eff8f7.gdx
 

config/scenario_config_ELEVATE2p3.csv

@@ -0,0 +1,18 @@
+title;start;slurmConfig;cm_wasteIncinerationCCSshare;cm_EDGEtr_scen;cm_reducCostB;cm_rcp_scen;cm_iterative_target_adj;subsidizeLearning;c_budgetCO2from2020;carbonprice;carbonpriceRegi;cm_netZeroScen;cm_co2_tax_startyear;cm_peakBudgYr;cm_taxCO2inc_after_peakBudgYr;cm_emiscen;cm_co2_tax_growth;cm_maxProdBiolc;techpol;cm_multigasscen;cm_startyear;path_gdx_carbonprice;path_gdx;path_gdx_refpolicycost;path_gdx_bau;description
+SSP2-Base;0;9;;Mix1;none;none;0;off;0;none;none;;-1;2100;3;1;1.05;off;none;2;2005;;;;;SSP2-Base: This baseline scenario follows the Shared Socioeconomic Pathways 2 called Middle of the Road. Industry sectors are modeled explicitly with individual CES nests for cement, chemicals, steel, and other production. The transport model EDGE-T with detailed modes/vehicles representation is used. A simple buildings model represents demand in terms of energy carriers. No Damages from climate change are considered.
+ELV_CurPol_T44;0;9;;Mix3;none;rcp45;3;off;0;NPi;none;;1;2100;3;9;1.05;100;NPi2018;3;2005;;;;;ELV_CurPol_T44: The Current Policies scenarios describe energy, climate and economic projections for the period until 2030. In the default setting carbon prices converges after 2030 over all regions to $25 eoc.
+ELV_NDC2030_T44;1;9;;Mix3;none;rcp45;3;globallyOptimal;0;NDC;none;;1;2100;3;9;1.05;100;NDC;3;2025;;;ELV-SSP2-CP-D1;ELV-SSP2-CP-D1;ELV_NDC2030_T44: The NDCs scenario aims to represent the goals of each country or region defined in their NDCs. The ambition levels reached in the target year remains at least constant throughout the rest of the century.
+ELV-SSP2-NDC-D0;1;9;;Mix3;none;rcp45;3;globallyOptimal;0;NPiexpo;none;;1;2100;3;9;1;100;NDC;3;2035;;ELV_NDC2030_T44;ELV_NDC2030_T44;;ELV-SSP2-NDC-D0: The NDCs scenario aims to represent the goals of each country or region defined in their NDCs. The ambition levels reached in the target year remains constant throughout the rest of the century.
+ELV-SSP2-NDC-D1;1;9;;Mix3;none;rcp45;3;globallyOptimal;0;NPiexpo;none;;1;2100;3;9;1.01;100;NDC;3;2035;;ELV_NDC2030_T44;ELV_NDC2030_T44;;ELV-SSP2-NDC-D1: The NDCs scenario aims to represent the goals of each country or region defined in their NDCs. The ambition levels reached in the target year increases by 1%.
+ELV-SSP2-NDC-D3;1;9;;Mix3;none;rcp45;3;globallyOptimal;0;NPiexpo;none;;1;2100;3;9;1.03;100;NDC;3;2035;;ELV_NDC2030_T44;ELV_NDC2030_T44;;ELV-SSP2-NDC-D3: The NDCs scenario aims to represent the goals of each country or region defined in their NDCs. The ambition levels reached in the target year increases by 3%.
+ELV-SSP2-LTS;1;9;2050.GLO 0.5;Mix3;none;rcp26;3;globallyOptimal;0;NDC;netZero;ELEVATE2p3;1;2100;3;9;1.05;100;NDC;3;2025;;ELV-SSP2-CP-D1;ELV-SSP2-CP-D1;ELV-SSP2-CP-D1;ELV_LTS_T44: High uncoordinated ambition (named as Glasgow in the ENGAGE 4.5 runs. The Glasgow scenario considers the NDC pledges and the mid-century strategy pledges (net-zero) announced at COP26 in Glasgow.)
+ELV-SSP2-NDC-LTS;1;9;2050.GLO 0.5;Mix3;none;rcp26;3;globallyOptimal;0;exogenous;netZero;ELEVATE2p3;1;2100;3;9;1.05;100;NDC;3;2035;ELV_NDC2030_T44;ELV_NDC2030_T44;ELV_NDC2030_T44;ELV-SSP2-CP-D1;ELV-SSP2-NDC-LTS: The scenario reaches NDC pleages in 2030 and converges to the Glasgow mid-century pledges.
+ELV-SSP2-1150;1;9;2050.GLO 0.5;Mix3;heatpumps;rcp26;7;globallyOptimal;1150;expoLinear;none;;163;2080;3;9;1.05;100;NDC;2;2030;;;ELV_NDC2030_T44;;ELV-SSP2-1150: net-zero budget Szenarien for 2 degree C global scenario without overshoot
+ELV-SSP2-400Feoc;1;9;2050.GLO 0.9;Mix3;heatpumps;rcp20;5;globallyOptimal;400;expoLinear;none;;163;2080;3;9;1.05;100;NDC;2;2030;;ELV_NDC2030_T44;ELV_NDC2030_T44;;ELV-SSP2-400F: full century 1.5 degree C global scenario allowing for overshoot.
+ELV-SSP2-CP-D0;1;9;;Mix3;none;rcp45;3;off;0;NPi2025_EUR55;none;;1;2100;3;9;1;100;NPi2018;3;2005;;;;;ELV_CurPol_T44: The Current Policies scenarios describe energy, climate and economic projections for the period until 2030 with new expert guess for 2025 and 2030 (EUR only). After 2030 each region keeps the carbon price constant.
+ELV-SSP2-CP-D1;1;9;;Mix3;none;rcp45;3;off;0;NPi2025_EUR55;none;;1;2100;3;9;1.01;100;NPi2018;3;2005;;;;;ELV_CurPol_T44: The Current Policies scenarios describe energy, climate and economic projections for the period until 2030 with new expert guess for 2025 and 2030 (EUR only). After 2030 each region increases their carbon price by 1%.
+ELV-SSP2-CP-D3;1;9;;Mix3;none;rcp45;3;off;0;NPi2025_EUR55;none;;1;2100;3;9;1.03;100;NPi2018;3;2005;;;;;ELV_CurPol_T44: The Current Policies scenarios describe energy, climate and economic projections for the period until 2030 with new expert guess for 2025 and 2030 (EUR only). After 2030 each region increases their carbon price by 3%.
+ELV-SSP2-CP-D1_Mix1;1;9;;Mix1ICEban;none;rcp45;3;off;0;NPi2025_EUR55;none;;1;2100;3;9;1.01;100;NPi2018;3;2005;;;;;ELV_CurPol_T44: The Current Policies scenarios describe energy, climate and economic projections for the period until 2030 with new expert guess for 2025 and 2030 (EUR only). After 2030 each region increases their carbon price by 1%.
+ELV-SSP2-CP-D1_Mix2;1;9;;Mix2ICEban;none;rcp45;3;off;0;NPi2025_EUR55;none;;1;2100;3;9;1.01;100;NPi2018;3;2005;;;;;ELV_CurPol_T44: The Current Policies scenarios describe energy, climate and economic projections for the period until 2030 with new expert guess for 2025 and 2030 (EUR only). After 2030 each region increases their carbon price by 1%.
+ELV_CurPol_T44_Mix1;1;9;;Mix1ICEban;none;rcp45;3;off;0;NPi;none;;1;2100;3;9;1.05;100;NPi2018;3;2005;;;;;ELV_CurPol_T44: The Current Policies scenarios describe energy, climate and economic projections for the period until 2030. In the default setting carbon prices converges after 2030 over all regions to $25 eoc.
+ELV_CurPol_T44_Mix2;1;9;;Mix2ICEban;none;rcp45;3;off;0;NPi;none;;1;2100;3;9;1.05;100;NPi2018;3;2005;;;;;ELV_CurPol_T44: The Current Policies scenarios describe energy, climate and economic projections for the period until 2030. In the default setting carbon prices converges after 2030 over all regions to $25 eoc.

config/scenario_config_coupled_ELEVATE2p3.csv

@@ -0,0 +1,18 @@
+title;start;oldrun;path_report;qos;magpie_scen;no_ghgprices_land_until;.cm_nash_autoconverge_lastrun;path_gdx_carbonprice;path_gdx;path_gdx_ref;path_gdx_bau
+SSP2-Base;0;;;;SSP2|NPI|nocc_hist|rcp4p5;y2150;2;;;;
+ELV_CurPol_T44;0;;;priority;SSP2|NPI|nocc_hist|rcp4p5;y2150;2;;;;
+ELV_NDC2030_T44;1;;;priority;SSP2|NDC|nocc_hist|rcp4p5;y2150;2;;;;
+ELV-SSP2-NDC-D0;1;;;;SSP2|NDC|nocc_hist|rcp4p5;y2150;2;;;;
+ELV-SSP2-NDC-D1;1;;;;SSP2|NDC|nocc_hist|rcp4p5;y2150;2;;;;
+ELV-SSP2-NDC-D3;1;;;;SSP2|NDC|nocc_hist|rcp4p5;y2150;2;;;;
+ELV-SSP2-LTS;1;;;;SSP2|NDC|nocc_hist|rcp2p6;y2150;2;;;;
+ELV-SSP2-NDC-LTS;1;;;;SSP2|NDC|nocc_hist|rcp2p6;y2150;2;;;;
+ELV-SSP2-1150;1;;;;SSP2|NDC|nocc_hist|rcp2p6;y2150;2;;;;
+ELV-SSP2-400Feoc;1;;;;SSP2|NDC|nocc_hist|rcp1p9;y2150;2;;;;
+ELV-SSP2-CP-D0;1;;;priority;SSP2|NPI|nocc_hist|rcp4p5;y2150;2;;;;
+ELV-SSP2-CP-D1;1;;;priority;SSP2|NPI|nocc_hist|rcp4p5;y2150;2;;;;
+ELV-SSP2-CP-D3;1;;;priority;SSP2|NPI|nocc_hist|rcp4p5;y2150;2;;;;
+ELV-SSP2-CP-D1_Mix1;1;;;priority;SSP2|NPI|nocc_hist|rcp4p5;y2150;2;;;;
+ELV-SSP2-CP-D1_Mix2;1;;;priority;SSP2|NPI|nocc_hist|rcp4p5;y2150;2;;;;
+ELV_CurPol_T44_Mix1;1;;;priority;SSP2|NPI|nocc_hist|rcp4p5;y2150;2;;;;
+ELV_CurPol_T44_Mix2;1;;;priority;SSP2|NPI|nocc_hist|rcp4p5;y2150;2;;;;

config/tests/scenario_config_shortCascade.csv

@@ -1,4 +1,4 @@
-title;start;c_empty_model;path_gdx_ref;output
-TESTTHAT-SSP2-Base;1;on;;reportingREMIND2MAgPIE
-TESTTHAT-SSP2-NDC;1;on;TESTTHAT-SSP2-Base;reportingREMIND2MAgPIE
-TESTTHAT-SSP2-Policy;2;on;TESTTHAT-SSP2-Base;reportingREMIND2MAgPIE
+title;start;c_empty_model;path_gdx_ref;output;cm_startyear;regipol
+TESTTHAT-SSP2-Base;1;on;;reportingREMIND2MAgPIE;2005;regiCarbonPrice
+TESTTHAT-SSP2-NDC;1;on;TESTTHAT-SSP2-Base;reportingREMIND2MAgPIE;2020;regiCarbonPrice
+TESTTHAT-SSP2-Policy;2;on;TESTTHAT-SSP2-Base;reportingREMIND2MAgPIE;2025;regiCarbonPrice

core/datainput.gms

@@ -1355,14 +1355,14 @@ $if %carbonprice% == "NPi"      pm_macSwitch(emiMacMagpie) = 0;
 
 *** Load historical carbon prices defined in $/t CO2, need to be rescaled to right unit
 pm_taxCO2eq(ttot,regi)$(ttot.val le 2020) = 0;
-parameter f_taxCO2eqHist(ttot,all_regi)       "historic CO2 prices ($/tCO2)"
+parameter fm_taxCO2eqHist(ttot,all_regi)       "historic CO2 prices [$/tCO2]"
 /
 $ondelim
 $include "./core/input/pm_taxCO2eqHist.cs4r"
 $offdelim
 /
 ;
-pm_taxCO2eq(ttot,regi)$(ttot.val le 2020) = f_taxCO2eqHist(ttot,regi) * sm_DptCO2_2_TDpGtC;
+pm_taxCO2eq(ttot,regi)$(ttot.val le 2020) = fm_taxCO2eqHist(ttot,regi) * sm_DptCO2_2_TDpGtC;
 
 *DK* LU emissions are abated in MAgPIE in coupling mode
 *** An alternative to the approach below could be to introduce a new value for c_macswitch that only deactivates the LU MACs

main.gms

@@ -132,7 +132,7 @@
 *'
 *' #### Sets
 *'
-*' * Don't use set element names with three capital letters (like `ETS` or `ESR`), otherwise the maglcass R
+*' * Don't use set element names with three capital letters (like `ETS` or `ESR`), otherwise the magclass R
 *' library might interpret this as a region name when reading in GDX data
 *'
 *'
@@ -1219,8 +1219,8 @@ $setglobal cm_NDC_version  2024_cond    !! def = "2024_cond"  !! regexp = 20(18|
 *'
 *'  (NGFS_v4):        settings used for NGFS v4, 2023
 *'  (NGFS_v4_20pc):   settings used for NGFS v4, 2023, with still 20% of 2020 emissions in netZero year
-*'  (ENGAGE4p5_GlP):  settings used for ENGAGE 4.5 Glasgow+ scenario
-$setglobal cm_netZeroScen  NGFS_v4     !! def = "NGFS_v4"  !! regexp = NGFS_v4|NGFS_v4_20pc|ENGAGE4p5_GlP
+*'  (ELEVATE2p3):     settings used for ELEVATE2p3 LTS and NDC-LTS scenario
+$setglobal cm_netZeroScen  NGFS_v4     !! def = "NGFS_v4"  !! regexp = NGFS_v4|NGFS_v4_20pc|ELEVATE2p3
 *' *  c_regi_earlyreti_rate  "maximum percentage of capital stock that can be retired early (before reaching their expected lifetimes) in one year in specified regions, if they are not economically viable. It is applied to all techs unless otherwise specified in c_tech_earlyreti_rate."
 *' *  GLO 0.09, EUR_regi 0.15: default value. (0.09 means full retirement after 11 years, 10% standing after 10 years)
 $setglobal c_regi_earlyreti_rate  GLO 0.09, EUR_regi 0.15      !! def = GLO 0.09, EUR_regi 0.15

modules/15_climate/magicc7_ar6/datainput.gms

@@ -4,7 +4,7 @@
 *** |  AGPL-3.0, you are granted additional permissions described in the
 *** |  REMIND License Exception, version 1.0 (see LICENSE file).
 *** |  Contact: [email protected]
-*** SOF ./modules/15_climate/magicc/datainput.gms
+*** SOF ./modules/15_climate/magicc7_ar6/datainput.gms
 *** cluster rcp_scen into overshoot and not-to-exceed targets
 $if %cm_rcp_scen% == "none"    s15_rcpCluster = 1;
 $if %cm_rcp_scen% == "rcp20"   s15_rcpCluster = 1;
@@ -81,4 +81,4 @@ display pm_emicapglob;
 pm_gmt_conv=1;
 p15_gmt0(tall)=1;
 
-*** EOF ./modules/15_climate/magicc/datainput.gms
+*** EOF ./modules/15_climate/magicc7_ar6/datainput.gms

modules/15_climate/magicc7_ar6/postsolve.gms

@@ -4,7 +4,7 @@
 *** |  AGPL-3.0, you are granted additional permissions described in the
 *** |  REMIND License Exception, version 1.0 (see LICENSE file).
 *** |  Contact: [email protected]
-*** SOF ./modules/15_climate/magicc/postsolve.gms
+*** SOF ./modules/15_climate/magicc7_ar6/postsolve.gms
 
 ***---------------------------------------------------------------------------
 *' The MAGICC scenario generation is set in `./core/magicc.gms`, but runs here.
@@ -106,4 +106,4 @@ if (cm_iterative_target_adj eq 2, !! otherwise adjustment happens in core/postso
     );
 );
 *' @stop
-*** EOF ./modules/15_climate/magicc/postsolve.gms
+*** EOF ./modules/15_climate/magicc7_ar6/postsolve.gms

modules/15_climate/magicc7_ar6/realization.gms

@@ -4,7 +4,7 @@
 *** |  AGPL-3.0, you are granted additional permissions described in the
 *** |  REMIND License Exception, version 1.0 (see LICENSE file).
 *** |  Contact: [email protected]
-*** SOF ./modules/15_climate/magicc/realization.gms
+*** SOF ./modules/15_climate/magicc7_ar6/realization.gms
 
 *' @description 
 *' In this realization, concentration, forcing, and temperature values are calculated using a version of the 
@@ -35,4 +35,4 @@ $Ifi "%phase%" == "declarations" $include "./modules/15_climate/magicc7_ar6/decl
 $Ifi "%phase%" == "datainput" $include "./modules/15_climate/magicc7_ar6/datainput.gms"
 $Ifi "%phase%" == "postsolve" $include "./modules/15_climate/magicc7_ar6/postsolve.gms"
 *######################## R SECTION END (PHASES) ###############################
-*** EOF ./modules/15_climate/magicc/realization.gms
+*** EOF ./modules/15_climate/magicc7_ar6/realization.gms

modules/15_climate/magicc7_ar6/sets.gms

@@ -4,7 +4,7 @@
 *** |  AGPL-3.0, you are granted additional permissions described in the
 *** |  REMIND License Exception, version 1.0 (see LICENSE file).
 *** |  Contact: [email protected]
-*** SOF ./modules/15_climate/magicc/sets.gms
+*** SOF ./modules/15_climate/magicc7_ar6/sets.gms
 $ontext
 TODO: Rename
     t_magiccttot    MAGICC_ttot
@@ -19,4 +19,4 @@ TODO: Rename
 $offtext
 
 
-*** EOF ./modules/15_climate/magicc/sets.gms
+*** EOF ./modules/15_climate/magicc7_ar6/sets.gms

modules/29_CES_parameters/load/input/files

@@ -1,9 +1,6 @@
 indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP2-GDP_gdp_SSP2-En_gdp_SSP2-Kap_debt_limit-Reg_62eff8f7.inc
 indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP2-GDP_gdp_SSP2-En_gdp_SSP2-Kap_debt_limit-Reg_2b1450bc.inc
 indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP1-GDP_gdp_SSP1-En_gdp_SSP1-Kap_debt_limit-Reg_62eff8f7.inc
-indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SDP_MC-GDP_gdp_SDP_MC-En_gdp_SDP_MC-Kap_debt_limit-Reg_62eff8f7.inc
-indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SDP_RC-GDP_gdp_SDP_RC-En_gdp_SDP_RC-Kap_debt_limit-Reg_62eff8f7.inc
-indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SDP_EI-GDP_gdp_SDP_EI-En_gdp_SDP_EI-Kap_debt_limit-Reg_62eff8f7.inc
 indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP5-GDP_gdp_SSP5-En_gdp_SSP5-Kap_debt_limit-Reg_62eff8f7.inc
 indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP2-GDP_gdp_SSP2-En_gdp_SSP2_lowEn-Kap_debt_limit-Reg_62eff8f7.inc
 

modules/37_industry/fixed_shares/declarations.gms

@@ -14,7 +14,7 @@ scalars
 ;
 
 Parameters
-  pm_abatparam_Ind(ttot,all_regi,all_enty,steps)         "industry CCS MAC curves [ratio @ US$2005]"
+  pm_abatparam_Ind(ttot,all_regi,all_enty,steps)         "industry CCS MAC curves [ratio @ US$2017]"
 
 
   pm_ue_eff_target(all_in)   "energy efficiency target trajectories [% p.a.]"