Merge pull request magpiemodel#560 from pfuehrlich-pik/master

magpie release 4.6.7

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "MAgPIE - An Open Source land-use modeling framework",
-  "version": "4.6.6",
+  "version": "4.6.7",
   "creators": [
     {
       "name": "Dietrich, Jan Philipp",

CHANGELOG.md

@@ -2,8 +2,23 @@
 # Changelog
 
 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/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+
+
+## [4.6.7] - 2023-05-10
+
+### changed
+- **09_drivers** Harmonization of sets for population, gdp, pal and demography
+- **56_ghg_policy** added emission policies without GHG emissions from peatlands
+- **config** added scenario `SSP2EU` in scenario_config.csv
+- **config** modified `eat_lancet_diet` in scenario_config.csv
+- **config** update of additional data to rev4.43
+- **config** update of regional and cellular inputs to 4.85 in default.cfg and scenario_config.csv
+- **scripts** added output script for forest area change at cluster level
+- **scripts** NDC/NPI calculations can now handle 59k and 67k cell inputs
+
+### added
+- **15_food** added an option in `s15_exo_diet` to allow for exogenous diet scenario for India
 
 
 ## [4.6.6] - 2023-05-10
@@ -686,7 +701,8 @@ This release version is focussed on consistency between the MAgPIE setup and the
 First open source release of the framework. See [MAgPIE 4.0 paper](https://doi.org/10.5194/gmd-12-1299-2019) for more information.
 
 
-[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.6.6...develop
+[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.6.7...develop
+[4.6.7]: https://github.com/magpiemodel/magpie/compare/v4.6.6...v4.6.7
 [4.6.6]: https://github.com/magpiemodel/magpie/compare/v4.6.5...v4.6.6
 [4.6.5]: https://github.com/magpiemodel/magpie/compare/v4.6.4...v4.6.5
 [4.6.4]: https://github.com/magpiemodel/magpie/compare/v4.6.3...v4.6.4

CITATION.cff

@@ -125,7 +125,7 @@ authors:
     email: [email protected]
 
 title: MAgPIE - An Open Source land-use modeling framework
-version: 4.6.6
+version: 4.6.7
 date-released: 2023-05-10
 repository-code: https://github.com/magpiemodel/magpie
 keywords:

README.md

@@ -24,8 +24,8 @@ https://www.pik-potsdam.de/research/projects/activities/land-use-modelling/magpi
 A framework description paper has been published in
 Geoscientific Model Development (GMD): https://doi.org/10.5194/gmd-12-1299-2019
 
-The model documentation for version 4.6.6 can be found at
-https://rse.pik-potsdam.de/doc/magpie/4.6.6/
+The model documentation for version 4.6.7 can be found at
+https://rse.pik-potsdam.de/doc/magpie/4.6.7/
 
 A most recent version of the documentation can also be extracted from the
 model source code via the R package goxygen
@@ -188,7 +188,7 @@ [email protected]
 Please contact [email protected]
 
 ## CITATION
-See file CITATION.cff or the [How-to-Cite section](https://rse.pik-potsdam.de/doc/magpie/4.6.6/#how-to-cite) in the model documentation for information how to cite the model.
+See file CITATION.cff or the [How-to-Cite section](https://rse.pik-potsdam.de/doc/magpie/4.6.7/#how-to-cite) in the model documentation for information how to cite the model.
 
 ## AUTHORS
 See list of authors in CITATION.cff

config/default.cfg

@@ -22,10 +22,10 @@ cfg$model <- "main.gms"   #def = "main.gms"
 #### input settings ####
 
 # which input data sets should be used?
-cfg$input <- c(regional    = "rev4.84_h12_magpie.tgz",
-               cellular    = "rev4.84_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
-               validation  = "rev4.84_h12_validation.tgz",
-               additional  = "additional_data_rev4.39.tgz",
+cfg$input <- c(regional    = "rev4.85_h12_magpie.tgz",
+               cellular    = "rev4.85_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz",
+               validation  = "rev4.85_h12_validation.tgz",
+               additional  = "additional_data_rev4.43.tgz",
                calibration = "calibration_H12_per_ton_fao_may22_glo_23Mar23.tgz")
 
 # NOTE: It is recommended to recalibrate the model when changing cellular input data
@@ -173,16 +173,16 @@ oecd90andEU <- "ALB,AUS,AUT,BEL,BIH,BGR,CAN,CYP,CZE,DNK,EST,FIN,FRA,
 cfg$gms$drivers <- "aug17"          # def = aug17
 cfg$gms$c09_pop_scenario  <- "SSP2"    # def = SSP2
 cfg$gms$c09_gdp_scenario  <- "SSP2"    # def = SSP2
-# *   options:   SSP: "SSP1", "SSP2", "SSP3", "SSP4", "SSP5", "SSP2EU"
+# *   options:   SSP: "SSP1", "SSP2", "SSP2EU", "SSP3", "SSP4", "SSP5" 
 # *              SDP: "SDP", "SDP_EI",  "SDP_MC", "SDP_RC"
-# *              SRES: "A1", "A2", "B1", "B2"
 # * Note: SSP2EU a European Commission population/income scenario for
 # *       Ariadne project. SDP is same as SSP1 income, while SDP_EI, SDP_RC, SDP_MC
 # *       see different GDP trajectories as described in SHAPE project.
 
 # * Physical activity level scenario:
 cfg$gms$c09_pal_scenario  <- "SSP2"    # def = SSP2
-# *   options:   SSP: "SSP1", "SSP2", "SSP3", "SSP4", "SSP5"
+# *   options:   SSP: "SSP1", "SSP2", "SSP2EU", "SSP3", "SSP4", "SSP5" 
+# *              SDP: "SDP", "SDP_EI",  "SDP_MC", "SDP_RC"
 
 # Year until which all parameters are fixed to SSP2 values
 cfg$gms$sm_fix_SSP2 <- 2020
@@ -396,13 +396,15 @@ cfg$gms$s15_exo_waste <- 0               # def = 0
 # * (1.1):  corresponds to 10% food waste ~ quarter waste of HIC
 # * (1.2):  corresponds to 20% food waste ~ half waste of HIC
 cfg$gms$s15_waste_scen <- 1.2          # def = 1.2
-#
-#
-# * switch for transition to EAT Lancet diet scenarios
+
+# * switch for transition to exogenous diet scenarios (EAT Lancet and National Institute of Nutrition (NIN))
+# * (2):      transition towards exogenous diets (NIN for India and EAT for other regions)
+# *           Please use this switch in combination with cfg$gms$c15_EAT_scen <- "FLX_hmilk"
+# *           If only India's diet needs to be changed, then set cfg$gms$scen_countries15 <- "IND"
 # * (1):      transition towards exogenous diets and food demand
 # * (0):      regression-based estimation of diets and food demand
 cfg$gms$s15_exo_diet <- 0               # def = 0
-#
+
 # * exogenous calorie scenario (EAT Lancet diet scenarios)
 # * only activated if s15_exo_diet is set to 1
 # *   options:   healthy_BMI, 2100kcal, 2500kcal,
@@ -1443,9 +1445,13 @@ cfg$gms$s56_limit_ch4_n2o_price <- 4000   # def = 4000
 # * options:
 # * none (not including any GHG sources),
 # * redd_nosoil (Above ground CO2 emis from LUC in forest; all CH4 and N2O emissions),
+# * redd_nosoil_nopeat (same as redd_nosoil but without GHG emissions from peatlands),
 # * reddnatveg_nosoil (Above ground CO2 emis from LUC in forest and natveg; all CH4 and N2O emissions),
+# * reddnatveg_nosoil_nopeat (same as reddnatveg_nosoil but without GHG emissions from peatlands),
 # * redd+_nosoil (Above ground CO2 emis from LUC in forest and forestry; all CH4 and N2O emissions),
+# * redd+_nosoil_nopeat (same as redd+_nosoil but without GHG emissions from peatlands),
 # * redd+natveg_nosoil (Above ground CO2 emis from LUC in forest, forestry and natveg; all CH4 and N2O emissions),
+# * redd+natveg_nosoil_nopeat (same as redd+natveg_nosoil but without GHG emissions from peatlands),
 # * all (CO2 emis from LUC in all LUs; all CH4 and N2O emissions), all_nosoil (Above ground CO2 emis from LUC for all LUs; all CH4 and N2O emissions)
 # * all_nosoil: Above ground CO2 emis from LUC for all LUs; all CH4 and N2O emissions
 # * sdp_cropeff (only ch4 from rice), sdp_livestock (only ch4 and n2o from livestock), sdp_peatland (co2, ch4 and n2o from peatland),