-
Notifications
You must be signed in to change notification settings - Fork 173
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #619 from magpiemodel/release-67k
magpie release 4.7.0
- Loading branch information
Showing
60 changed files
with
1,393 additions
and
243 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -106,11 +106,11 @@ authors: | |
given-names: Anne | ||
affiliation: "Potsdam Institute for Climate Impact Research" | ||
|
||
- family-names: Führlich | ||
- family-names: Sauer | ||
given-names: Pascal | ||
orcid: https://orcid.org/0000-0002-6856-8239 | ||
affiliation: "Potsdam Institute for Climate Impact Research" | ||
email: pascal.fuehrlich@pik-potsdam.de | ||
email: pascal.sauer@pik-potsdam.de | ||
|
||
- family-names: Lotze-Campen | ||
given-names: Hermann | ||
|
@@ -125,8 +125,8 @@ authors: | |
email: [email protected] | ||
|
||
title: MAgPIE - An Open Source land-use modeling framework | ||
version: 4.6.11 | ||
date-released: 2023-09-05 | ||
version: 4.7.0 | ||
date-released: 2023-12-11 | ||
repository-code: https://github.com/magpiemodel/magpie | ||
keywords: | ||
- landuse | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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.11 can be found at | ||
https://rse.pik-potsdam.de/doc/magpie/4.6.11/ | ||
The model documentation for version 4.7.0 can be found at | ||
https://rse.pik-potsdam.de/doc/magpie/4.7.0/ | ||
|
||
A most recent version of the documentation can also be extracted from the | ||
model source code via the R package goxygen | ||
|
@@ -37,7 +37,7 @@ Please find a set of tutorials here https://magpiemodel.github.io/tutorials/. | |
This guide will give you a brief technical introduction in how to install, run and use the model | ||
and how to analyse the model output. | ||
|
||
Please pay attentions to the MAgPIE Coding Etiquette when you modify the code. | ||
Please pay attention to the MAgPIE Coding Etiquette when you modify the code. | ||
The Coding Etiquette you find at the beginning of the documentation mentioned above. | ||
The Coding Etiquette explains also the naming conventions and other | ||
structural characteristics. | ||
|
@@ -150,7 +150,7 @@ following requirements: | |
|
||
For other dependencies comparable measures should apply. When a dependency is | ||
added this dependency should be added to the *HOW TO INSTALL* section in the | ||
README file of the model framework (mentioning the depencendy and explaining | ||
README file of the model framework (mentioning the dependency and explaining | ||
how it can be installed). If not all requirements can be fulfilled by the new | ||
dependency this case should be discussed with the model maintainer | ||
([email protected]) to find a good solution for it. | ||
|
@@ -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.11/#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.7.0/#how-to-cite) in the model documentation for information how to cite the model. | ||
|
||
## AUTHORS | ||
See list of authors in CITATION.cff | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,16 @@ | ||
title;start;mag_scen;co2tax_name;co2tax_2025 | ||
2;1;SSP2,NPI;Base;C_SSP2-Base-rem-5 | ||
3;0;SSP2,NDC;NDC;C_SSP2-NDC-rem-5 | ||
4;0;SSP2,NDC;PkBudg1300;C_SSP2-PkBudg1300-rem-5 | ||
5;0;SSP2,NDC;PkBudg1100;C_SSP2-PkBudg1100-rem-5 | ||
5;0;SSP2,NDC;PkBudg900;C_SSP2-PkBudg900-rem-5 | ||
start;mag_scen;ghgtax_name;mifname;no_ghgprices_land_until | ||
0;SDP-MC|NPI|nocc_hist;Base; C_SDP_MC-Base;y2150 | ||
0;SDP-MC|NDC|nocc_hist;NDC; C_SDP_MC-NDC;y2150 | ||
0;SDP-MC|NDC|nocc_hist;PkBudg500; C_SDP_MC-PkBudg500;y2030 | ||
0;SSP1|NPI|nocc_hist;Base; C_SSP1-Base;y2150 | ||
0;SSP1|NDC|nocc_hist;NDC; C_SSP1-NDC;y2150 | ||
0;SSP1|NDC|nocc_hist;PkBudg1150; C_SSP1-PkBudg1150;y2030 | ||
0;SSP1|NDC|nocc_hist;PkBudg500; C_SSP1-PkBudg500;y2030 | ||
0;SSP2|NPI|nocc_hist;Base; C_SSP2EU-Base;y2150 | ||
0;SSP2|NDC|nocc_hist;NDC; C_SSP2EU-NDC;y2150 | ||
1;SSP2|NDC|nocc_hist;PkBudg1150; C_SSP2EU-PkBudg1150;y2030 | ||
0;SSP2|NDC|nocc_hist;PkBudg500; C_SSP2EU-PkBudg500;y2030 | ||
0;SSP5|NPI|nocc_hist;Base; C_SSP5-Base;y2150 | ||
0;SSP5|NDC|nocc_hist;NDC; C_SSP5-NDC;y2150 | ||
0;SSP5|NDC|nocc_hist;PkBudg1150; C_SSP5-PkBudg1150;y2030 | ||
0;SSP5|NDC|nocc_hist;PkBudg500; C_SSP5-PkBudg500;y2030 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.