Develop

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "MAgPIE - An Open Source land-use modeling framework",
-  "version": "4.3.1",
+  "version": "4.3.2",
   "creators": [
     {
       "name": "Dietrich, Jan Philipp",
@@ -76,5 +76,5 @@
   "license": {
     "id": "AGPL-3.0-or-later"
   },
-  "publication_date": "2020-11-03"
+  "publication_date": "2021-03-17"
 }

CHANGELOG.md

@@ -5,19 +5,36 @@ 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).
 
-
 ## [Unreleased]
 
+### added
+- **15_food*** added 3 sigmoid food substitution scenarios
+- **56_ghg_policy** Automatic sets for scenarios
+- **60_bioenergy** Automatic sets for scenarios
+- **70_livestock*** added 3 sigmoid feed substitution scenarios
+- **scripts** added output script for disaggregation to GAINS regions
+- **scripts** Automatic sets for 56_ghg_policy and 60_bioenergy
+- **scripts** Added pre-commit hook
+
+### fixed
+- **60_bioenergy** Minimal bioenergy demand
+
+
+## [4.3.2] - 2021-03-17
+
 ### changed
-- **runscripts** adapted to new input data and model version
+- **12_interest_rate** Interest fader changed to csv
 - **15_food** better documentation of parameters over model iterations
+- **15_food** added scenario switch for ruminant and dairy replacement by Single-Cell Protein
 - **20_processing** added different options for Single-Cell Protein production
-- **15_food*** added scenario switch for ruminant and dairy replacement by Single-Cell Protein
+- **35_natveg** Fader for HalfEarth protection policy
 - **50_nr_soil_budget** added necessary interfaces to 50_nitrogen module
-- **70_livestock*** added scenario switch for feed replacement (crop and forage) by Single-Cell Protein
+- **70_livestock** added scenario switch for feed replacement (crop and forage) by Single-Cell Protein
+- **scripts** Updated AgMIP output scripts.
+- **runscripts** adapted to new input data and model version
+- **tests** Replaced TravisCI with GithubActions
 
 ### added
-- **15_food*** added 3 sigmoid food substitution scenarios
 - **15_food** Added the option to fade out livestock demand towards a target level in kcal/cap/day.
 - **21_trade** Added scalar `s21_trade_bal_damper` and new set `k_trade_excl_timber`
 - **29_ageclass** New age-class module
@@ -28,26 +45,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **35_natveg** Added HalfEarth scenario to protection scenarios
 - **51_nitrogen** new module realization rescaled_jan21, which rescales n-related emissions with nitrogen surplus to account for lower emissions with higher NUE
 - **52_carbon** Simplified routine for carbon stock calculations in timber plantations and cleanup of unused code.
-- **56_ghg_policy** Added new scenario to emission policy, Automatic sets for scenarios
-- **60_bioenergy** Automatic sets for scenarios
-- **70_livestock*** added 3 sigmoid feed substitution scenarios
+- **56_ghg_policy** Added new scenario to emission policy
 - **73_timber** Additive calibration with FAO data for roundwood demand. New switches: `c73_wood_scen`
 - **73_timber** Added new realization `default` (modified version of previous realization)
 - **default.cfg** New `forestry` scenario which simulates timber production in MAgPIE
 - **scenario.csv** Added three plantation scenarios
 - **scaling** Updated scaling across the modules
 - **scripts** Updated to `forestry` script with general cleanup for publication. Added `forestry_magpie` script for generic forestry runs.
 - **scripts** added output script for disaggregation of land transitions
-- **scripts** added output script for disaggregation to GAINS regions
-- **scripts** Automatic sets for 56_ghg_policy and 60_bioenergy
-- **scripts** Added pre-commit hook
-
-
-### changed
-- **scripts** Updated AgMIP output scripts.
-- **12_interest_rate** Interest fader changed to csv
-- **35_natveg** Fader for HalfEarth protection policy
-- **tests** Replaced TravisCI with GithubActions
 
 ### removed
 - **32_forestry** Removed previous default realization
