Merge branch 'develop' into develop

fpiontek · Jun 19, 2024 · 9dfd6a1 · 9dfd6a1
2 parents cffaa7d + 673a436
commit 9dfd6a1
Show file tree

Hide file tree

Showing 28 changed files with 201 additions and 150 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -1,6 +1,6 @@
 {
   "title": "REMIND - REgional Model of INvestments and Development",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "creators": [
     {
       "name": "Luderer, Gunnar",
@@ -249,5 +249,5 @@
   "license": {
     "id": "AGPL-3.0-or-later"
   },
-  "publication_date": "2024-03-27"
+  "publication_date": "2024-06-18"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,15 +7,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 ### changed
-- **scripts** do not check anymore that MAgPIE uses renv
-  [[1646](https://github.com/remindmodel/remind/pull/1646)]
+
+### added
+
+### fixed
+
+### removed
+
+## [3.3.1] - 2024-06-18
+
+### changed
+- new inptu data (6.77) including new GDP and population data([#83](https://github.com/pik-piam/mrdrivers/pull/83)) [[#1684]](https://github.com/remindmodel/remind/pull/1684)
 - **37_industry** remove subsector-specific shares of SE
   origins in FE carriers for performance reasons [[#1659]](https://github.com/remindmodel/remind/pull/1659)
 - **37_industry** make process-based steel production model the default over the ces-based model [[#1663]](https://github.com/remindmodel/remind/pull/1663)
 - **37_industry** fixed incineration of plastic and non-plastic waste causing
   non-zero emissions for biomass and synfuels
   [[#1682]](https://github.com/remindmodel/remind/pull/1682)
-- **core** another change of preference parameters and associated computation of interest rates/mark ups [[#1663]](https://github.com/remindmodel/remind/pull/1663)	
+- **core** another change of preference parameters and associated computation of interest rates/mark ups [[#1663]](https://github.com/remindmodel/remind/pull/1663)
+- **scripts** do not check anymore that MAgPIE uses renv
+  [[1646](https://github.com/remindmodel/remind/pull/1646)]
 - **scripts** adjust function calls after moving functionality from `remind2` [[#578]]](https://github.com/pik-piam/remind2/pull/578) to `piamPlotComparison` and `piamutils` [[#1661](https://github.com/remindmodel/remind/pull/1661)
 - **scripts** enhance output script `reportCEScalib` to include additional plot formats [[#1671](https://github.com/remindmodel/remind/pull/1671)
 

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.0.dev376"
-date-released: 2024-06-14
+version: "3.3.1.dev2"
+date-released: 2024-06-19
 repository-code: https://github.com/remindmodel/remind
 keywords:
   - energy

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: remindmodel
 Title: REMIND - REgional Model of INvestments and Development
 Version: 0.1
-Date: 2024-03-27
+Date: 2024-06-18
 Description: This is not a package yet, the purpose of this file is to
     document metadata, notably dependencies.
 License: file LICENSE

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.75"
+cfg$inputRevision <- "6.77"
 
 #### Current CES parameter and GDX revision (commit hash) ####
-cfg$CESandGDXversion <- "57279476db7f09f9eee8717b0fff8b1fa3436b67"
+cfg$CESandGDXversion <- "31bbe498c5e0fc19da876e8b543d5aa1fc112015"
 
 #### 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.0.dev376"
+cfg$model_version <- "3.3.1.dev2"
 
 #### settings ####
 cfg$gms <- list()

diff --git a/config/gdx-files/files b/config/gdx-files/files
@@ -1,9 +1,8 @@
-indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP2EU-GDP_gdp_SSP2EU-En_gdp_SSP2EU-Kap_debt_limit-Reg_62eff8f7.gdx
-indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP2EU-GDP_gdp_SSP2EU-En_gdp_SSP2_lowEn-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_62eff8f7.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_SSP2EU-GDP_gdp_SSP2EU-En_gdp_SSP2EU-Kap_debt_limit-Reg_2b1450bc.gdx
+indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP2-GDP_gdp_SSP2-En_gdp_SSP2-Kap_debt_limit-Reg_2b1450bc.gdx