Skip to content

Commit 7b90c60

Browse files
committed
Merge branch 'hotfix_run_lpjml_parallel' into 'master'
FIxed issue with parallelization of runs See merge request lpjml/lpjmlkit!111
2 parents 4a1ca74 + db8de41 commit 7b90c60

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

.buildlibrary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ValidationKey: '34827570'
1+
ValidationKey: '34863336'
22
AutocreateReadme: yes
33
AcceptedWarnings:
44
- 'Warning: package ''.*'' was built under R version'

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ 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: 'lpjmlkit: Toolkit for Basic LPJmL Handling'
5-
version: 1.7.10
6-
date-released: '2025-10-06'
5+
version: 1.7.11
6+
date-released: '2025-10-15'
77
abstract: A collection of basic functions to facilitate the work with the Dynamic
88
Global Vegetation Model (DGVM) Lund-Potsdam-Jena managed Land (LPJmL) hosted at
99
the Potsdam Institute for Climate Impact Research (PIK). It provides functions for

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: lpjmlkit
22
Type: Package
33
Title: Toolkit for Basic LPJmL Handling
4-
Version: 1.7.10
4+
Version: 1.7.11
55
Authors@R: c(
66
person("Jannes", "Breier", , "jannesbr@pik-potsdam.de", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9055-6904")),
77
person("Sebastian","Ostberg", , "ostberg@pik-potsdam.de", role = "aut", comment = c(ORCID = "0000-0002-2368-7015")),
@@ -56,4 +56,4 @@ Suggests:
5656
R6
5757
Config/testthat/edition: 3
5858
VignetteBuilder: knitr
59-
Date: 2025-10-06
59+
Date: 2025-10-15

R/run_lpjml.R

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,14 +400,15 @@ do_parallel <- function(sim_names,
400400
# Write single call
401401
tryCatch({
402402

403-
if (is_slurm_available() && Sys.getenv("SLURM_JOB_ID") != "") {
403+
if (is_slurm_available() && Sys.getenv("SLURM_JOB_ID") != "" && !grepl("mpirun", run_cmd)) {
404404
mpi_lib <- Sys.getenv("I_MPI_PMI_LIBRARY")
405405
Sys.setenv(I_MPI_PMI_LIBRARY = "/p/system/slurm/lib/libpmi.so") # nolint
406406
} else {
407407
mpi_lib <- NULL
408408
}
409409
do_run(
410-
sim_name, model_path, sim_path, run_cmd, write_stdout = TRUE, raise_error
410+
sim_name, model_path, sim_path, run_cmd, write_stdout = TRUE,
411+
raise_error, debug = FALSE
411412
)
412413

413414
# Stop when error occures

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# <a href=''><img src='inst/img/logo.png' align='right' alt='logo' height=139 /></a> Toolkit for Basic LPJmL Handling
22

3-
R package **lpjmlkit**, version **1.7.10**
3+
R package **lpjmlkit**, version **1.7.11**
44

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

@@ -76,7 +76,7 @@ In case of questions / problems please contact Jannes Breier <jannesbr@pik-potsd
7676

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

79-
Breier J, Ostberg S, Wirth S, Minoli S, Stenzel F, Hötten D, Müller C (2025). "lpjmlkit: Toolkit for Basic LPJmL Handling." doi:10.5281/zenodo.7773134 <https://doi.org/10.5281/zenodo.7773134>, Version: 1.7.10, <https://github.com/PIK-LPJmL/lpjmlkit>.
79+
Breier J, Ostberg S, Wirth S, Minoli S, Stenzel F, Hötten D, Müller C (2025). "lpjmlkit: Toolkit for Basic LPJmL Handling." doi:10.5281/zenodo.7773134 <https://doi.org/10.5281/zenodo.7773134>, Version: 1.7.11, <https://github.com/PIK-LPJmL/lpjmlkit>.
8080

8181
A BibTeX entry for LaTeX users is
8282

@@ -85,9 +85,9 @@ A BibTeX entry for LaTeX users is
8585
title = {lpjmlkit: Toolkit for Basic LPJmL Handling},
8686
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},
8787
doi = {10.5281/zenodo.7773134},
88-
date = {2025-10-06},
88+
date = {2025-10-15},
8989
year = {2025},
9090
url = {https://github.com/PIK-LPJmL/lpjmlkit},
91-
note = {Version: 1.7.10},
91+
note = {Version: 1.7.11},
9292
}
9393
```

0 commit comments

Comments
 (0)