From 7fd994d6952a7dc639bbd63b1047dc106035720a Mon Sep 17 00:00:00 2001 From: Kristine Karstens Date: Sun, 16 Jun 2024 15:34:19 +0200 Subject: [PATCH] add natural soc and land area for 1990 --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- R/fullCELLULARMAGPIE.R | 9 ++++++++- README.md | 6 +++--- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 78dbeb4b..45c9b23f 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '29735550' +ValidationKey: '29835000' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package .* was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 4bc353b6..02f6abde 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'mrmagpie: madrat based MAgPIE Input Data Library' -version: 1.49.5 +version: 1.50.0 date-released: '2024-06-16' abstract: Provides functions for MAgPIE country and cellular input data generation. authors: diff --git a/DESCRIPTION b/DESCRIPTION index cdfb7838..2d46d5f6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: mrmagpie Title: madrat based MAgPIE Input Data Library -Version: 1.49.5 +Version: 1.50.0 Date: 2024-06-16 Authors@R: c( person("Kristine", "Karstens", , "karstens@pik-potsdam.de", role = c("aut", "cre")), diff --git a/R/fullCELLULARMAGPIE.R b/R/fullCELLULARMAGPIE.R index 16d54b57..0d4f5182 100644 --- a/R/fullCELLULARMAGPIE.R +++ b/R/fullCELLULARMAGPIE.R @@ -475,6 +475,10 @@ fullCELLULARMAGPIE <- function(rev = numeric_version("0.1"), dev = "", histClimatetype <- toolLPJmLVersion(version = lpjml[["natveg"]], climatetype = climatetype)$baseline_hist + calcOutput("LanduseInitialisation", nclasses = "seven", + aggregate = "region", cellular = FALSE, cells = cells, + input_magpie = TRUE, selectyears = "y1990", + round = roundArea, file = "f59_land_y1990.cs3") calcOutput("CarbonInputMultiplier", aggregate = "region", round = 6, file = "f59_cinput_multiplier.cs3") calcOutput("CarbonInputMultiplier", inputType = "kcr", aggregate = "region", @@ -487,9 +491,12 @@ fullCELLULARMAGPIE <- function(rev = numeric_version("0.1"), dev = "", calcOutput("DecayFuture", aggregate = "region", years = lpjYears, lpjmlNatveg = lpjml[["natveg"]], climatetype = climatetype, round = 6, file = "f59_topsoilc_decay.cs3") - calcOutput("SoilCarbon", aggregate = "region", years = "y1995", output = "actualstate", + calcOutput("SoilCarbon", aggregate = "region", years = "y1990", output = "actualstate", lpjmlNatveg = lpjml[["natveg"]], climatetype = histClimatetype, round = 6, file = "f59_topsoilc_actualstate.cs3") + calcOutput("SoilCarbon", aggregate = "region", years = "y1990", output = "naturalstate", + lpjmlNatveg = lpjml[["natveg"]], climatetype = histClimatetype, + round = 6, file = "f59_topsoilc_naturalstate.cs3") } ##### AGGREGATION ###### diff --git a/README.md b/README.md index b490a11a..7e355d34 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat based MAgPIE Input Data Library -R package **mrmagpie**, version **1.49.5** +R package **mrmagpie**, version **1.50.0** [![CRAN status](https://www.r-pkg.org/badges/version/mrmagpie)](https://cran.r-project.org/package=mrmagpie) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4319612.svg)](https://doi.org/10.5281/zenodo.4319612) [![R build status](https://github.com/pik-piam/mrmagpie/workflows/check/badge.svg)](https://github.com/pik-piam/mrmagpie/actions) [![codecov](https://codecov.io/gh/pik-piam/mrmagpie/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrmagpie) [![r-universe](https://pik-piam.r-universe.dev/badges/mrmagpie)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Kristine Karstens , R package version 1.49.5, . +Karstens K, Dietrich J, Chen D, Windisch M, Alves M, Beier F, Köberle A, v. Jeetze P, Mishra A, Humpenoeder F, Sauer P (2024). _mrmagpie: madrat based MAgPIE Input Data Library_. doi:10.5281/zenodo.4319612 , R package version 1.50.0, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrmagpie: madrat based MAgPIE Input Data Library}, author = {Kristine Karstens and Jan Philipp Dietrich and David Chen and Michael Windisch and Marcos Alves and Felicitas Beier and Alexandre Köberle and Patrick {v. Jeetze} and Abhijeet Mishra and Florian Humpenoeder and Pascal Sauer}, year = {2024}, - note = {R package version 1.49.5}, + note = {R package version 1.50.0}, doi = {10.5281/zenodo.4319612}, url = {https://github.com/pik-piam/mrmagpie}, }