From 9c9380a7fbe7d9dd4409a03fed303e4b4b6bf76d Mon Sep 17 00:00:00 2001 From: remi-kazeroni Date: Tue, 8 Mar 2022 09:33:56 +0100 Subject: [PATCH 1/3] recipe_perfmetrics_land_CMIP5 fixed --- esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml b/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml index 30b7020253..25873712af 100644 --- a/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml +++ b/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml @@ -308,7 +308,7 @@ diagnostics: start_year: 1980 end_year: 1999 additional_datasets: - - {dataset: BNU-ESM} + #- {dataset: BNU-ESM} - {dataset: CanESM2} - {dataset: CESM1-BGC} - {dataset: CMCC-CESM} From 471a86057f535bad02127169f9155790e657a554 Mon Sep 17 00:00:00 2001 From: remi-kazeroni Date: Tue, 8 Mar 2022 09:34:12 +0100 Subject: [PATCH 2/3] recipe_collins13ipcc fixed --- esmvaltool/recipes/recipe_collins13ipcc.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/esmvaltool/recipes/recipe_collins13ipcc.yml b/esmvaltool/recipes/recipe_collins13ipcc.yml index a69f5f1f18..576537a307 100644 --- a/esmvaltool/recipes/recipe_collins13ipcc.yml +++ b/esmvaltool/recipes/recipe_collins13ipcc.yml @@ -166,7 +166,7 @@ diagnostics: - {dataset: BNU-ESM, start_year: 1850, end_year: 2005} - {dataset: CESM1-BGC, start_year: 1850, end_year: 2005} - {dataset: CESM1-CAM5, start_year: 1850, end_year: 2005} - - {dataset: CESM1-CAM5-1-FV2, start_year: 1850, end_year: 2005} + #- {dataset: CESM1-CAM5-1-FV2, start_year: 1850, end_year: 2005} - {dataset: CESM1-FASTCHEM, start_year: 1850, end_year: 2005} - {dataset: CESM1-WACCM, start_year: 1955, end_year: 2005, ensemble: r2i1p1} @@ -627,7 +627,7 @@ diagnostics: - {dataset: CESM1-CAM5, exp: rcp60, start_year: 2006, end_year: 2100} - {dataset: CSIRO-Mk3-6-0, exp: rcp60, start_year: 2006, end_year: 2100} - {dataset: IPSL-CM5A-LR, exp: rcp60, start_year: 2006, end_year: 2100} - - {dataset: GFDL-CM3, exp: rcp60, start_year: 2006, end_year: 2100} + #- {dataset: GFDL-CM3, exp: rcp60, start_year: 2006, end_year: 2100} - {dataset: CanESM2, exp: rcp85, start_year: 2006, end_year: 2100} - {dataset: CCSM4, exp: rcp85, start_year: 2006, end_year: 2100} @@ -3070,8 +3070,8 @@ diagnostics: - {dataset: ACCESS1-3, exp: rcp85, start_year: 2006, end_year: 2100} - {dataset: bcc-csm1-1, exp: historical, start_year: 1960, end_year: 2005} - {dataset: bcc-csm1-1, exp: rcp85, start_year: 2006, end_year: 2100} - - {dataset: bcc-csm1-1-m, exp: historical, start_year: 1960, end_year: 2005} - - {dataset: bcc-csm1-1-m, exp: rcp85, start_year: 2006, end_year: 2100} + #- {dataset: bcc-csm1-1-m, exp: historical, start_year: 1960, end_year: 2005} + #- {dataset: bcc-csm1-1-m, exp: rcp85, start_year: 2006, end_year: 2100} - {dataset: CanESM2, exp: historical, start_year: 1960, end_year: 2005} - {dataset: CanESM2, exp: rcp85, start_year: 2006, end_year: 2100} - {dataset: CCSM4, exp: historical, start_year: 1960, end_year: 2005} @@ -3090,8 +3090,8 @@ diagnostics: - {dataset: GFDL-ESM2G, exp: rcp85, start_year: 2006, end_year: 2100} - {dataset: GFDL-ESM2M, exp: historical, start_year: 1960, end_year: 2005} - {dataset: GFDL-ESM2M, exp: rcp85, start_year: 2006, end_year: 2100} - - {dataset: inmcm4, exp: historical, start_year: 1960, end_year: 2005} - - {dataset: inmcm4, exp: rcp85, start_year: 2006, end_year: 2100} + #- {dataset: inmcm4, exp: historical, start_year: 1960, end_year: 2005} + #- {dataset: inmcm4, exp: rcp85, start_year: 2006, end_year: 2100} - {dataset: IPSL-CM5A-LR, exp: historical, start_year: 1960, end_year: 2005} - {dataset: IPSL-CM5A-LR, exp: rcp85, start_year: 2006, end_year: 2100} - {dataset: IPSL-CM5A-MR, exp: historical, start_year: 1960, end_year: 2005} @@ -3161,7 +3161,7 @@ diagnostics: - {dataset: ACCESS1-0} - {dataset: ACCESS1-3} - {dataset: bcc-csm1-1} - - {dataset: bcc-csm1-1-m} + #- {dataset: bcc-csm1-1-m} - {dataset: CanESM2} - {dataset: CCSM4} - {dataset: CESM1-CAM5} @@ -3171,7 +3171,7 @@ diagnostics: - {dataset: GFDL-CM3} - {dataset: GFDL-ESM2G} - {dataset: GFDL-ESM2M} - - {dataset: inmcm4} + #- {dataset: inmcm4} - {dataset: IPSL-CM5A-LR} - {dataset: IPSL-CM5A-MR} - {dataset: IPSL-CM5B-LR} From 54781802332f0813fcaeb467bdcb0e152871b182 Mon Sep 17 00:00:00 2001 From: remi-kazeroni Date: Tue, 8 Mar 2022 09:43:40 +0100 Subject: [PATCH 3/3] comments added --- esmvaltool/recipes/recipe_collins13ipcc.yml | 16 ++++++++-------- .../recipes/recipe_perfmetrics_land_CMIP5.yml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/esmvaltool/recipes/recipe_collins13ipcc.yml b/esmvaltool/recipes/recipe_collins13ipcc.yml index 576537a307..1ea491d5f8 100644 --- a/esmvaltool/recipes/recipe_collins13ipcc.yml +++ b/esmvaltool/recipes/recipe_collins13ipcc.yml @@ -166,7 +166,7 @@ diagnostics: - {dataset: BNU-ESM, start_year: 1850, end_year: 2005} - {dataset: CESM1-BGC, start_year: 1850, end_year: 2005} - {dataset: CESM1-CAM5, start_year: 1850, end_year: 2005} - #- {dataset: CESM1-CAM5-1-FV2, start_year: 1850, end_year: 2005} + #- {dataset: CESM1-CAM5-1-FV2, start_year: 1850, end_year: 2005} # data is missing on ESGF - {dataset: CESM1-FASTCHEM, start_year: 1850, end_year: 2005} - {dataset: CESM1-WACCM, start_year: 1955, end_year: 2005, ensemble: r2i1p1} @@ -627,7 +627,7 @@ diagnostics: - {dataset: CESM1-CAM5, exp: rcp60, start_year: 2006, end_year: 2100} - {dataset: CSIRO-Mk3-6-0, exp: rcp60, start_year: 2006, end_year: 2100} - {dataset: IPSL-CM5A-LR, exp: rcp60, start_year: 2006, end_year: 2100} - #- {dataset: GFDL-CM3, exp: rcp60, start_year: 2006, end_year: 2100} + #- {dataset: GFDL-CM3, exp: rcp60, start_year: 2006, end_year: 2100} # data is missing on ESGF - {dataset: CanESM2, exp: rcp85, start_year: 2006, end_year: 2100} - {dataset: CCSM4, exp: rcp85, start_year: 2006, end_year: 2100} @@ -3070,8 +3070,8 @@ diagnostics: - {dataset: ACCESS1-3, exp: rcp85, start_year: 2006, end_year: 2100} - {dataset: bcc-csm1-1, exp: historical, start_year: 1960, end_year: 2005} - {dataset: bcc-csm1-1, exp: rcp85, start_year: 2006, end_year: 2100} - #- {dataset: bcc-csm1-1-m, exp: historical, start_year: 1960, end_year: 2005} - #- {dataset: bcc-csm1-1-m, exp: rcp85, start_year: 2006, end_year: 2100} + #- {dataset: bcc-csm1-1-m, exp: historical, start_year: 1960, end_year: 2005} # areacello data missing on ESGF + #- {dataset: bcc-csm1-1-m, exp: rcp85, start_year: 2006, end_year: 2100} # areacello data missing on ESGF - {dataset: CanESM2, exp: historical, start_year: 1960, end_year: 2005} - {dataset: CanESM2, exp: rcp85, start_year: 2006, end_year: 2100} - {dataset: CCSM4, exp: historical, start_year: 1960, end_year: 2005} @@ -3090,8 +3090,8 @@ diagnostics: - {dataset: GFDL-ESM2G, exp: rcp85, start_year: 2006, end_year: 2100} - {dataset: GFDL-ESM2M, exp: historical, start_year: 1960, end_year: 2005} - {dataset: GFDL-ESM2M, exp: rcp85, start_year: 2006, end_year: 2100} - #- {dataset: inmcm4, exp: historical, start_year: 1960, end_year: 2005} - #- {dataset: inmcm4, exp: rcp85, start_year: 2006, end_year: 2100} + #- {dataset: inmcm4, exp: historical, start_year: 1960, end_year: 2005} # areacello data missing on ESGF + #- {dataset: inmcm4, exp: rcp85, start_year: 2006, end_year: 2100} # areacello data missing on ESGF - {dataset: IPSL-CM5A-LR, exp: historical, start_year: 1960, end_year: 2005} - {dataset: IPSL-CM5A-LR, exp: rcp85, start_year: 2006, end_year: 2100} - {dataset: IPSL-CM5A-MR, exp: historical, start_year: 1960, end_year: 2005} @@ -3161,7 +3161,7 @@ diagnostics: - {dataset: ACCESS1-0} - {dataset: ACCESS1-3} - {dataset: bcc-csm1-1} - #- {dataset: bcc-csm1-1-m} + #- {dataset: bcc-csm1-1-m} # areacello data missing on ESGF - {dataset: CanESM2} - {dataset: CCSM4} - {dataset: CESM1-CAM5} @@ -3171,7 +3171,7 @@ diagnostics: - {dataset: GFDL-CM3} - {dataset: GFDL-ESM2G} - {dataset: GFDL-ESM2M} - #- {dataset: inmcm4} + #- {dataset: inmcm4} # areacello data missing on ESGF - {dataset: IPSL-CM5A-LR} - {dataset: IPSL-CM5A-MR} - {dataset: IPSL-CM5B-LR} diff --git a/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml b/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml index 25873712af..792988d229 100644 --- a/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml +++ b/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml @@ -308,7 +308,7 @@ diagnostics: start_year: 1980 end_year: 1999 additional_datasets: - #- {dataset: BNU-ESM} + #- {dataset: BNU-ESM} # data is missing on ESGF - {dataset: CanESM2} - {dataset: CESM1-BGC} - {dataset: CMCC-CESM}