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

AR6 Climate assessment on reporting #1475

Merged
merged 46 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
0b8bd7d
Created ar6Climate to run climate assessment
gabriel-abrahao Nov 23, 2023
b60089d
Moved climate_assessment_files_dir to cfg
gabriel-abrahao Nov 23, 2023
6a94be0
Commenting cfg output to emphasize the new option
gabriel-abrahao Nov 23, 2023
cb545aa
Using full paramater set
gabriel-abrahao Nov 23, 2023
051e547
Correcting --num-cfgs
gabriel-abrahao Nov 23, 2023
13bcaa8
allow 12 tasks slurm option for MAGICC7.5.3 in output.R
orichters Dec 4, 2023
3609239
Merge pull request #1 from orichters/magicc753
gabriel-abrahao Dec 6, 2023
62c21e4
Call normalizePath on workfolder when setting MAGICC_WORKER_ROOT_DIR
tonnrueter Jan 17, 2024
ef91607
Introduce dedicated climate_assessment folder, move variable names to…
tonnrueter Jan 22, 2024
a2b6775
Linting: Added missing whitespaces
tonnrueter Jan 22, 2024
1497116
Added license
tonnrueter Jan 22, 2024
68a9c5c
Linting: T/F to TRUE/FALSE
tonnrueter Jan 22, 2024
24ea213
Linting: More whitespaces
tonnrueter Jan 22, 2024
92b8cb9
Linting: Assignment via <- operator
tonnrueter Jan 22, 2024
7440247
Linting: Wrapped overly long lines
tonnrueter Jan 22, 2024
bad6bc9
Linting: Removed commented code, kept Todos
tonnrueter Jan 22, 2024
ee64dbc
Renamed logfile to log_climate.txt
tonnrueter Jan 23, 2024
b5886d5
Added --mem=32000 to slurm options
tonnrueter Jan 23, 2024
0804c7c
Provide climate-assessment path via default.cfg
tonnrueter Jan 23, 2024
3c8a402
Streamlined emission data extraction required by climate-assessment
tonnrueter Jan 25, 2024
5bcc1e3
Put back in some dependencies
tonnrueter Jan 26, 2024
b7a76f4
Explicitly state path to magicc executable to avoid version and platf…
tonnrueter Jan 26, 2024
11aeb6e
Cleaned up: restructured logging, descriptive variables, use tidyvers…
tonnrueter Jan 26, 2024
d1fb06b
Alternate approach to checking for applicable years
tonnrueter Jan 26, 2024
3c5d23a
climate_assessment_root changed
tonnrueter Jan 29, 2024
f5f4993
Restructured script execution, introduced venv handling
tonnrueter Jan 29, 2024
20f35f1
Remove venv handling
tonnrueter Jan 29, 2024
d7d70bb
Logfile issue, piamInterface not updated yet, remove venv command
tonnrueter Jan 29, 2024
9f352a2
Added documentation
tonnrueter Jan 30, 2024
acf3264
Ensure availability of climateAssessment.yaml
tonnrueter Feb 5, 2024
b617f2f
Use read_mif_header to determine period
tonnrueter Feb 5, 2024
97b7aa1
Reduce slurm option selection when running ar6 reporting
Feb 8, 2024
5aea216
Cleaned up some TODOs
Feb 8, 2024
29235ea
Generate ar6 reporting slurm options from existing
tonnrueter Feb 8, 2024
6c77237
Make sure log output is appended to file
Feb 27, 2024
4c2c6d0
Merge remote-tracking branch 'origin/dev/reporting' into dev/reporting
Feb 27, 2024
a73e06d
Merge pull request #2 from tonnrueter/dev/reporting
gabriel-abrahao Feb 27, 2024
389240d
Merge branch 'develop' into reporting
tonnrueter Feb 27, 2024
92e5bc9
Fixed merge errors related to choose_slurmConfig_output
Feb 27, 2024
413aa3a
Merge remote-tracking branch 'upstream/develop' into reporting
Feb 27, 2024
76a45e2
Merge branch 'develop' into reporting
orichters Feb 28, 2024
2465a6c
combine_slurmConfig does not work on vectors…
orichters Feb 28, 2024
9883c1d
add fallback for missing magicc settings in cfg
orichters Feb 28, 2024
6d5d673
Merged branch 'develop' of github.com:remindmodel/remind into reporting
Feb 28, 2024
caa8ea7
Merge final changes
Feb 28, 2024
13efe49
Merge branch 'reporting' of github.com:gabriel-abrahao/remind into re…
Feb 28, 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 DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Imports:
nleqslv,
optparse,
piamenv (>= 0.4.0),
piamInterfaces (>= 0.12.6),
piamInterfaces (>= 0.12.18),
plotly,
purrr,
quitte (>= 0.3128.4),
Expand Down
15 changes: 11 additions & 4 deletions output.R
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ library(lucode2)
library(gms)
require(stringr, quietly = TRUE)

tonnrueter marked this conversation as resolved.
Show resolved Hide resolved
invisible(sapply(list.files("scripts/start", pattern = "\\.R$", full.names = TRUE), source))
source("scripts/start/isSlurmAvailable.R")

flags <- NULL
### Define arguments that can be read from command line
Expand All @@ -86,11 +86,18 @@ if ("--help" %in% flags) {
choose_slurmConfig_output <- function(output) {
slurm_options <- c("--qos=priority", "--qos=short", "--qos=standby",
"--qos=priority --mem=8000", "--qos=short --mem=8000",
"--qos=standby --mem=8000", "--qos=priority --mem=32000",
"direct")
if ("reporting" %in% output) slurm_options <- unique(c(grep("--mem=[0-9]*[0-9]{3}", slurm_options, value = TRUE), "direct"))
tonnrueter marked this conversation as resolved.
Show resolved Hide resolved
"--qos=standby --mem=8000", "--qos=priority --mem=32000")

# Modify slurm options for ar6 reporting, since we want to run MAGICC in parallel and we'll need a lot of memory
if ("ar6Climate" %in% output) slurm_options <- paste(slurm_options[1:3], "--tasks-per-node=12 --mem=32000")

if (!isSlurmAvailable())
return("direct")

if (!is.null(slurmExceptions)) {
tonnrueter marked this conversation as resolved.
Show resolved Hide resolved
slurm_options <- grep(slurmExceptions, slurm_options, value = TRUE)
}

if (length(slurm_options) == 1) {
return(slurm_options[[1]])
}
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.