Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid warning by read.report about separator replacement #42

Merged
merged 4 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '10359300'
ValidationKey: '10382188'
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
- 'Warning: namespace ''.*'' is not available and has been replaced'
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: 'mrland: MadRaT land data package'
version: 0.52.5
date-released: '2024-01-10'
version: 0.52.6
date-released: '2024-01-16'
abstract: The package provides land related data via the madrat framework.
authors:
- family-names: Dietrich
Expand Down
8 changes: 4 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: mrland
Title: MadRaT land data package
Version: 0.52.5
Date: 2024-01-10
Version: 0.52.6
Date: 2024-01-16
Authors@R: c(
person("Jan Philipp", "Dietrich", , "[email protected]", role = c("aut", "cre")),
person("Abhijeet", "Mishra", role = "aut"),
Expand All @@ -29,7 +29,7 @@ BugReports: https://github.com/pik-piam/mrland/issues
Depends:
R (>= 2.10.0),
madrat (>= 1.30),
magclass (>= 3.17),
magclass (>= 6.13.1),
mrdrivers (>= 1.0.0),
mrcommons (>= 1.37.0),
mrfactors
Expand Down Expand Up @@ -58,4 +58,4 @@ VignetteBuilder:
knitr
Encoding: UTF-8
LazyData: no
RoxygenNote: 7.2.3
RoxygenNote: 7.3.0
2 changes: 1 addition & 1 deletion R/readREMIND.R
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ readREMIND <- function(subtype) {
x <- NULL
for (f in fileList) {
# select REMIND only since newer coupled REMIND reportings also contain MAgPIE
x <- mbind(x, read.report(f, as.list = FALSE)[, , "REMIND"])
x <- mbind(x, read.report(f, as.list = FALSE, showSeparatorWarning = FALSE)[, , "REMIND"])
}
# remove model and variable name
x <- collapseNames(x)
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 land data package

R package **mrland**, version **0.52.5**
R package **mrland**, version **0.52.6**

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

Expand Down Expand Up @@ -39,7 +39,7 @@ In case of questions / problems please contact Jan Philipp Dietrich <dietrich@pi

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

Dietrich J, Mishra A, Weindl I, Bodirsky B, Wang X, Baumstark L, Kreidenweis U, Klein D, Steinmetz N, Chen D, Humpenoeder F, von Jeetze P, Wirth S, Beier F, Hoetten D (2024). _mrland: MadRaT land data package_. doi:10.5281/zenodo.3822083 <https://doi.org/10.5281/zenodo.3822083>, R package version 0.52.5, <https://github.com/pik-piam/mrland>.
Dietrich J, Mishra A, Weindl I, Bodirsky B, Wang X, Baumstark L, Kreidenweis U, Klein D, Steinmetz N, Chen D, Humpenoeder F, von Jeetze P, Wirth S, Beier F, Hoetten D (2024). _mrland: MadRaT land data package_. doi:10.5281/zenodo.3822083 <https://doi.org/10.5281/zenodo.3822083>, R package version 0.52.6, <https://github.com/pik-piam/mrland>.

A BibTeX entry for LaTeX users is

Expand All @@ -48,8 +48,8 @@ A BibTeX entry for LaTeX users is
title = {mrland: MadRaT land data package},
author = {Jan Philipp Dietrich and Abhijeet Mishra and Isabelle Weindl and Benjamin Leon Bodirsky and Xiaoxi Wang and Lavinia Baumstark and Ulrich Kreidenweis and David Klein and Nele Steinmetz and David Chen and Florian Humpenoeder and Patrick {von Jeetze} and Stephen Wirth and Felicitas Beier and David Hoetten},
year = {2024},
note = {R package version 0.52.5},
doi = {10.5281/zenodo.3822083},
note = {R package version 0.52.6},
url = {https://github.com/pik-piam/mrland},
doi = {10.5281/zenodo.3822083},
}
```
9 changes: 9 additions & 0 deletions man/mrland-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.