diff --git a/esmvaltool/diag_scripts/iht_toa/single_model_diagnostics.py b/esmvaltool/diag_scripts/iht_toa/single_model_diagnostics.py index e4a7bdd1d6..e5efc94f0a 100644 --- a/esmvaltool/diag_scripts/iht_toa/single_model_diagnostics.py +++ b/esmvaltool/diag_scripts/iht_toa/single_model_diagnostics.py @@ -448,8 +448,8 @@ def efp_maps(iht, model, experiment, cfg): wlevstep=3, vmin=-0.3, vmax=0.3, - title=[['$P_{TOA}^{SWup, clr}$', '$Delta CRE_{TOA}^{SWup, clr}$'], - ['$P_{TOA}^{SWup, all}$', '$Delta CRE_{TOA}^{SWup, all}$']]) + title=[['$P_{TOA}^{SWup, clr}$', r'$\Delta CRE_{TOA}^{SWup, clr}$'], + ['$P_{TOA}^{SWup, all}$', r'$\Delta CRE_{TOA}^{SWup, all}$']]) provenance_record = get_provenance_record(plot_type='map', ancestor_files=iht.flx_files) figname = "efp_and_flux_toa_rsut_{}_{}".format(model, experiment) @@ -496,9 +496,6 @@ def main(cfg): # Solve Poisson equation for each dataset for model_name in model_dataset: - if model_name == 'CERES-EBAF': - # Ignore any observational data - continue logger.info("Processing model data: %s", model_name) iht[model_name] = compute_efp_and_mht(model_dataset[model_name]) diff --git a/esmvaltool/recipes/recipe_iht_toa.yml b/esmvaltool/recipes/recipe_iht_toa.yml index acc624613b..163a8af268 100644 --- a/esmvaltool/recipes/recipe_iht_toa.yml +++ b/esmvaltool/recipes/recipe_iht_toa.yml @@ -48,24 +48,13 @@ documentation: - esmval datasets: - - {dataset: BCC-ESM1, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} - #- {dataset: FGOALS-g3, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} - #- {dataset: IITM-ESM, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} - #- {dataset: CNRM-ESM2-1, project: CMIP6, exp: amip, ensemble: r1i1p1f2, grid: gn, mip: Amon} - #- {dataset: CNRM-CM6-1, project: CMIP6, exp: amip, ensemble: r1i1p1f2, grid: gn, mip: Amon} - #- {dataset: ACCESS-ESM1-5, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} - #- {dataset: ACCESS-CM2, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} - #- {dataset: MPI-ESM-1-2-HAM, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} - #- {dataset: IPSL-CM6A-LR, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} - #- {dataset: MIROC6, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} - #- {dataset: HadGEM3-GC31-LL, project: CMIP6, exp: amip, ensemble: r1i1p1f3, grid: gn, mip: Amon} - #- {dataset: UKESM1-0-LL, project: CMIP6, exp: amip, ensemble: r1i1p1f4, grid: gn, mip: Amon} - #- {dataset: MPI-ESM1-2-LR, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} - #- {dataset: GISS-E2-1-G, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} - #- {dataset: CESM2-FV2,project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} - #- {dataset: NorCPM1, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} - #- {dataset: NorESM2-LM, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} - #- {dataset: NESM3, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} + # - {dataset: BCC-ESM1, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} + - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7, tier: 1, start_year: 2001, end_year: 2010} + # - {dataset: MPI-ESM-1-2-HAM, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} + # - {dataset: IPSL-CM6A-LR, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} + # - {dataset: MIROC6, project: CMIP6, exp: amip, ensemble: r1i1p1f1, grid: gn, mip: Amon} + # - {dataset: HadGEM3-GC31-LL, project: CMIP6, exp: amip, ensemble: r1i1p1f3, grid: gn, mip: Amon} + # - {dataset: UKESM1-0-LL, project: CMIP6, exp: amip, ensemble: r1i1p1f4, grid: gn, mip: Amon} preprocessors: @@ -107,45 +96,30 @@ diagnostics: preprocessor: climate_mean_global start_year: 2001 end_year: 2005 - additional_datasets: - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7, tier: 1, - start_year: 2001, end_year: 2010} rlutcs: short_name: rlutcs mip: Amon preprocessor: climate_mean_global start_year: 2001 end_year: 2005 - additional_datasets: - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7, tier: 1, - start_year: 2001, end_year: 2010} rsutcs: short_name: rsutcs mip: Amon preprocessor: climate_mean_global start_year: 2001 end_year: 2005 - additional_datasets: - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7, tier: 1, - start_year: 2001, end_year: 2010} rsut: short_name: rsut mip: Amon preprocessor: climate_mean_global start_year: 2001 end_year: 2005 - additional_datasets: - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7, tier: 1, - start_year: 2001, end_year: 2010} rsdt: short_name: rsdt mip: Amon preprocessor: climate_mean_global start_year: 2001 end_year: 2005 - additional_datasets: - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7, tier: 1, - start_year: 2001, end_year: 2010} netcre: derive: true short_name: netcre @@ -170,5 +144,5 @@ diagnostics: scripts: single_model: script: iht_toa/single_model_diagnostics.py - #multi_model: - # script: iht_toa/multi_model_diagnostics.py +# multi_model: +# script: iht_toa/multi_model_diagnostics.py