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.

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

run fixOnRef and checkProjectSummations in all rem-mag iterations #1627

Merged
merged 1 commit into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Imports:
edgeTransport (>= 1.5.4),
flexdashboard,
GDPuc,
gdx,
gdx (>= 1.53.0),
gdxdt,
gdxrrw,
ggplot2,
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion start_coupled.R
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Loading