@@ -56,7 +61,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### fixed
 - **32_forestry** Bugfixes for "ac_est" and carbon treshold afforestation; removed plantations from "vm_cdr_aff".
-- **60_bioenergy** Minimal bioenergy demand
 - **core** bugfix m_fillmissingyears macro; was running over t before; now running over t_all_
 
 ## [4.3.1] - 2020-11-03
@@ -205,7 +209,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.3.1...develop
+[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.3.2...develop
+[4.3.2]: https://github.com/magpiemodel/magpie/compare/v4.3.1...v4.3.2
 [4.3.1]: https://github.com/magpiemodel/magpie/compare/v4.3.0...v4.3.1
 [4.3.0]: https://github.com/magpiemodel/magpie/compare/v4.2.1...v4.3.0
 [4.2.1]: https://github.com/magpiemodel/magpie/compare/v4.2.0...v4.2.1

CITATION.cff

@@ -86,8 +86,8 @@ authors:
     email: popp@pik-potsdam.de
 
 title: MAgPIE - An Open Source land-use modeling framework
-version: 4.3.1dev
-date-released: 2020-11-03
+version: 4.3.2dev
+date-released: 2021-03-17
 repository-code: https://github.com/magpiemodel/magpie
 keywords:
   - landuse

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.3 can be found at
-https://rse.pik-potsdam.de/doc/magpie/4.3/
+The model documentation for version 4.3.2 can be found at
+https://rse.pik-potsdam.de/doc/magpie/4.3.2/
 
 A most recent version of the documentation can also be extracted from the
 model source code via the R package goxygen
@@ -213,7 +213,7 @@ magpie@pik-potsdam.de
 Please contact magpie@pik-potsdam.de
 
 ## CITATION
-See file CITATION.cff or the [How-to-Cite section](https://rse.pik-potsdam.de/doc/magpie/4.3/#howtocite) 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.3.2/#howtocite) in the model documentation for information how to cite the model.
 
 ## AUTHORS
 See list of authors in CITATION.cff

modules/10_land/feb15/sets.gms

@@ -9,3 +9,4 @@ sets
   t_ini10  Time periods with land initialization data
        / y1995, y2000, y2005, y2010, y2015 /
 ;
+

modules/15_food/anthropometrics_jan18/intersolve.gms

@@ -26,11 +26,11 @@ else
 
 * A new iteration is started
 p15_iteration_counter(t) = p15_iteration_counter(t) + 1;
-* The set current iter includes only one element with the set element 
+* The set current iter includes only one element with the set element
 * of the current iteration, e.g. "iter2"
 curr_iter15(iter15) = no;
 curr_iter15(iter15)$(ord(iter15)=p15_iteration_counter(t)) = yes;
-* Now we also define a set for the last iteration
+* Now we also define a set for the previous iteration
 prev_iter15(iter15) = no;
 prev_iter15(iter15)$(ord(iter15)=p15_iteration_counter(t)-1) = yes;
 

modules/35_natveg/dynamic_feb21/declarations.gms

@@ -58,10 +58,10 @@ equations
  q35_hvarea_other(j,ac)							            Harvested area other land (mio. ha)
  q35_hvarea_secdforest(j,ac)					          Harvested area secdforest (mio. ha)
  q35_hvarea_primforest(j)						            Harvested area primforest (mio. ha)
- q35_prod_secdforest(j)                                                   Production of woody biomass from secondary forests (mio. tDM per yr)
- q35_prod_primforest(j)                                                      Production of woody biomass from primary forests (mio. tDM per yr)
- q35_prod_other(j)                                                        Production of woody biomass from other land (mio. tDM per yr)
- q35_cost_hvarea(i) blub
+ q35_prod_secdforest(j)                         Production of woody biomass from secondary forests (mio. tDM per yr)
+ q35_prod_primforest(j)                         Production of woody biomass from primary forests (mio. tDM per yr)
+ q35_prod_other(j)                              Production of woody biomass from other land (mio. tDM per yr)
+ q35_cost_hvarea(i)                             Cost of harvesting natural vegetation (mio. USD)
 ;
 
 positive variables
@@ -77,7 +77,7 @@ positive variables
   v35_hvarea_other(j,ac)                         Harvested area from other land (mio. ha)
   v35_hvarea_primforest(j)                       Harvested area from primary forest (mio. ha)
   vm_prod_natveg(j,land_natveg,kforestry)       Production of woody biomass from natural vegetation (mio. tDM per yr)
- vm_cost_hvarea_natveg(i)						blub
+ vm_cost_hvarea_natveg(i)                       Cost of harvesting natural vegetation (mio. USD)
 ;
 
 
@@ -95,7 +95,7 @@ parameters
  ov35_hvarea_other(t,j,ac,type)                 Harvested area from other land (mio. ha)
  ov35_hvarea_primforest(t,j,type)               Harvested area from primary forest (mio. ha)
  ov_prod_natveg(t,j,land_natveg,kforestry,type) Production of woody biomass from natural vegetation (mio. tDM per yr)
- ov_cost_hvarea_natveg(t,i,type)                blub
+ ov_cost_hvarea_natveg(t,i,type)                Cost of harvesting natural vegetation (mio. USD)
  oq35_land_secdforest(t,j,type)                 Secdforest land pool calculation (mio. ha)
  oq35_land_other(t,j,type)                      Other land pool calculation (mio. ha)
  oq35_carbon_primforest(t,j,ag_pools,type)      Primforest carbon stock calculation (mio tC)
@@ -119,6 +119,6 @@ parameters
  oq35_prod_secdforest(t,j,type)                 Production of woody biomass from secondary forests (mio. tDM per yr)
  oq35_prod_primforest(t,j,type)                 Production of woody biomass from primary forests (mio. tDM per yr)
  oq35_prod_other(t,j,type)                      Production of woody biomass from other land (mio. tDM per yr)
- oq35_cost_hvarea(t,i,type)                     blub
+ oq35_cost_hvarea(t,i,type)                     Cost of harvesting natural vegetation (mio. USD)
 ;
 *##################### R SECTION END (OUTPUT DECLARATIONS) #####################

modules/35_natveg/static/declarations.gms

@@ -12,7 +12,7 @@ positive variables
   v35_hvarea_secdforest(j,ac)                    Harvested area from secondary forest (mio. ha)
   v35_hvarea_other(j,ac)                         Harvested area from other land (mio. ha)
   v35_hvarea_primforest(j)                       Harvested area from primary forest (mio. ha)
-  vm_cost_hvarea_natveg(i)						blub
+  vm_cost_hvarea_natveg(i)						Cost of harvesting natural vegetation (mio. USD)
 ;
 
 
@@ -24,6 +24,6 @@ parameters
  ov35_hvarea_secdforest(t,j,ac,type) Harvested area from secondary forest (mio. ha)
  ov35_hvarea_other(t,j,ac,type)      Harvested area from other land (mio. ha)
  ov35_hvarea_primforest(t,j,type)    Harvested area from primary forest (mio. ha)
- ov_cost_hvarea_natveg(t,i,type)     blub
+ ov_cost_hvarea_natveg(t,i,type)     Cost of harvesting natural vegetation (mio. USD)
 ;
 *##################### R SECTION END (OUTPUT DECLARATIONS) #####################

modules/52_carbon/normal_dec17/realization.gms

@@ -28,7 +28,6 @@ $Ifi "%phase%" == "input" $include "./modules/52_carbon/normal_dec17/input.gms"
 $Ifi "%phase%" == "equations" $include "./modules/52_carbon/normal_dec17/equations.gms"
 $Ifi "%phase%" == "scaling" $include "./modules/52_carbon/normal_dec17/scaling.gms"
 $Ifi "%phase%" == "start" $include "./modules/52_carbon/normal_dec17/start.gms"
-$Ifi "%phase%" == "preloop" $include "./modules/52_carbon/normal_dec17/preloop.gms"
 $Ifi "%phase%" == "presolve" $include "./modules/52_carbon/normal_dec17/presolve.gms"
 $Ifi "%phase%" == "postsolve" $include "./modules/52_carbon/normal_dec17/postsolve.gms"
 *######################## R SECTION END (PHASES) ###############################