diff --git a/conf/archive.yml b/conf/archive.yml index 61f62be230b4ff05021a60a17e38e5e4d446cff9..fcf6b38f93b09c545350318f5ff3ff52db5713bd 100644 --- a/conf/archive.yml +++ b/conf/archive.yml @@ -92,7 +92,7 @@ esarchive: name: "JMA System 2" institution: "European Centre for Medium-Range Weather Forecasts" src: "exp/jma/system2c3s/" - monthly_mean: {"tas":"monthly_mean/tas_f6h/", "prlr":"monthly_mean/prlr_f6h/", + monthly_mean: {"tas":"monthly_mean/tas_f6h/", "prlr":"monthly_mean/prlr_f24h/", "tasmax":"monthly_mean/tasmax_f6h/", "tasmin":"monthly_mean/tasmin_f6h/"} nmember: fcst: 10 @@ -117,7 +117,7 @@ esarchive: institution: "European Centre for Medium-Range Weather Forecasts" src: "exp/ukmo/glosea6_system600-c3s/" monthly_mean: {"tas":"monthly_mean/tas_f6h/", "tasmin":"monthly_mean/tasmin_f24h/", - "tasmax":"monthly_mean/tasmax_f24h/", "prlr":"monthly_mean/prlr_f24h/"} + "tasmax":"monthly_mean/tasmax_f24h/", "prlr":"monthly_mean/prlr_s0-24h/"} nmember: fcst: 62 hcst: 28 @@ -128,7 +128,7 @@ esarchive: name: "NCEP CFSv2" institution: "NOAA NCEP" #? src: "exp/ncep/cfs-v2/" - monthly_mean: {"tas":"monthly_mean/tas_f6h/", "prlr":"monthly_mean/prlr_f6h/", + monthly_mean: {"tas":"monthly_mean/tas_f6h/", "prlr":"monthly_mean/prlr_f24h/", "tasmax":"monthly_mean/tasmax_f6h/", "tasmin":"monthly_mean/tasmin_f6h/"} nmember: fcst: 20 diff --git a/modules/Loading/R/load_seasonal.R b/modules/Loading/R/load_seasonal.R index 42b74b162fd18a066600bf383db7a4805105462e..7b7619cc5d699cb2187a1c0dfd7aa40896183dcb 100644 --- a/modules/Loading/R/load_seasonal.R +++ b/modules/Loading/R/load_seasonal.R @@ -31,14 +31,14 @@ load_seasonal <- function(recipe) { recipe$Analysis$Time$ftime_min, recipe$Analysis$Time$ftime_max, time_freq=store.freq) - + if (!(is.null(sdates$fcst))) { idxs$fcst <- get_timeidx(sdates$fcst, recipe$Analysis$Time$ftime_min, recipe$Analysis$Time$ftime_max, time_freq=store.freq) } - + ## TODO: Examine this verifications part, verify if it's necessary # stream <- verifications$stream # sdates <- verifications$fcst.sdate @@ -97,9 +97,10 @@ load_seasonal <- function(recipe) { } else { split_multiselected_dims = FALSE } - + # Load hindcast #------------------------------------------------------------------- + hcst <- Start(dat = hcst.path, var = variable, var_dir = var_dir_exp, @@ -116,7 +117,7 @@ load_seasonal <- function(recipe) { transform_vars = c('latitude', 'longitude'), synonims = list(latitude = c('lat', 'latitude'), longitude = c('lon', 'longitude'), - ensemble = c('member', 'ensemble')), + ensemble = c('member', 'ensemble', 'lev')), ensemble = indices(1:hcst.nmember), metadata_dims = 'var', # change to just 'var'? return_vars = list(latitude = 'dat', @@ -180,7 +181,7 @@ load_seasonal <- function(recipe) { transform_vars = c('latitude', 'longitude'), synonims = list(latitude = c('lat', 'latitude'), longitude = c('lon', 'longitude'), - ensemble = c('member', 'ensemble')), + ensemble = c('member', 'ensemble', 'lev')), ensemble = indices(1:fcst.nmember), metadata_dims = 'var', return_vars = list(latitude = 'dat', diff --git a/modules/Loading/R/load_tas_tos.R b/modules/Loading/R/load_tas_tos.R index ea231b56d8a00f3833dc7bf9eaa271bc9a97a097..49b7df33eeaaf8c00705a4fba85566fe1bfb29b0 100644 --- a/modules/Loading/R/load_tas_tos.R +++ b/modules/Loading/R/load_tas_tos.R @@ -103,7 +103,7 @@ load_tas_tos <- function(recipe) { longitude_reorder = circularsort, synonims = list(latitude = c('lat', 'latitude'), longitude = c('lon', 'longitude'), - ensemble = c('member', 'ensemble')), + ensemble = c('member', 'ensemble', 'lev')), ensemble = indices(1:hcst.nmember), metadata_dims = 'var', # change to just 'var'? return_vars = list(latitude = 'dat', @@ -184,7 +184,7 @@ load_tas_tos <- function(recipe) { longitude_reorder = circularsort, synonims = list(latitude = c('lat', 'latitude'), longitude = c('lon', 'longitude'), - ensemble = c('member', 'ensemble')), + ensemble = c('member', 'ensemble', 'lev')), ensemble = indices(1:fcst.nmember), metadata_dims = 'var', return_vars = list(latitude = 'dat',