Skip to content

Commit 2521024

Browse files
committed
bugfix collapse dim
1 parent 8000cd6 commit 2521024

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.buildlibrary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ValidationKey: '4594359'
1+
ValidationKey: '4614248'
22
AcceptedWarnings:
33
- 'Warning: package ''.*'' was built under R version'
44
- 'Warning: namespace ''.*'' is not available and has been replaced'

CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cff-version: 1.2.0
22
message: If you use this software, please cite it using the metadata from this file.
33
type: software
44
title: 'mrsoil: MadRat Soil Organic Carbon Budget Library'
5-
version: 2.3.1
5+
version: 2.3.2
66
date-released: '2024-06-15'
77
abstract: This packages provides functions for soil organic carbon budget for mineral
88
soils using the steady-state method (Tier 2) of the 2019 Refinement to the 2006

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: mrsoil
22
Type: Package
33
Title: MadRat Soil Organic Carbon Budget Library
4-
Version: 2.3.1
4+
Version: 2.3.2
55
Date: 2024-06-15
66
Authors@R: c(person("Kristine", "Karstens", email = "karstens@pik-potsdam.de", role = c("aut","cre")),
77
person("Jan Philipp", "Dietrich", email = "dietrich@pik-potsdam.de", role = "aut"))

R/calcSoilCarbon.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ calcSoilCarbon <- function(output = "all",
4343

4444

4545
getSets(out, fulldim = FALSE)[1] <- "x.y.iso"
46-
out <- collapseDim(out)
4746

4847
} else if (output %in% c("actualstate", "interstate", "naturalstate")) {
4948

@@ -61,6 +60,8 @@ calcSoilCarbon <- function(output = "all",
6160
stop("'output' unknown.")
6261
}
6362

63+
out <- collapseDim(out)
64+
6465
return(list(x = out,
6566
weight = NULL,
6667
unit = ifelse(output == "all", "tC per ha", "Mt C"),

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MadRat Soil Organic Carbon Budget Library
22

3-
R package **mrsoil**, version **2.3.1**
3+
R package **mrsoil**, version **2.3.2**
44

55
[![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)
66

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

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

41-
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.1, <https://github.com/pik-piam/mrsoil>.
41+
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.2, <https://github.com/pik-piam/mrsoil>.
4242

4343
A BibTeX entry for LaTeX users is
4444

@@ -47,7 +47,7 @@ A BibTeX entry for LaTeX users is
4747
title = {mrsoil: MadRat Soil Organic Carbon Budget Library},
4848
author = {Kristine Karstens and Jan Philipp Dietrich},
4949
year = {2024},
50-
note = {R package version 2.3.1},
50+
note = {R package version 2.3.2},
5151
doi = {10.5281/zenodo.4317933},
5252
url = {https://github.com/pik-piam/mrsoil},
5353
}

0 commit comments

Comments
 (0)