Merge branch 'remindmodel:develop' into develop

fpiontek · Jul 1, 2024 · eaaa0fb · eaaa0fb
2 parents 3c19863 + 3a216da
commit eaaa0fb
Show file tree

Hide file tree

Showing 28 changed files with 151 additions and 125 deletions.
diff --git a/.Rprofile b/.Rprofile
@@ -13,6 +13,9 @@ if (file.exists("renv.lock") && file.exists("README.md") && !file.exists("renv/o
 # do not check if library and renv.lock are in sync, because normally renv.lock does not exist
 options(renv.config.synchronized.check = FALSE)
 
+# always set the renv project to the current directory (formerly done by renv/activate.R under version 0.16.0) 
+Sys.setenv("RENV_PROJECT" = getwd())
+
 source("renv/activate.R")
 
 # when increasing renvVersion first commit new version's activate script and

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### added
 
 ### fixed
+- 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
 
 ### removed
 

diff --git a/CITATION.cff b/CITATION.cff
@@ -260,8 +260,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.1.dev2"
-date-released: 2024-06-19
+version: "3.3.1.dev52"
+date-released: 2024-06-27
 repository-code: https://github.com/remindmodel/remind
 keywords:
   - energy

diff --git a/Makefile b/Makefile
@@ -109,4 +109,4 @@ test-validation: ## Run validation tests, requires a full set of runs in the out
 
 set-local-calibration:		## set up local calibration results directory
 	@./scripts/utils/set-local-calibration.sh
-	$(info use `collect_calibration` script in calibration_results/ directory )
+	$(info Local calibration has been set. Now use `collect_calibration` script in calibration_results/ directory )
diff --git a/config/default.cfg b/config/default.cfg
@@ -27,10 +27,10 @@ cfg$regionmapping <- "config/regionmappingH12.csv"
 ### Additional (optional) region mapping, so that those validation data can be loaded that contain the corresponding additional regions.
 cfg$extramappings_historic <- ""
 #### Current input data revision (<mainrevision>.<subrevision>) ####
-cfg$inputRevision <- "6.77"
+cfg$inputRevision <- "6.79"
 
 #### Current CES parameter and GDX revision (commit hash) ####
-cfg$CESandGDXversion <- "31bbe498c5e0fc19da876e8b543d5aa1fc112015"
+cfg$CESandGDXversion <- "997bd3ebd9de58471f80adeb5d79fda0915878d2"
 
 #### Force the model to download new input data ####
 cfg$force_download <- FALSE
@@ -71,7 +71,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.1.dev2"
+cfg$model_version <- "3.3.1.dev52"
 
 #### settings ####
 cfg$gms <- list()

diff --git a/config/gdx-files/files b/config/gdx-files/files
@@ -1,8 +1,9 @@
 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-Kap_debt_limit-Reg_2b1450bc.gdx
+indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP2-GDP_gdp_SSP2-En_gdp_SSP2_lowEn-Kap_debt_limit-Reg_62eff8f7.gdx
 
diff --git a/config/scenario_config.csv b/config/scenario_config.csv
@@ -29,17 +29,14 @@ SSP5-PkBudg650;1,AMT;;;;;;rcp20;9;globallyOptimal;650;diffCurvPhaseIn2Lin;150;20
 SSP5-PkBudg1050;1,AMT,compileInTests;;;;;;rcp26;9;globallyOptimal;1050;diffCurvPhaseIn2Lin;80;2100;;9;;;1;;1.75;;3;2;;;;;2050.GLO 0.5;NDC;regiCarbonPrice;2030.EUR_regi.tax.t.FE_wo_b_wo_n_e.all 1.2809;;on;on;EUR_regi, NEU_regi;pop_SSP5;gdp_SSP5;gdp_SSP5;highOil;highGas;highCoal;3;6;4;;SSP5;0.5;1;forcing_SSP5;SSP5;Mix3;2025;;SSP2-NPi;;;SSP5-PkBudg1050: This climate policy scenario follows the Shared Socioeconomic Pathways 5 called Fossil-Fueled Development. The stylized climate policy scenario assumes a peak budget of 1050 Gt CO2 on total CO2 emissions from 2015 to 2100. This is a well below 2C scenario at median climate sensitivity but returns to values below 2C in at least 67 % of scenarios during the whole century.
 # H12 SDP_MC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 SDP_MC-NPi-calibrate;calibrate;calibrate;;14;;;rcp45;;;0;NPi;;;;9;GLO 0.12, EUR_regi 0.15;;2;1.025;1.75;152;2;;;;;;;NPi2018;regiCarbonPrice;;;on;on;EUR_regi, NEU_regi;pop_SDP_MC;gdp_SDP_MC;gdp_SDP_MC;lowOil;lowGas;lowCoal;2;;4;3;SDP;0.5;1;forcing_SSP1;MFR;Mix4;2005;;;;;"SDP_MC-calibration: This baseline calibration scenario follows the Sustainable Development Pathway scenario following the narrative of ""Managing the global commons"": strong global institutions - efficient technological solutions."
-SDP_MC-NDC;1,AMT;;;;;;rcp45;3;globallyOptimal;0;NDC;;;;9;GLO 0.12, EUR_regi 0.15;;2;1.025;1.75;152;2;;;;;;;NDCplus;regiCarbonPrice;2030.EUR_regi.tax.t.FE_wo_b_wo_n_e.all 1.2809;2020.2030.EUR_regi.all.year.netGHG_LULUCFGrassi 2.450;on;on;EUR_regi, NEU_regi;pop_SDP_MC;gdp_SDP_MC;gdp_SDP_MC;lowOil;lowGas;lowCoal;2;;4;3;SDP;0.5;1;forcing_SSP1;MFR;Mix4;2025;;SSP2-NPi;SDP_MC-NPi;SDP_MC-NPi;"SDP_MC-NDC: This Nationally Determined Contribution (NDC) scenario follows the Sustainable Development Pathway scenario following the narrative of ""Managing the global commons"": strong global institutions - efficient technological solutions. The NDC includes all pledged policies even if not yet implemented. It assumes that the moderate and heterogeneous climate ambition reflected in the NDCs at the begining of 2021 continues over the 21st century."
 SDP_MC-NPi;1,AMT;;;;;;rcp45;3;;0;NPi;;;;9;GLO 0.12, EUR_regi 0.15;;2;1.025;1.75;152;2;;;;;;;NPi2018;regiCarbonPrice;;;on;on;EUR_regi, NEU_regi;pop_SDP_MC;gdp_SDP_MC;gdp_SDP_MC;lowOil;lowGas;lowCoal;2;;4;3;SDP;0.5;1;forcing_SSP1;MFR;Mix4;2005;;;;;"SDP_MC-NPi: This National Policies Implemented (NPi) scenario follows the Sustainable Development Pathway scenario following the narrative of ""Managing the global commons"": strong global institutions - efficient technological solutions. The NPi assumes that policies fail to achieve NDC targets in 2030. Instead, carbon prices are assumed to grow and converge more slowly, leading to emissions trajectories in line with bottom-up studies on the effect of currently implemented policies."
 SDP_MC-PkBudg650;1,AMT,compileInTests;;;;;;rcp20;9;globallyOptimal;650;diffCurvPhaseIn2Lin;150;2045;;9;GLO 0.12, EUR_regi 0.15;;2;1.025;1.75;152;2;;;feelhpb 1.05, fehob 1.75, feheb 0.1;manual;feh2_otherInd 1.04, feelhth_otherInd 0.4, feh2_cement 2.0, feelhth_chemicals 1.3, feh2_chemicals 1.04;2050.GLO 0.9;NDCplus;regiCarbonPrice;2030.EUR_regi.tax.t.FE_wo_b_wo_n_e.all 1.2809;;on;on;EUR_regi, NEU_regi;pop_SDP_MC;gdp_SDP_MC;gdp_SDP_MC;lowOil;lowGas;lowCoal;2;;4;;SDP;0.5;1;forcing_SSP1;MFR;Mix4;2025;;SSP2-NPi;;;"SDP_MC-PkBudg650: This climate policy scenario follows the Sustainable Development Pathway scenario following the narrative of ""Managing the global commons"": strong global institutions - efficient technological solutions. The stylized climate policy scenario assumes a peak budget of 650 Gt CO2 on total CO2 emissions from 2015 to 2100. This is a 1.5C scenario, peak warming is allowed to be at or slightly above 1.5C at median climate sensitivity but returns to values below 1.5C in at least 67 % of scenarios by the end of the century."
 # H12 SDP_EI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 SDP_EI-NPi-calibrate;calibrate;calibrate;;14;;;rcp45;;;0;NPi;;;;9;GLO 0.14, EUR_regi 0.15;;2;1.025;1.75;300;;2;;;;;;NPi2018;regiCarbonPrice;;;on;on;EUR_regi, NEU_regi;pop_SDP_EI;gdp_SDP_EI;gdp_SDP_EI;lowOil;lowGas;lowCoal;2;;4;3;SDP;0.5;1;forcing_SSP1;SSP1;Mix4;2005;;;;;"SDP_EI-calibration: This baseline calibration scenario follows the Sustainable Development Pathway scenario following the narrative of ""Economy-driven innovation"": tech & market driven - globalized word - high-growth."
-SDP_EI-NDC;0;;;;;;rcp45;3;globallyOptimal;0;NDC;;;;9;GLO 0.14, EUR_regi 0.15;;2;1.025;1.75;300;;2;;;;;;NDCplus;regiCarbonPrice;2030.EUR_regi.tax.t.FE_wo_b_wo_n_e.all 1.2809;2020.2030.EUR_regi.all.year.netGHG_LULUCFGrassi 2.450;on;on;EUR_regi, NEU_regi;pop_SDP_EI;gdp_SDP_EI;gdp_SDP_EI;lowOil;lowGas;lowCoal;2;;4;3;SDP;0.5;1;forcing_SSP1;SSP1;Mix4;2025;;SSP2-NPi;SDP_EI-NPi;SDP_EI-NPi;"SDP_EI-NDC: This Nationally Determined Contribution (NDC) scenario follows the Sustainable Development Pathway scenario following the narrative of ""Economy-driven innovation"": tech & market driven - globalized word - high-growth. The NDC includes all pledged policies even if not yet implemented. It assumes that the moderate and heterogeneous climate ambition reflected in the NDCs at the begining of 2021 continues over the 21st century."
 SDP_EI-NPi;0;;;;;;rcp45;3;;0;NPi;;;;9;GLO 0.14, EUR_regi 0.15;;2;1.025;1.75;300;;2;;;;;;NPi2018;regiCarbonPrice;;;on;on;EUR_regi, NEU_regi;pop_SDP_EI;gdp_SDP_EI;gdp_SDP_EI;lowOil;lowGas;lowCoal;2;;4;3;SDP;0.5;1;forcing_SSP1;SSP1;Mix4;2005;;;;;"SDP_EI-NPi: This National Policies Implemented (NPi) scenario following the narrative of ""Economy-driven innovation"": tech & market driven - globalized word - high-growth. The NPi assumes that policies fail to achieve NDC targets in 2030. Instead, carbon prices are assumed to grow and converge more slowly, leading to emissions trajectories in line with bottom-up studies on the effect of currently implemented policies."
 SDP_EI-PkBudg650;0;;;;;;rcp20;9;globallyOptimal;650;diffCurvPhaseIn2Lin;150;2045;;9;GLO 0.14, EUR_regi 0.15;;2;1.025;1.75;300;;2;;feelhpb 1.05, fehob 1.75, feheb 0.35;manual;feh2_otherInd 1.05, feelhth_otherInd 0.43, feh2_cement 2.2, feelhth_chemicals 1.4, feh2_chemicals 1.05;2050.GLO 0.9;NDCplus;regiCarbonPrice;2030.EUR_regi.tax.t.FE_wo_b_wo_n_e.all 1.2809;;on;on;EUR_regi, NEU_regi;pop_SDP_EI;gdp_SDP_EI;gdp_SDP_EI;lowOil;lowGas;lowCoal;2;;4;;SDP;0.5;1;forcing_SSP1;SSP1;Mix4;2025;;SSP2-NPi;;;"SDP_EI-PkBudg650: This climate policy scenario following the narrative of ""Economy-driven innovation"": tech & market driven - globalized word - high-growth. The stylized climate policy scenario assumes a peak budget of 650 Gt CO2 on total CO2 emissions from 2015 to 2100. This is a 1.5C scenario, peak warming is allowed to be at or slightly above 1.5C at median climate sensitivity but returns to values below 1.5C in at least 67 % of scenarios by the end of the century."
 # H12 SDP_RC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 SDP_RC-NPi-calibrate;calibrate;calibrate;;14;;;rcp45;;;0;NPi;;;;9;;;4;1.025;2;100;5;;;;;;;NPi2018;regiCarbonPrice;;;on;on;EUR_regi, NEU_regi;pop_SDP_RC;gdp_SDP_RC;gdp_SDP_RC;lowOil;lowGas;lowCoal;2;;4;3;SDP;;1;forcing_SSP1;SSP1;Mix3;2005;;;;;"SDP_RC-calibration: This baseline calibration scenario follows the Sustainable Development Pathway scenario following the narrative of ""Resilient communities"": human well-being - behavioural change - local & less tech-driven."
-SDP_RC-NDC;0;;;;;;rcp45;3;globallyOptimal;0;NDC;;;;9;;;4;1.025;2;100;5;;;;;;;NDCplus;regiCarbonPrice;2030.EUR_regi.tax.t.FE_wo_b_wo_n_e.all 1.2809;2020.2030.EUR_regi.all.year.netGHG_LULUCFGrassi 2.450;on;on;EUR_regi, NEU_regi;pop_SDP_RC;gdp_SDP_RC;gdp_SDP_RC;lowOil;lowGas;lowCoal;2;;4;3;SDP;;1;forcing_SSP1;SSP1;Mix3;2025;;SSP2-NPi;SDP_RC-NPi;SDP_RC-NPi;"SDP_RC-NDC: This Nationally Determined Contribution (NDC) scenario follows the Sustainable Development Pathway scenario following the narrative of ""Resilient communities"": human well-being - behavioural change - local & less tech-driven. The NDC includes all pledged policies even if not yet implemented. It assumes that the moderate and heterogeneous climate ambition reflected in the NDCs at the begining of 2021 continues over the 21st century."
 SDP_RC-NPi;0;;;;;;rcp45;3;;0;NPi;;;;9;;;4;1.025;2;100;5;;;;;;;NPi2018;regiCarbonPrice;;;on;on;EUR_regi, NEU_regi;pop_SDP_RC;gdp_SDP_RC;gdp_SDP_RC;lowOil;lowGas;lowCoal;2;;4;3;SDP;;1;forcing_SSP1;SSP1;Mix3;2005;;;;;"SDP_RC-NPi: This National Policies Implemented (NPi) scenario follows the Sustainable Development Pathway scenario following the narrative of ""Resilient communities"": human well-being - behavioural change - local & less tech-driven. The NPi assumes that policies fail to achieve NDC targets in 2030. Instead, carbon prices are assumed to grow and converge more slowly, leading to emissions trajectories in line with bottom-up studies on the effect of currently implemented policies."
 SDP_RC-PkBudg650;0;;;;;;rcp20;9;globallyOptimal;650;diffCurvPhaseIn2Lin;150;2045;2060;9;;;4;1.025;2;100;5;;;feelhpb 1.05, fehob 1.75, feheb 0.35;manual;feh2_otherInd 1.05, feelhth_otherInd 0.43, feh2_cement 2.2, feelhth_chemicals 1.4, feh2_chemicals 1.05;2050.GLO 0.9;NDCplus;regiCarbonPrice;2030.EUR_regi.tax.t.FE_wo_b_wo_n_e.all 1.2809;;on;on;EUR_regi, NEU_regi;pop_SDP_RC;gdp_SDP_RC;gdp_SDP_RC;lowOil;lowGas;lowCoal;2;;4;;SDP;;1;forcing_SSP1;SSP1;Mix3;2025;;SSP2-NPi;;;"SDP_RC-PkBudg650: This climate policy scenario follows the Sustainable Development Pathway scenario following the narrative of ""Resilient communities"": human well-being - behavioural change - local & less tech-driven. The stylized climate policy scenario assumes a peak budget of 650 Gt CO2 on total CO2 emissions from 2015 to 2100. This is a 1.5C scenario, peak warming is allowed to be at or slightly above 1.5C at median climate sensitivity but returns to values below 1.5C in at least 67 % of scenarios by the end of the century."
 # H12 SSP2 lowEnergy;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;