Merge pull request #125 from orichters/conoptspy

tell when MAgPIE is running report
pik-piam · Feb 6, 2025 · 6d85d1d · 6d85d1d
2 parents 9777362 + 4ecc33d
commit 6d85d1d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '4507776'
+ValidationKey: '4528125'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

diff --git a/CITATION.cff b/CITATION.cff
@@ -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: 'modelstats: Run Analysis Tools'
-version: 0.22.4
-date-released: '2025-02-05'
+version: 0.22.5
+date-released: '2025-02-06'
 abstract: A collection of tools to analyze model runs.
 authors:
 - family-names: Giannousakis

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: modelstats
 Type: Package
 Title: Run Analysis Tools
-Version: 0.22.4
-Date: 2025-02-05
+Version: 0.22.5
+Date: 2025-02-06
 Authors@R: c(
     person("Anastasis", "Giannousakis", email = "giannou@pik-potsdam.de", role = c("aut","cre")),
     person("Oliver", "Richters", role = "aut")

diff --git a/R/getRunStatus.R b/R/getRunStatus.R
@@ -221,6 +221,7 @@ getRunStatus <- function(mydir = dir(), sort = "nf", user = NULL) {
           if (file.exists(fulllogmag)) {
             suppressWarnings(try(loopmag <- sub("^.*.= ", "", system(paste0("grep 'LOOPS' ", fulllogmag, " | tail -1"), intern = TRUE)), silent = TRUE))
           }
+          if (length(suppressWarnings(system(paste0("tac ", logmagtxt, " | grep -m 1 'Start getReport'"), intern = TRUE)) > 0)) loopmag <- "report"
           out[i, "RunStatus"] <- paste("Run MAgPIE", loopmag)
         }
         if (isTRUE(grepl("try to acquire model lock", try(system(paste("tail -1", logmagtxt), intern = TRUE), silent = TRUE)))) {

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Run Analysis Tools
 
-R package **modelstats**, version **0.22.4**
+R package **modelstats**, version **0.22.5**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/modelstats)](https://cran.r-project.org/package=modelstats) [![R build status](https://github.com/pik-piam/modelstats/workflows/check/badge.svg)](https://github.com/pik-piam/modelstats/actions) [![codecov](https://codecov.io/gh/pik-piam/modelstats/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/modelstats) [![r-universe](https://pik-piam.r-universe.dev/badges/modelstats)](https://pik-piam.r-universe.dev/builds)
 
@@ -47,17 +47,17 @@ In case of questions / problems please contact Anastasis Giannousakis <giannou@p
 
 To cite package **modelstats** in publications use:
 
-Giannousakis A, Richters O (2025). "modelstats: Run Analysis Tools." Version: 0.22.4, <https://github.com/pik-piam/modelstats>.
+Giannousakis A, Richters O (2025). "modelstats: Run Analysis Tools." Version: 0.22.5, <https://github.com/pik-piam/modelstats>.
 
 A BibTeX entry for LaTeX users is
 
  ```latex
 @Misc{,
   title = {modelstats: Run Analysis Tools},
   author = {Anastasis Giannousakis and Oliver Richters},
-  date = {2025-02-05},
+  date = {2025-02-06},
   year = {2025},
   url = {https://github.com/pik-piam/modelstats},
-  note = {Version: 0.22.4},
+  note = {Version: 0.22.5},
 }
 ```