From 90f5abcb14882e53aae17d6d0225caa758036a7e Mon Sep 17 00:00:00 2001 From: Victoria Agudetse Roures Date: Fri, 7 Jul 2023 15:28:16 +0200 Subject: [PATCH] Remove projection method from toptitle in NAO plots; remove deprecated parameter from testing recipe --- modules/Indices/R/compute_nao.R | 8 ++------ tests/recipes/recipe-seasonal_NAO.yml | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/Indices/R/compute_nao.R b/modules/Indices/R/compute_nao.R index 4be27b89..5bb76e4e 100644 --- a/modules/Indices/R/compute_nao.R +++ b/modules/Indices/R/compute_nao.R @@ -178,9 +178,7 @@ compute_nao <- function(data, recipe, obsproj, plot_ts, plot_sp, toptitle <- paste("NAO Index\n", month.abb[mes], "/", recipe$Analysis$Time$hcst_start, "-", - recipe$Analysis$Time$hcst_end, "\nMethod:", - ifelse(recipe$Analysis$Workflow$Indices$NAO$obsproj, - "Pobs", "Pmod"), "(Doblas-Reyes et al., 2003)") + recipe$Analysis$Time$hcst_end) plotfile <- paste0(recipe$Run$output_dir, "/plots/Indices/NAO_", system, "_", recipe$Analysis$Datasets$Reference$name, "_s", recipe$Analysis$Time$sdate, "_ftime", @@ -197,9 +195,7 @@ compute_nao <- function(data, recipe, obsproj, plot_ts, plot_sp, toptitle <- paste("NAO Index\n", "Lead time", fmonth, " / Start dates", recipe$Analysis$Time$hcst_start, "-", - recipe$Analysis$Time$hcst_end, "\nMethod:", - ifelse(recipe$Analysis$Workflow$Indices$NAO$obsproj, - "Pobs", "Pmod"), "(Doblas-Reyes et al., 2003)") + recipe$Analysis$Time$hcst_end) plotfile <- paste0(recipe$Run$output_dir, "/plots/Indices/NAO_", system, "_", recipe$Analysis$Datasets$Reference$name, "_ftime", diff --git a/tests/recipes/recipe-seasonal_NAO.yml b/tests/recipes/recipe-seasonal_NAO.yml index 95d5a86e..1cccf177 100644 --- a/tests/recipes/recipe-seasonal_NAO.yml +++ b/tests/recipes/recipe-seasonal_NAO.yml @@ -35,7 +35,7 @@ Analysis: cross_validation: no save: none Indices: - NAO: {ftime_avg: no, obsproj: TRUE, save: 'all', plot_ts: TRUE, plot_sp: yes} + NAO: {obsproj: TRUE, save: 'all', plot_ts: TRUE, plot_sp: yes} Calibration: method: raw # Mandatory, str: Calibration method. See docu. save: none -- GitLab