Skip to content

Commit

Permalink
Merge branch 'joss_preparation' into 'master'
Browse files Browse the repository at this point in the history
add lpjml installation sentence in vignette

See merge request lpjml/lpjmlkit!99
  • Loading branch information
jnnsbrr committed Jul 26, 2024
2 parents ee1e2a3 + 1a5e498 commit 051c069
Show file tree
Hide file tree
Showing 67 changed files with 10,704 additions and 164 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
^CRAN-SUBMISSION$
^cran-comments\.md$
^.*CITATION.cff$
^docs$
3 changes: 1 addition & 2 deletions .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
ValidationKey: '3381470'
ValidationKey: '3408030'
AutocreateReadme: yes
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
- 'Warning: namespace ''.*'' is not available and has been replaced'
AcceptedNotes: ~
allowLinterWarnings: no
AddInReadme: inst/README.md
AddLogoReadme: inst/img/logo.png
Expand Down
19 changes: 11 additions & 8 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: 'lpjmlkit: Toolkit for Basic LPJmL Handling'
version: 1.7.0
date-released: '2024-06-17'
version: 1.7.1
date-released: '2024-07-26'
abstract: A collection of basic functions to facilitate the work with the Dynamic
Global Vegetation Model (DGVM) Lund-Potsdam-Jena managed Land (LPJmL) hosted at
the Potsdam Institute for Climate Impact Research (PIK). It provides functions for
Expand All @@ -13,27 +13,30 @@ authors:
- family-names: Breier
given-names: Jannes
email: [email protected]
orcid: 0000-0002-9055-6904
orcid: https://orcid.org/0000-0002-9055-6904
- family-names: Ostberg
given-names: Sebastian
email: [email protected]
orcid: 0000-0002-2368-7015
orcid: https://orcid.org/0000-0002-2368-7015
- family-names: Wirth
given-names: Stephen Björn
email: [email protected]
orcid: 0000-0003-3090-3318
orcid: https://orcid.org/0000-0003-3090-3318
- family-names: Minoli
given-names: Sara
email: [email protected]
orcid: 0000-0001-7920-3107
orcid: https://orcid.org/0000-0001-7920-3107
- family-names: Stenzel
given-names: Fabian
email: [email protected]
orcid: 0000-0002-5109-0048
orcid: https://orcid.org/0000-0002-5109-0048
- family-names: Hötten
given-names: David
email: [email protected]
- family-names: Müller
given-names: Christoph
email: [email protected]
orcid: 0000-0002-9491-3550
orcid: https://orcid.org/0000-0002-9491-3550
license: AGPL-3.0
repository-code: https://github.com/PIK-LPJmL/lpjmlkit
doi: 10.5281/zenodo.7773134
Expand Down
2 changes: 0 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ We currently prefer contributions in the form of bug reports, feature requests,
and suggestions of code improvements as issues in the
[lpjmlkit GitHub repository](https://github.com/PIK-LPJmL/lpjmlkit/issues).
If you want to contribute code, please follow the instructions below.
Please note that due to our current worflow information on the authorship of
code contributions may get lost.


## Getting Started
Expand Down
7 changes: 4 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
Package: lpjmlkit
Type: Package
Title: Toolkit for Basic LPJmL Handling
Version: 1.7.0
Version: 1.7.1
Authors@R: c(
person("Jannes", "Breier", , "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9055-6904")),
person("Sebastian","Ostberg", , "[email protected]", role = "aut", comment = c(ORCID = "0000-0002-2368-7015")),
person("Stephen Björn", "Wirth", , "[email protected]", role = "aut", comment = c(ORCID = "0000-0003-3090-3318")),
person("Sara","Minoli", , "[email protected]", role = "aut", comment = c(ORCID = "0000-0001-7920-3107")),
person("Fabian", "Stenzel", , "[email protected]", role = "aut", comment = c(ORCID = "0000-0002-5109-0048")),
person("David","Hötten", , "[email protected]", role = c("aut")),
person("Christoph", "Müller", , "[email protected]", role = "aut", comment = c(ORCID = "0000-0002-9491-3550"))
)
Description: A collection of basic functions to facilitate the work with the
Expand All @@ -18,7 +19,7 @@ Description: A collection of basic functions to facilitate the work with the
configuration files.
License: AGPL-3
LazyData: true
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Roxygen: list(markdown = TRUE,
r6 = TRUE)
Encoding: UTF-8
Expand Down Expand Up @@ -54,4 +55,4 @@ Suggests:
sf
Config/testthat/edition: 3
VignetteBuilder: knitr
Date: 2024-06-17
Date: 2024-07-26
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Toolkit for Basic LPJmL Handling <a href=''><img src='inst/img/logo.png' align='right' height='139' /></a>

R package **lpjmlkit**, version **1.7.0**
R package **lpjmlkit**, version **1.7.1**

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

Expand Down Expand Up @@ -76,17 +76,17 @@ In case of questions / problems please contact Jannes Breier <jannesbr@pik-potsd

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

Breier J, Ostberg S, Wirth S, Minoli S, Stenzel F, Müller C (2024). _lpjmlkit: Toolkit for Basic LPJmL Handling_. doi: 10.5281/zenodo.7773134 (URL: https://doi.org/10.5281/zenodo.7773134), R package version 1.7.0, <URL: https://github.com/PIK-LPJmL/lpjmlkit>.
Breier J, Ostberg S, Wirth S, Minoli S, Stenzel F, Hötten D, Müller C (2024). _lpjmlkit: Toolkit for Basic LPJmL Handling_. doi:10.5281/zenodo.7773134 <https://doi.org/10.5281/zenodo.7773134>, R package version 1.7.1, <https://github.com/PIK-LPJmL/lpjmlkit>.

A BibTeX entry for LaTeX users is

```latex
@Manual{,
title = {lpjmlkit: Toolkit for Basic LPJmL Handling},
author = {Jannes Breier and Sebastian Ostberg and Stephen Björn Wirth and Sara Minoli and Fabian Stenzel and Christoph Müller},
author = {Jannes Breier and Sebastian Ostberg and Stephen Björn Wirth and Sara Minoli and Fabian Stenzel and David Hötten and Christoph Müller},
year = {2024},
note = {R package version 1.7.0},
doi = {10.5281/zenodo.7773134},
note = {R package version 1.7.1},
url = {https://github.com/PIK-LPJmL/lpjmlkit},
doi = {10.5281/zenodo.7773134},
}
```
115 changes: 115 additions & 0 deletions docs/404.html

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

Loading

0 comments on commit 051c069

Please sign in to comment.