From 2b740366574198c22794c08ab52de749deb3f9ca Mon Sep 17 00:00:00 2001 From: aho Date: Tue, 28 Feb 2023 11:55:57 +0100 Subject: [PATCH] Changes for new HadGEM3 path and structure --- conf/archive_decadal.yml | 8 ++++---- modules/Loading/Loading_decadal.R | 2 +- modules/Loading/testing_recipes/recipe_decadal.yml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/archive_decadal.yml b/conf/archive_decadal.yml index 2b74bff8..6b6ca44a 100644 --- a/conf/archive_decadal.yml +++ b/conf/archive_decadal.yml @@ -91,12 +91,12 @@ archive: first_dcppB_syear: 2019 monthly_mean: table: {"tas":"Amon", "pr":"Amon", "psl":"Amon", "ts":"Amon", "tos":"Omon"} - grid: {"tas":"gr", "psl":"gr", "pr":"gr", "ts":"gr", "tos":"gr"} + grid: {"tas":"gn", "psl":"gr", "pr":"gr", "ts":"gr", "tos":"gr"} #version depends on member and variable - version: {"tas":"v20200316", "psl":"v20200316", "pr":"v20200316", "ts":"v20200316", "tos":"v20200417"} + version: {"tas":"v20200417", "psl":"v20200316", "pr":"v20200316", "ts":"v20200316", "tos":"v20200417"} daily_mean: - grid: {"tas":"gn"} - version: {"tasmin":"v20200101", "tasmax":"v20200101", "pr":"v20200417"} + grid: {"tasmin":"gn", "tasmax":"gn", "pr":"gn"} + version: {"tasmin":"v20200417", "tasmax":"v20200417", "pr":"v20200417"} calendar: "360-day" member: r1i1p1f2,r2i1p1f2,r3i1p1f2,r4i1p1f2,r5i1p1f2,r6i1p1f2,r7i1p1f2,r8i1p1f2,r9i1p1f2,r10i1p1f2 initial_month: 11 diff --git a/modules/Loading/Loading_decadal.R b/modules/Loading/Loading_decadal.R index e3677e1d..b3844159 100644 --- a/modules/Loading/Loading_decadal.R +++ b/modules/Loading/Loading_decadal.R @@ -84,7 +84,7 @@ load_datasets <- function(recipe) { regrid_params <- get_regrid_params(recipe, archive) # Only if the time length in each chunk may differ that we need largest_dims_length to be TRUE. Otherwise, set FALSE to increase efficiency. - need_largest_dims_length <- ifelse(exp.name == 'EC-Earth3-i2', TRUE, FALSE) + need_largest_dims_length <- ifelse(exp.name %in% c('HadGEM3-GC31-MM', 'EC-Earth3-i2'), TRUE, FALSE) #------------------------------------------- diff --git a/modules/Loading/testing_recipes/recipe_decadal.yml b/modules/Loading/testing_recipes/recipe_decadal.yml index 986578f7..f724e25b 100644 --- a/modules/Loading/testing_recipes/recipe_decadal.yml +++ b/modules/Loading/testing_recipes/recipe_decadal.yml @@ -8,8 +8,8 @@ Analysis: freq: monthly_mean Datasets: System: - name: EC-Earth3-i4 #CanESM5 - member: r1i4p1f1,r2i4p1f1,r3i4p1f1 #'all' + name: HadGEM3-GC31-MM #EC-Earth3-i4 #CanESM5 + member: r1i1p1f2,r2i1p1f2,r3i1p1f2 #'all' Multimodel: no Reference: name: ERA5 #JRA-55 @@ -19,7 +19,7 @@ Analysis: hcst_end: 1993 # season: 'Annual' ftime_min: 2 - ftime_max: 14 + ftime_max: 24 Region: latmin: 10 #-90 latmax: 20 #90 -- GitLab