From c47b2205137a2ffb4ebd1979529f624d257df7e8 Mon Sep 17 00:00:00 2001 From: orichters Date: Wed, 20 Mar 2024 08:54:38 +0100 Subject: [PATCH] run fixOnRef and checkProjectSummations in all rem-mag iterations --- DESCRIPTION | 2 +- Makefile | 1 + start_coupled.R | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8cd5d6804..3af498528 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,7 +20,7 @@ Imports: edgeTransport (>= 1.5.4), flexdashboard, GDPuc, - gdx, + gdx (>= 1.53.0), gdxdt, gdxrrw, ggplot2, diff --git a/Makefile b/Makefile index 5c941a393..4df3d8ee6 100644 --- a/Makefile +++ b/Makefile @@ -84,6 +84,7 @@ test-coupled: ## Test if the coupling with MAgPIE works. Takes significantly test-coupled-slurm: ## test-coupled, but on slurm $(info Coupling tests take around 75 minutes to run. Sent to slurm, find log in test-coupled.log) + make ensure-reqs @sbatch --qos=priority --wrap="make test-coupled" --job-name=test-coupled --mail-type=END --output=test-coupled.log --comment="test-coupled.log" test-full: ## Run all tests, including coupling tests and a default diff --git a/start_coupled.R b/start_coupled.R index ac517d78d..113e84042 100644 --- a/start_coupled.R +++ b/start_coupled.R @@ -73,8 +73,9 @@ start_coupled <- function(path_remind, path_magpie, cfg_rem, cfg_mag, runname, m cfg_rem$title <- paste0(runname,"-rem-",i) # Switch off generation of needless output for all but the last REMIND iteration + output_all_iter <- c("reporting", "reportingREMIND2MAgPIE", "emulator", "rds_report", "fixOnRef", "checkProjectSummations") if (i < max_iterations) { - cfg_rem$output <- intersect(cfg_rem_original, c("reporting", "reportingREMIND2MAgPIE", "emulator", "rds_report")) + cfg_rem$output <- intersect(cfg_rem_original, output_all_iter) } else { cfg_rem$output <- cfg_rem_original }