Skip to content

Commit

Permalink
renamed LPJmLClimateInput function calls
Browse files Browse the repository at this point in the history
  • Loading branch information
FelicitasBeier committed Sep 12, 2024
1 parent 7d54b31 commit 9e04486
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '4634370'
ValidationKey: '4674852'
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
- 'Warning: namespace ''.*'' is not available and has been replaced'
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repos:
- id: mixed-line-ending

- repo: https://github.com/lorenzwalthert/precommit
rev: 7910e0323d7213f34275a7a562b9ef0fde8ce1b9 # frozen: v0.4.2
rev: bae853d82da476eee0e0a57960ee6b741a3b3fb7 # frozen: v0.4.3
hooks:
- id: parsable-R
- id: deps-in-desc
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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: 'mrsoil: MadRat Soil Organic Carbon Budget Library'
version: 2.3.3
date-released: '2024-06-16'
version: 2.3.4
date-released: '2024-09-12'
abstract: This packages provides functions for soil organic carbon budget for mineral
soils using the steady-state method (Tier 2) of the 2019 Refinement to the 2006
IPP Guidelines for National Greenhouse Gas Inventories.
Expand Down
8 changes: 3 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: mrsoil
Type: Package
Title: MadRat Soil Organic Carbon Budget Library
Version: 2.3.3
Date: 2024-06-16
Version: 2.3.4
Date: 2024-09-12
Authors@R: c(person("Kristine", "Karstens", email = "karstens@pik-potsdam.de", role = c("aut","cre")),
person("Jan Philipp", "Dietrich", email = "dietrich@pik-potsdam.de", role = "aut"))
Description: This packages provides functions for soil organic carbon budget for mineral soils using the steady-state method (Tier 2) of the 2019 Refinement to the 2006 IPP Guidelines for National Greenhouse Gas Inventories.
Expand All @@ -25,10 +25,8 @@ URL: https://github.com/pik-piam/mrsoil, https://doi.org/10.5281/zenodo.4317933
BugReports: https://github.com/pik-piam/mrsoil/issues
Encoding: UTF-8
LazyData: no
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Suggests:
knitr,
rmarkdown,
ggplot2,
covr
VignetteBuilder: knitr
2 changes: 1 addition & 1 deletion R/calcTempEffectDecomposition.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ calcTempEffectDecomposition <- function(lpjmlNatveg = "LPJmL4_for_MAgPIE_44ac93d
paramTopt <- param[, , "topt"]
paramTa <- param[, , "ta"]
paramTb <- param[, , "tb"]
cellTemp <- calcOutput("LPJmLClimateInput", climatetype = climatetype,
cellTemp <- calcOutput("LPJmLClimateInput_new", climatetype = climatetype,
variable = "temperature:monthlyMean",
stage = stage,
lpjmlVersion = lpjmlNatveg,
Expand Down
2 changes: 1 addition & 1 deletion R/calcWaterEffectDecomposition.R
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ calcWaterEffectDecomposition <- function(irrigation = "mixedirrig",
paramWslope <- setYears(param[, , "wfacpar2"], NULL)
paramWslope2 <- setYears(param[, , "wfacpar3"], NULL)

cellPrep <- calcOutput("LPJmLClimateInput", climatetype = climatetype,
cellPrep <- calcOutput("LPJmLClimateInput_new", climatetype = climatetype,
variable = "precipitation:monthlySum",
stage = stage,
lpjmlVersion = lpjmlNatveg,
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MadRat Soil Organic Carbon Budget Library

R package **mrsoil**, version **2.3.3**
R package **mrsoil**, version **2.3.4**

[![CRAN status](https://www.r-pkg.org/badges/version/mrsoil)](https://cran.r-project.org/package=mrsoil) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4317933.svg)](https://doi.org/10.5281/zenodo.4317933) [![R build status](https://github.com/pik-piam/mrsoil/workflows/check/badge.svg)](https://github.com/pik-piam/mrsoil/actions) [![codecov](https://codecov.io/gh/pik-piam/mrsoil/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrsoil) [![r-universe](https://pik-piam.r-universe.dev/badges/mrsoil)](https://pik-piam.r-universe.dev/builds)

Expand Down Expand Up @@ -38,7 +38,7 @@ In case of questions / problems please contact Kristine Karstens <karstens@pik-p

To cite package **mrsoil** in publications use:

Karstens K, Dietrich J (2024). _mrsoil: MadRat Soil Organic Carbon Budget Library_. doi:10.5281/zenodo.4317933 <https://doi.org/10.5281/zenodo.4317933>, R package version 2.3.3, <https://github.com/pik-piam/mrsoil>.
Karstens K, Dietrich J (2024). _mrsoil: MadRat Soil Organic Carbon Budget Library_. doi:10.5281/zenodo.4317933 <https://doi.org/10.5281/zenodo.4317933>, R package version 2.3.4, <https://github.com/pik-piam/mrsoil>.

A BibTeX entry for LaTeX users is

Expand All @@ -47,8 +47,8 @@ A BibTeX entry for LaTeX users is
title = {mrsoil: MadRat Soil Organic Carbon Budget Library},
author = {Kristine Karstens and Jan Philipp Dietrich},
year = {2024},
note = {R package version 2.3.3},
doi = {10.5281/zenodo.4317933},
note = {R package version 2.3.4},
url = {https://github.com/pik-piam/mrsoil},
doi = {10.5281/zenodo.4317933},
}
```

0 comments on commit 9e04486

Please sign in to comment.