From 6e13a4ca88022f39987622c73c8f068b7071a553 Mon Sep 17 00:00:00 2001
From: vagudets <victoria.agudetse@bsc.es>
Date: Fri, 18 Jul 2025 10:23:46 +0200
Subject: [PATCH 1/3] check_recipe(): Correct aggregation method from
 'accumulation' to 'accumulated' in Aggregation module check

---
 tools/check_recipe.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check_recipe.R b/tools/check_recipe.R
index f8c45af8..fcf2f166 100644
--- a/tools/check_recipe.R
+++ b/tools/check_recipe.R
@@ -336,7 +336,7 @@ check_recipe <- function(recipe) {
   # ---------------------------------------------------------------------
   # Time_Aggregation
   if ("Time_aggregation" %in% names(recipe$Analysis$Workflow)) {
-    TIME_AGG_METHODS <- c("average", "accumulation")
+    TIME_AGG_METHODS <- c("average", "accumulated")
     if (!("execute" %in% names(recipe$Analysis$Workflow$Time_aggregation))) {
       recipe$Analysis$Workflow$Time_aggregation$execute <- FALSE
     } else {
-- 
GitLab


From 0604eb0c4d226bafa3d747889d7328f8eccb2379 Mon Sep 17 00:00:00 2001
From: vagudets <victoria.agudetse@bsc.es>
Date: Fri, 18 Jul 2025 10:32:00 +0200
Subject: [PATCH 2/3] Fix scorecards region check

---
 tools/check_recipe.R | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/check_recipe.R b/tools/check_recipe.R
index fcf2f166..daf0d0ec 100644
--- a/tools/check_recipe.R
+++ b/tools/check_recipe.R
@@ -810,7 +810,8 @@ check_recipe <- function(recipe) {
   }
   if ("Scorecards" %in% names(recipe$Analysis$Workflow)) {
     if (recipe$Analysis$Workflow$Scorecards$execute == TRUE) {
-      if (length(recipe$Analysis$Region) > 1) {
+      if (length(recipe$Analysis$Region) > 1 && 
+          is.list(recipe$Analysis$Region[[1]])) {
         error(recipe$Run$logger,
               paste0("Splitting the recipe by Region is not allowed when ",
                      "Scorecards are requested. Please write only one region ",
-- 
GitLab


From 919c8eabce2ed276c5601e381c612b524cb4b253 Mon Sep 17 00:00:00 2001
From: vagudets <victoria.agudetse@bsc.es>
Date: Fri, 18 Jul 2025 10:32:08 +0200
Subject: [PATCH 3/3] Update recipe template

---
 recipe_template.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipe_template.yml b/recipe_template.yml
index b73c6213..8df18712 100644
--- a/recipe_template.yml
+++ b/recipe_template.yml
@@ -99,7 +99,7 @@ Analysis:
       save: 'all' # Options: 'all'/'none'/'exp_only' (Mandatory, str)
     Time_aggregation:
       execute: yes # # Either yes/true or no/false. Defaults to false. (Mandatory, bool)
-      method: average # Aggregation method. Available methods: 'average, 'accumulated'. (Mandatory, string)
+      method: accumulated # Aggregation method. Available methods: 'average, 'accumulated'. (Mandatory, string)
       # ini and end: list, pairs initial and final time steps to aggregate.
       # In this example, aggregate from 1 to 2; from 2 to 3 and from 1 to 3
       ini: [1, 2, 1]
@@ -167,7 +167,7 @@ Analysis:
         Extra-tropical SH : {lon.min: 0,  lon.max: 360, lat.min: -90, lat.max: -30}
       start_months: 1, 2, 3 # Mandatory, int: start months to visualise in scorecard table. Options: 'all' or a sequence of numbers.
       metric: mean_bias enscorr rpss crpss enssprerr # Mandatory: metrics to visualise in scorecard table
-      metric_aggregation: 'score' # Mandatory, str: level of aggregation for skill scores. Options: 'score' or 'skill'
+      metric_aggregation: 'skill' # Mandatory, str: level of aggregation for skill scores. Options: 'skill'. 'score' not currently available.
       inf_to_na: True # Optional, bool: set inf values in data to NA, default is no/False
       table_label: NULL # Optional, str: extra information to add in scorecard table title
       fileout_label: NULL # Optional, str: extra information to add in scorecard output filename
-- 
GitLab