From 8d35c79b095bc7a544803b0e78506d54a92696ff Mon Sep 17 00:00:00 2001 From: Kristine Karstens Date: Mon, 8 Apr 2024 17:06:27 +0200 Subject: [PATCH] rework calls for new SOCmodel input --- .buildlibrary | 2 +- .github/workflows/check.yaml | 1 - CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/fullCELLULARMAGPIE.R | 4 ++++ README.md | 6 +++--- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 16355464..90fc45db 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '285611609' +ValidationKey: '285660252' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 0d812d91..f6ea5d40 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -23,7 +23,6 @@ jobs: - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: | - gamstransfer=?ignore any::lucode2 any::covr any::madrat diff --git a/CITATION.cff b/CITATION.cff index e85cacbf..0a24beda 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.44.11 -date-released: '2024-04-06' +version: 1.44.12 +date-released: '2024-04-08' abstract: Provides functions for MAgPIE country and cellular input data generation. authors: - family-names: Karstens diff --git a/DESCRIPTION b/DESCRIPTION index 2a66288e..8b4b9c86 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrmagpie Title: madrat based MAgPIE Input Data Library -Version: 1.44.11 -Date: 2024-04-06 +Version: 1.44.12 +Date: 2024-04-08 Authors@R: c( person("Kristine", "Karstens", , "karstens@pik-potsdam.de", role = c("aut", "cre")), person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = "aut"), diff --git a/R/fullCELLULARMAGPIE.R b/R/fullCELLULARMAGPIE.R index 3bedeadd..a3e1c703 100644 --- a/R/fullCELLULARMAGPIE.R +++ b/R/fullCELLULARMAGPIE.R @@ -460,6 +460,10 @@ fullCELLULARMAGPIE <- function(rev = numeric_version("0.1"), dev = "", calcOutput("CarbonInputMultiplier", aggregate = "region", round = 6, file = "f59_cinput_multiplier.cs3") + calcOutput("CarbonInputMultiplier", inputType = "kcr", aggregate = FALSE, + round = 6, file = "f59_cinput_multiplier_residue.cs3") + calcOutput("CarbonInputMultiplier", inputType = "kli", aggregate = FALSE, + round = 6, file = "f59_cinput_multiplier_manure.cs3") calcOutput("LitterSoilinput", aggregate = "region", years = lpjYears, lpjmlNatveg = lpjml[["natveg"]], climatetype = climatetype, fixFpc = TRUE, round = 6, file = "f59_litter_input.cs3") diff --git a/README.md b/README.md index 1745ef7f..ba1417ee 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat based MAgPIE Input Data Library -R package **mrmagpie**, version **1.44.11** +R package **mrmagpie**, version **1.44.12** [![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.44.11, . +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.44.12, . 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.44.11}, + note = {R package version 1.44.12}, doi = {10.5281/zenodo.4319612}, url = {https://github.com/pik-piam/mrmagpie}, }