From 4bc6aa142d9ef284637d0fc8e84d78a4800765b6 Mon Sep 17 00:00:00 2001 From: vagudets Date: Thu, 21 Mar 2024 14:22:13 +0100 Subject: [PATCH] Bugfix: load_seasonal(): Make filesystem flexible --- modules/Loading/R/load_decadal.R | 4 ++-- modules/Loading/R/load_seasonal.R | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/Loading/R/load_decadal.R b/modules/Loading/R/load_decadal.R index 0170e9cd..d3b4f439 100644 --- a/modules/Loading/R/load_decadal.R +++ b/modules/Loading/R/load_decadal.R @@ -24,8 +24,8 @@ load_decadal <- function(recipe) { #------------------------- # Read from recipe: #------------------------- - exp.name <- recipe$Analysis$Datasets$System$name #'HadGEM3' - ref.name <- recipe$Analysis$Datasets$Reference$name #'era5' + exp.name <- recipe$Analysis$Datasets$System$name # 'HadGEM3' + ref.name <- recipe$Analysis$Datasets$Reference$name # 'era5' member <- strsplit(recipe$Analysis$Datasets$System$member, ', | |,')[[1]] #c("r1i1p1f2", "r2i1p1f2") # variable <- recipe$Analysis$Variables$name #'tas' variable <- strsplit(recipe$Analysis$Variables$name, ", | |,")[[1]] diff --git a/modules/Loading/R/load_seasonal.R b/modules/Loading/R/load_seasonal.R index 7eb35757..42b74b16 100644 --- a/modules/Loading/R/load_seasonal.R +++ b/modules/Loading/R/load_seasonal.R @@ -46,9 +46,8 @@ load_seasonal <- function(recipe) { ## TODO: define fcst.name ##fcst.name <- recipe$Analysis$Datasets$System[[sys]]$name - # get esarchive datasets dict: - ## TODO: Adapt to 'filesystem' option in recipe - archive <- read_yaml("conf/archive.yml")$esarchive + # get datasets dict: + archive <- read_yaml("conf/archive.yml")[[recipe$Run$filesystem]] exp_descrip <- archive$System[[exp.name]] freq.hcst <- unlist(exp_descrip[[store.freq]][variable[1]]) -- GitLab