From 9801a1a95f8ee770d28839ca6d60b37ae9732d02 Mon Sep 17 00:00:00 2001 From: vagudets Date: Fri, 13 Jun 2025 15:00:45 +0200 Subject: [PATCH 1/2] Fix recipe call to custom dictionary --- modules/Visualization/R/plot_extreme_probs.R | 3 ++- modules/Visualization/R/plot_forecast_map.R | 2 +- modules/Visualization/R/plot_metrics.R | 2 +- modules/Visualization/R/plot_most_likely_terciles_map.R | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/Visualization/R/plot_extreme_probs.R b/modules/Visualization/R/plot_extreme_probs.R index 1883f96e..49cd8175 100644 --- a/modules/Visualization/R/plot_extreme_probs.R +++ b/modules/Visualization/R/plot_extreme_probs.R @@ -91,9 +91,10 @@ plot_extreme_probs <- function(recipe, fcst, # Loop over bin dimension for (bin in 1:dim(probs_array)["bin"]) { variable <- fcst$attrs$Variable$varName[[var]] + custom_dictionary <- recipe$Analysis$Workflow$Visualization$custom_dictionary var_long_name <- .get_variable_longname(data_cube = fcst, index = var, - format = NULL) ## TODO: change + format = custom_dictionary) # Subset ensemble mean by variable var_fcst <- ClimProjDiags::Subset(probs_array, along = c("bin", "var"), diff --git a/modules/Visualization/R/plot_forecast_map.R b/modules/Visualization/R/plot_forecast_map.R index f683f704..57472a1f 100644 --- a/modules/Visualization/R/plot_forecast_map.R +++ b/modules/Visualization/R/plot_forecast_map.R @@ -78,7 +78,7 @@ plot_forecast_map <- function(recipe, fcst, mask = NULL, dots = NULL, # Loop over variable dimension for (var in 1:fcst$dims[['var']]) { variable <- fcst$attrs$Variable$varName[[var]] - custom_dictionary <- recipe$Analysis$Visualization$custom_dictionary + custom_dictionary <- recipe$Analysis$$Workflow$Visualization$custom_dictionary var_long_name <- .get_variable_longname(data_cube = fcst, index = var, format = custom_dictionary) diff --git a/modules/Visualization/R/plot_metrics.R b/modules/Visualization/R/plot_metrics.R index 1b1cd5b5..7bb064b3 100644 --- a/modules/Visualization/R/plot_metrics.R +++ b/modules/Visualization/R/plot_metrics.R @@ -257,7 +257,7 @@ plot_metrics <- function(recipe, data_cube, metrics, # Get variable name and long name var_name <- data_cube$attrs$Variable$varName[[var]] - custom_dictionary <- recipe$Analysis$Visualization$custom_dictionary + custom_dictionary <- recipe$Analysis$Workflow$Visualization$custom_dictionary var_long_name <- .get_variable_longname(data_cube = data_cube, index = var, format = custom_dictionary) diff --git a/modules/Visualization/R/plot_most_likely_terciles_map.R b/modules/Visualization/R/plot_most_likely_terciles_map.R index e7bdbc25..cf9ad7ad 100644 --- a/modules/Visualization/R/plot_most_likely_terciles_map.R +++ b/modules/Visualization/R/plot_most_likely_terciles_map.R @@ -95,7 +95,7 @@ plot_most_likely_terciles <- function(recipe, for (var in 1:fcst$dims[['var']]) { ## NOTE: Variables starting with var_* represent the variable counter. variable <- fcst$attrs$Variable$varName[[var]] - custom_dictionary <- recipe$Analysis$Visualization$custom_dictionary + custom_dictionary <- recipe$Analysis$Workflow$Visualization$custom_dictionary var_long_name <- .get_variable_longname(data_cube = fcst, index = var, format = custom_dictionary) -- GitLab From 1479332df36654dc133ca39a750e17d561069f06 Mon Sep 17 00:00:00 2001 From: vagudets Date: Fri, 13 Jun 2025 15:02:46 +0200 Subject: [PATCH 2/2] Fix typo --- modules/Visualization/R/plot_forecast_map.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Visualization/R/plot_forecast_map.R b/modules/Visualization/R/plot_forecast_map.R index 57472a1f..892f0fda 100644 --- a/modules/Visualization/R/plot_forecast_map.R +++ b/modules/Visualization/R/plot_forecast_map.R @@ -78,7 +78,7 @@ plot_forecast_map <- function(recipe, fcst, mask = NULL, dots = NULL, # Loop over variable dimension for (var in 1:fcst$dims[['var']]) { variable <- fcst$attrs$Variable$varName[[var]] - custom_dictionary <- recipe$Analysis$$Workflow$Visualization$custom_dictionary + custom_dictionary <- recipe$Analysis$Workflow$Visualization$custom_dictionary var_long_name <- .get_variable_longname(data_cube = fcst, index = var, format = custom_dictionary) -- GitLab