magpie release 4.6.4

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "MAgPIE - An Open Source land-use modeling framework",
-  "version": "4.6.3dev",
+  "version": "4.6.4",
   "creators": [
     {
       "name": "Dietrich, Jan Philipp",
@@ -109,5 +109,5 @@
   "license": {
     "id": "AGPL-3.0-or-later"
   },
-  "publication_date": "2023-01-19"
+  "publication_date": "2023-02-22"
 }

CHANGELOG.md

@@ -6,49 +6,44 @@ 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]
+## [4.6.4] - 2023-02-22
 
 ### changed
-- **scripts** updated FSEC scenario start and output scripts
-- **sticky_labor** changed labor cost share constraint from regional to cellular level
-- **sticky_labor** renamed equation `q38_labor_capital_ratio` to `q38_labor_share_target`
 - **15_food** Interpret EAT-Lancet guidelines not as target but as lower/upper limits
+- **config** changed order of output scripts. Some functions in rds_report require gridded outputs.
+- **config** input data revision to rev4.81 for trade margin bugfix
 - **config** scenario_fsec.csv updated input data tgz
 - **config** scenario_fsec.csv updated to new biodiversity scenario
 - **scripts** fsec.R and project_FSEC_Scenarios.R include capitalSubst and landscapeElements scenarios
 - **scripts** highres.R changed default resolution to c1000
 - **scripts** recalibrate.R and recalibrate_realization were modified to always use best_calib for the yield calibration.
+- **scripts** updated FSEC scenario start and output scripts
 - **scripts** when manually running output scripts for multiple runs the lockfile is only created once
-- **config** input data revision to rev4.81 for trade margin bugfix
-- **config** changed order of output scripts. Some functions in rds_report require gridded outputs.
+- **sticky_labor** changed labor cost share constraint from regional to cellular level
+- **sticky_labor** renamed equation `q38_labor_capital_ratio` to `q38_labor_share_target`
 
 ### added
-- **21_trade** New Bilateral trade realization selfsuff_reduced_bilat22 for bilateral trade within selffsuff constraints
-- **sticky_labor** `nl_fix`, `nl_relax` and `nl_release` added
 - **15_food** half_overweight scenario added
+- **21_trade** New Bilateral trade realization selfsuff_reduced_bilat22 for bilateral trade within selffsuff constraints
+- **32_forestry** added switch `s32_aff_prot` for protection of afforested areas (0=until end of planning horizon 1=forever)
+- **56_ghg_policy** added two scenarios for GHG emission pricing and options for afforestation
+- **config** added options for afforestation assumptions and updated additional data to 4.38
 - **config** added setting cfg$keep_restarts which controls whether restart files should be kept after a run finished
 - **config** changed default for `s_use_gdx` from 2 to 0
 - **scripts** added restart points after each time step from which the model can now be restarted if the simulation aborts at some point
 - **scripts** added SLURM dayMax submission type for standby QOS
-- **config** added options for afforestation assumptions and updated additional data to 4.38
-- **32_forestry** added switch `s32_aff_prot` for protection of afforested areas (0=until end of planning horizon 1=forever)
-- **56_ghg_policy** added two scenarios for GHG emission pricing and options for afforestation
+- **sticky_labor** `nl_fix`, `nl_relax` and `nl_release` added
 
 ### removed
 - **42_water_demand** removed fm_multicropping factor because of fallow inconsistency
 
 ### fixed
-- **scripts** fixed a bug where renvs for high resolution runs were missing some packages
-- **44_biodiversity** added regional layer `i` in `bii_target` realisation to make it compatible with the high-resolution parallel optimization output script
-- **scripts** fixed in the calc_calib.R script the saving of calib_factors used in each iteration to ensure that they correspond to the divergence reported. Changed divergence from zero to NA for those iterations where calib_factors are above the limit. The best_calib selection criterion was changed from selecting the factors of the iteration with the lowest standard deviation to the selection, for each region, of the factor of the iteration with the lowest divergence. Also, factors from the first iteration are now not considered, and if two different factors had the same divergence for a region, the one of the latest iteration is picked.
+- **14_yields** nl_fix updated to current equation
 - **32_forestry** pm_land_conservation(t,j,"secdforest","restore") now accounts for the rotation length in timber plantations to avoid infeasibilities
-
-### removed
--
-
-### fixed
+- **44_biodiversity** added regional layer `i` in `bii_target` realisation to make it compatible with the high-resolution parallel optimization output script
 - **59_som** division by zero prevented by if condition
-- **14_yields** nl_fix updated to current equation
+- **scripts** fixed a bug where renvs for high resolution runs were missing some packages
+- **scripts** fixed in the calc_calib.R script the saving of calib_factors used in each iteration to ensure that they correspond to the divergence reported. Changed divergence from zero to NA for those iterations where calib_factors are above the limit. The best_calib selection criterion was changed from selecting the factors of the iteration with the lowest standard deviation to the selection, for each region, of the factor of the iteration with the lowest divergence. Also, factors from the first iteration are now not considered, and if two different factors had the same divergence for a region, the one of the latest iteration is picked.
 
 
 ## [4.6.3] - 2023-01-19
@@ -657,7 +652,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.3...develop
+[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.6.4...develop
+[4.6.4]: https://github.com/magpiemodel/magpie/compare/v4.6.3...v4.6.4
 [4.6.3]: https://github.com/magpiemodel/magpie/compare/v4.6.2...v4.6.3
 [4.6.2]: https://github.com/magpiemodel/magpie/compare/v4.6.1...v4.6.2
 [4.6.1]: https://github.com/magpiemodel/magpie/compare/v4.6.0...v4.6.1

CITATION.cff

@@ -125,8 +125,8 @@ authors:
     email: [email protected]
 
 title: MAgPIE - An Open Source land-use modeling framework
-version: 4.6.3dev
-date-released: 2023-01-19
+version: 4.6.4
+date-released: 2023-02-22
 repository-code: https://github.com/magpiemodel/magpie
 keywords:
   - landuse

DESCRIPTION

@@ -38,5 +38,6 @@ Imports:
     withr
 Suggests:
     goxygen,
+    languageserver,
     qgraph
 Encoding: UTF-8

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.3 can be found at
-https://rse.pik-potsdam.de/doc/magpie/4.6.3/
+The model documentation for version 4.6.4 can be found at
+https://rse.pik-potsdam.de/doc/magpie/4.6.4/
 
 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.3/#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.4/#how-to-cite) in the model documentation for information how to cite the model.
 
 ## AUTHORS
 See list of authors in CITATION.cff