From 0a9ad8adfaff60ba324e8e0435376556f71b0b5b Mon Sep 17 00:00:00 2001 From: Victoria Agudetse Roures Date: Thu, 5 Jan 2023 11:27:10 +0100 Subject: [PATCH 1/2] Add ncores to Anomalies module and include new ncores fix from CSTools --- modules/Anomalies/Anomalies.R | 12 ++++-------- modules/Anomalies/tmp/CST_Anomaly.R | 23 ++++++++++++++--------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/modules/Anomalies/Anomalies.R b/modules/Anomalies/Anomalies.R index f8b49da8..552f895a 100644 --- a/modules/Anomalies/Anomalies.R +++ b/modules/Anomalies/Anomalies.R @@ -29,7 +29,8 @@ compute_anomalies <- function(recipe, data) { memb_dim = 'ensemble', dim_anom = 'syear', dat_dim = c('dat', 'ensemble'), - ftime_dim = 'time') + ftime_dim = 'time', + ncores = recipe$Analysis$ncores) # Reorder dims anom$exp$data <- Reorder(anom$exp$data, names(original_dims)) anom$obs$data <- Reorder(anom$obs$data, names(original_dims)) @@ -59,7 +60,8 @@ compute_anomalies <- function(recipe, data) { dat_dim = c("dat", "ensemble"), memb = FALSE, memb_dim = "ensemble", - ftime_dim = "time") + ftime_dim = "time", + ncores = recipe$Analysis$ncores) clim_hcst <- InsertDim(clim$clim_exp, posdim = 1, lendim = 1, name = "syear") dims <- dim(clim_hcst) @@ -95,9 +97,3 @@ compute_anomalies <- function(recipe, data) { hcst.full_val = hcst_fullvalue, obs.full_val = obs_fullvalue)) } - - - - - - diff --git a/modules/Anomalies/tmp/CST_Anomaly.R b/modules/Anomalies/tmp/CST_Anomaly.R index a84b6fc8..f38e39b0 100644 --- a/modules/Anomalies/tmp/CST_Anomaly.R +++ b/modules/Anomalies/tmp/CST_Anomaly.R @@ -53,12 +53,7 @@ #'attr(exp, 'class') <- 's2dv_cube' #'attr(obs, 'class') <- 's2dv_cube' #' -#'anom1 <- CST_Anomaly(exp = exp, obs = obs, cross = FALSE, memb = TRUE) -#'anom2 <- CST_Anomaly(exp = exp, obs = obs, cross = TRUE, memb = TRUE) -#'anom3 <- CST_Anomaly(exp = exp, obs = obs, cross = TRUE, memb = FALSE) -#'anom4 <- CST_Anomaly(exp = exp, obs = obs, cross = FALSE, memb = FALSE) -#'anom5 <- CST_Anomaly(lonlat_temp$exp) -#'anom6 <- CST_Anomaly(obs = lonlat_temp$obs) +#'anom <- CST_Anomaly(exp = exp, obs = obs, cross = FALSE, memb = TRUE) #' #'@seealso \code{\link[s2dv]{Ano_CrossValid}}, \code{\link[s2dv]{Clim}} and \code{\link{CST_Load}} #' @@ -178,11 +173,21 @@ CST_Anomaly <- function(exp = NULL, obs = NULL, dim_anom = 'sdate', cross = FALS # With cross-validation if (cross) { - ano <- Ano_CrossValid(exp = exp$data, obs = obs$data, time_dim = dim_anom, memb_dim = memb_dim, memb = memb, dat_dim = dat_dim) + ano <- Ano_CrossValid(exp = exp$data, obs = obs$data, + time_dim = dim_anom, + memb_dim = memb_dim, + memb = memb, + dat_dim = dat_dim, + ncores = ncores) - # Without cross-validation + # Without cross-validation } else { - tmp <- Clim(exp = exp$data, obs = obs$data, time_dim = dim_anom, memb_dim = memb_dim, memb = memb, dat_dim = dat_dim) + tmp <- Clim(exp = exp$data, obs = obs$data, + time_dim = dim_anom, + memb_dim = memb_dim, + memb = memb, + dat_dim = dat_dim, + ncores = ncores) if (!is.null(filter_span)) { tmp$clim_exp <- Apply(tmp$clim_exp, target_dims = c(ftime_dim), -- GitLab From 691f1075e42e78ebb212b97d1bf8bf2a49c4d9de Mon Sep 17 00:00:00 2001 From: Victoria Agudetse Roures Date: Thu, 5 Jan 2023 11:28:27 +0100 Subject: [PATCH 2/2] Update recipe --- modules/Loading/testing_recipes/recipe_seasonal-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/Loading/testing_recipes/recipe_seasonal-tests.yml b/modules/Loading/testing_recipes/recipe_seasonal-tests.yml index e1857ac0..61177b71 100644 --- a/modules/Loading/testing_recipes/recipe_seasonal-tests.yml +++ b/modules/Loading/testing_recipes/recipe_seasonal-tests.yml @@ -30,6 +30,9 @@ Analysis: Workflow: Calibration: method: mse_min + Anomalies: + compute: yes + cross_validation: yes Skill: metric: RPS RPSS CRPS CRPSS FRPSS BSS10 BSS90 EnsCorr Corr mean_bias mean_bias_SS Probabilities: -- GitLab