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.

Sign up for GitHub

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

Use the fulldata.gdx of a successful SSP2EU-NPi-AMT to update the gdx on the RSE server #96

Merged
merged 2 commits into from
Mar 28, 2024
Merged

Use the fulldata.gdx of a successful SSP2EU-NPi-AMT to update the gdx on the RSE server #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6f2d97
Use the fulldata.gdx of a successful SSP2EU-NPi-AMT to update the gdx…
dklein-pik Mar 27, 2024
75ab2a3
build
dklein-pik Mar 27, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '3780463'
ValidationKey: '3961800'
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
View file
Open in desktop
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: 'modelstats: Run Analysis Tools'
version: 0.19.1
date-released: '2024-03-11'
version: 0.20.0
date-released: '2024-03-27'
abstract: A collection of tools to analyze model runs.
authors:
- family-names: Giannousakis
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: modelstats
Type: Package
Title: Run Analysis Tools
Version: 0.19.1
Date: 2024-03-11
Version: 0.20.0
Date: 2024-03-27
Authors@R: c(
person("Anastasis", "Giannousakis", email = "[email protected]", role = c("aut","cre")),
person("Oliver", "Richters", role = "aut")
Expand Down
4 changes: 2 additions & 2 deletions R/colRunType.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ colRunType <- function(mydir = ".") {
} else {
out <- cfg$gms$optimization
if (grepl("^testOneRegi", out)) {
out <- paste(if (isTRUE(cfg$gms$cm_nash_mode == "debug")) "debug" else
out <- paste(if (isTRUE(cfg$gms$cm_nash_mode == "debug" | cfg$gms$cm_nash_mode == 1)) "debug" else
if (isTRUE(cfg$gms$cm_quick_mode == "on")) "quick" else "testOneRegi", cfg$gms$c_testOneRegi_region)
} else {
if (isTRUE(cfg$gms$cm_nash_mode == "debug")) out <- paste0(out, " debug")
if (isTRUE(cfg$gms$cm_nash_mode == "debug" | cfg$gms$cm_nash_mode == 1)) out <- paste0(out, " debug")
if (isTRUE(cfg$gms$CES_parameters == "calibrate")) out <- paste0("Calib_", out)
if (isTRUE(cfg$gms$cm_MAgPIE_coupling == "on")) out <- paste0(out, " + mag")
}
Expand Down
6 changes: 6 additions & 0 deletions R/modeltests.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,12 @@ evaluateRuns <- function(model, mydir, gitPath, compScen, email, mattermostToken
if (grsi[, "Conv"] %in% c("converged", "converged (had INFES)")) {
setwd(i)
message("Changed to ", normalizePath("."))
# Use the fulldata.gdx of a successful SSP2EU-NPi-AMT to update the gdx on the RSE server that is used for testing convGDX2MIF
if (grepl("SSP2EU-NPi-AMT", rownames(grsi))) {
gdxOnRseServer <- "rse:/webservice/data/example/remind2_test-convGDX2MIF_fulldata.gdx"
Copy link
Contributor

@orichters orichters Mar 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for being late to the party, but it seems you overwriting the file used for remind2 testing, while in this discussion, there seems to be quite some support for keeping a file as well from the last release, so maybe we should push the AMT results to a different filename?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, thanks for notifying.

message(paste("Updating the gdx on the RSE server", gdxOnRseServer, "with the fulldata.gdx of", rownames(grsi)))
system(paste("rsync -e ssh -av fulldata.gdx", gdxOnRseServer))
}
cfg <- NULL
# Question: is this check really useful? 'Conv' has been checked 4 lines above already.
# Doesn't this check exclude runs that have 'converged (had INFES)' and
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Run Analysis Tools

R package **modelstats**, version **0.19.1**
R package **modelstats**, version **0.20.0**

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

Expand Down Expand Up @@ -47,7 +47,7 @@ In case of questions / problems please contact Anastasis Giannousakis <giannou@p

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

Giannousakis A, Richters O (2024). _modelstats: Run Analysis Tools_. R package version 0.19.1, <https://github.com/pik-piam/modelstats>.
Giannousakis A, Richters O (2024). _modelstats: Run Analysis Tools_. R package version 0.20.0, <https://github.com/pik-piam/modelstats>.

A BibTeX entry for LaTeX users is

Expand All @@ -56,7 +56,7 @@ A BibTeX entry for LaTeX users is
title = {modelstats: Run Analysis Tools},
author = {Anastasis Giannousakis and Oliver Richters},
year = {2024},
note = {R package version 0.19.1},
note = {R package version 0.20.0},
url = {https://github.com/pik-piam/modelstats},
}
```
Loading