diff --git a/.buildlibrary b/.buildlibrary index f4b49711..06e39026 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '27693817' +ValidationKey: '27734616' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index fb00632a..d7afc632 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,8 +2,8 @@ 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.40.3 -date-released: '2024-01-17' +version: 1.40.4 +date-released: '2024-02-01' abstract: Provides functions for MAgPIE country and cellular input data generation. authors: - family-names: Karstens diff --git a/DESCRIPTION b/DESCRIPTION index 240fbe20..6de32dc8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrmagpie Title: madrat based MAgPIE Input Data Library -Version: 1.40.3 -Date: 2024-01-17 +Version: 1.40.4 +Date: 2024-02-01 Authors@R: c( person("Kristine", "Karstens", , "karstens@pik-potsdam.de", role = c("aut", "cre")), person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = "aut"), @@ -59,4 +59,4 @@ VignetteBuilder: knitr Encoding: UTF-8 LazyData: no -RoxygenNote: 7.3.0 +RoxygenNote: 7.3.1 diff --git a/R/fullCELLULARMAGPIE.R b/R/fullCELLULARMAGPIE.R index ecb5928f..055ea4c0 100755 --- a/R/fullCELLULARMAGPIE.R +++ b/R/fullCELLULARMAGPIE.R @@ -426,10 +426,9 @@ fullCELLULARMAGPIE <- function(rev = 0.1, dev = "", calcOutput("CarbonInputMultiplier", aggregate = "region", round = 6, file = "f59_cinput_multiplier.cs3") - calcOutput("CarbonLitter", aggregate = "region", years = lpjYears, + calcOutput("LitterSoilinput", aggregate = "region", years = lpjYears, lpjmlNatveg = lpjml[["natveg"]], climatetype = climatetype, - mode = "magpieInput", fixFpc = TRUE, - round = 6, file = "f59_litter_recycling.cs3") + fixFpc = TRUE, round = 6, file = "f59_litter_input.cs3") calcOutput("DecayFuture", aggregate = "region", years = lpjYears, lpjmlNatveg = lpjml[["natveg"]], climatetype = climatetype, round = 6, file = "f59_topsoilc_decay.cs3") diff --git a/README.md b/README.md index 7c48d7b2..002c2f4b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat based MAgPIE Input Data Library -R package **mrmagpie**, version **1.40.3** +R package **mrmagpie**, version **1.40.4** [![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.40.3, . +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.40.4, . 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.40.3}, + note = {R package version 1.40.4}, doi = {10.5281/zenodo.4319612}, url = {https://github.com/pik-piam/mrmagpie}, }