From 6a8eb60473888b9bf77f2ba71e6145c4ae098e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ckatjaweigel=E2=80=9D?= <“weigel@iup.physik.uni-bremen.de”> Date: Mon, 3 May 2021 14:56:06 +0200 Subject: [PATCH 1/7] Python morizers for CDR2 and CDR1 ESACCI H2O (TCWV=prw) data. --- .../obs/cmor_config/ESACCI-TCWV-CDR1.yml | 30 ++++++++ .../cmorizers/obs/cmor_config/ESACCI-TCWV.yml | 30 ++++++++ .../cmorizers/obs/cmorize_obs_esacci_tcwv.py | 77 +++++++++++++++++++ .../obs/cmorize_obs_esacci_tcwv_cdr1.py | 28 +++++++ 4 files changed, 165 insertions(+) create mode 100644 esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV-CDR1.yml create mode 100644 esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV.yml create mode 100644 esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv.py create mode 100644 esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv_cdr1.py diff --git a/esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV-CDR1.yml b/esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV-CDR1.yml new file mode 100644 index 0000000000..14b24ba0a2 --- /dev/null +++ b/esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV-CDR1.yml @@ -0,0 +1,30 @@ +--- +# Common global attributes for Cmorizer output +# ESACCI-WATERVAPOUR-L3S-TCWV-olci-cmsaf_hoaps-05deg-201708-fv3.1.nc +# ESACCI SST Namen +# Rawobs: 20010416120000-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_LT-v02.0-fv01.1.nc +# oder 20190215_regridded_sst.nc +# OBS: OBS_ESACCI-SST_sat_L4-GHRSST-SSTdepth-OSTIA-GLOB_Amon_tsStderr_200910-200910.nc +# oder OBS_ESACCI-SST_sat_2.2_Amon_ts_200801-200812.nc + +# Input +filename: 'ESACCI-WATERVAPOUR-L3?-TCWV-*-05deg-{year}{month}-fv3.1.nc' +attributes: + dataset_id: ESACCI-TCWV-CDR1 + version: 'L3-05deg_fv3.1' + tier: 3 + modeling_realm: sat + project_id: OBS + source: "TBD" + reference: [""] + comment: "" + +# Variables to cmorize (here use only filename prefix) +variables: + prw: + mip: Amon + raw: tcwv + # Output automatially added: Amon__200910-200910.nc + file: OBS_ESACCI-WATERVAPOUR-L3-CDR1-TCWV-05deg + start_year: 2003 + end_year: 2017 diff --git a/esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV.yml b/esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV.yml new file mode 100644 index 0000000000..9bd8d63e4e --- /dev/null +++ b/esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV.yml @@ -0,0 +1,30 @@ +--- +# Common global attributes for Cmorizer output +# ESACCI-WATERVAPOUR-L3S-TCWV-olci-cmsaf_hoaps-05deg-201708-fv3.1.nc +# ESACCI SST Namen +# Rawobs: 20010416120000-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_LT-v02.0-fv01.1.nc +# oder 20190215_regridded_sst.nc +# OBS: OBS_ESACCI-SST_sat_L4-GHRSST-SSTdepth-OSTIA-GLOB_Amon_tsStderr_200910-200910.nc +# oder OBS_ESACCI-SST_sat_2.2_Amon_ts_200801-200812.nc + +# Input +filename: 'ESACCI-WATERVAPOUR-L3S-TCWV-*-05deg-{year}{month}-fv3.1.nc' +attributes: + dataset_id: ESACCI-TCWV + version: 'L3S-05deg_fv3.1' + tier: 3 + modeling_realm: sat + project_id: OBS + source: "TBD" + reference: [""] + comment: "" + +# Variables to cmorize (here use only filename prefix) +variables: + prw: + mip: Amon + raw: tcwv + # Output automatially added: Amon__200910-200910.nc + file: OBS_ESACCI-WATERVAPOUR-L3S-TCWV-05deg + start_year: 2003 + end_year: 2017 diff --git a/esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv.py b/esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv.py new file mode 100644 index 0000000000..dce6ce420b --- /dev/null +++ b/esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv.py @@ -0,0 +1,77 @@ +"""ESMValTool CMORizer for ESACCI-TCWV data. + +Tier + Tier 3: currently still restricted because preliminary. + +Source + Marc Schröder, ftp.brockmann-consult.de + +Last access + 20212903 + +Download and processing instructions + TBD + +Modification history + 20210408-weigel_katja: written. + +""" + +import logging +import os + +import iris + +from esmvalcore.preprocessor import concatenate +from esmvaltool.cmorizers.obs.utilities import (convert_timeunits, fix_coords, + fix_var_metadata, + save_variable, set_global_atts) + +logger = logging.getLogger(__name__) + + +def extract_variable(var_info, raw_info, attrs, year): + """Extract to all vars.""" + cubes = iris.load(raw_info['file']) + rawvar = raw_info['name'] + + for cube in cubes: + if cube.var_name == rawvar: + fix_var_metadata(cube, var_info) + convert_timeunits(cube, year) + fix_coords(cube) + set_global_atts(cube, attrs) + # Remove disfunctional ancillary data without sandard name + for ancillary_variable_, dim in cube._ancillary_variables_and_dims: + cube.remove_ancillary_variable(ancillary_variable_) + return cube + + +def cmorization(in_dir, out_dir, cfg, _): + """Cmorize data.""" + # cmor_table = cfg['cmor_table'] + glob_attrs = cfg['attributes'] + + # run the cmorization + for var, vals in cfg['variables'].items(): + var_info = cfg['cmor_table'].get_variable(vals['mip'], var) + glob_attrs['mip'] = vals['mip'] + raw_info = {'name': vals['raw'], 'file': vals['file']} + inpfile = os.path.join(in_dir, cfg['filename']) + logger.info("CMORizing var %s from file type %s", var, inpfile) + # years = range(vals['start_year'], vals['end_year'] + 1) + months = ["0" + str(mo) for mo in range(1, 10)] + ["10", "11", "12"] + for year in range(vals['start_year'], vals['end_year'] + 1): + monthly_cubes = [] + for month in months: + raw_info['file'] = inpfile.format(year=year, month=month) + logger.info("CMORizing var %s from file type %s", var, + raw_info['file']) + cube = extract_variable(var_info, raw_info, glob_attrs, year) + monthly_cubes.append(cube) + # yearly_cube = concatenate(monthly_cubes) + save_variable(concatenate(monthly_cubes), + var, + out_dir, + glob_attrs, + unlimited_dimensions=['time']) diff --git a/esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv_cdr1.py b/esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv_cdr1.py new file mode 100644 index 0000000000..dfeb56c93f --- /dev/null +++ b/esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv_cdr1.py @@ -0,0 +1,28 @@ +"""ESMValTool CMORizer for ESACCI-TCWV-CDR1 data. + +Tier + Tier 3: currently still restricted because preliminary. + +Source + Marc Schröder, ftp.brockmann-consult.de + +Last access + 20212903 + +Download and processing instructions + TBD + +Modification history + 20210408-weigel_katja: written. + +""" + +import logging + +from esmvaltool.cmorizers.obs.cmorize_obs_esacci_tcwv import (cmorization, + extract_variable) + +logger = logging.getLogger(__name__) +logger.info("Load def from cmorize_obs_esacci_tcwv.py") +logger.info(extract_variable) +logger.info(cmorization) From 645d7ffda95bc6dffa524ab97d454b4181cb47e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ckatjaweigel=E2=80=9D?= <“weigel@iup.physik.uni-bremen.de”> Date: Mon, 7 Jun 2021 15:30:35 +0200 Subject: [PATCH 2/7] Fix time bounds and rename from ...TCWV to ...WATERVAPOUR. --- .../obs/cmor_config/ESACCI-TCWV-CDR1.yml | 30 ---------------- .../cmorizers/obs/cmor_config/ESACCI-TCWV.yml | 30 ---------------- .../obs/cmor_config/ESACCI-WATERVAPOUR.yml | 34 +++++++++++++++++++ .../obs/cmorize_obs_esacci_tcwv_cdr1.py | 28 --------------- ...v.py => cmorize_obs_esacci_watervapour.py} | 16 ++++++--- .../references/esacci-watervapour.bibtex | 10 ++++++ 6 files changed, 55 insertions(+), 93 deletions(-) delete mode 100644 esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV-CDR1.yml delete mode 100644 esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV.yml create mode 100644 esmvaltool/cmorizers/obs/cmor_config/ESACCI-WATERVAPOUR.yml delete mode 100644 esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv_cdr1.py rename esmvaltool/cmorizers/obs/{cmorize_obs_esacci_tcwv.py => cmorize_obs_esacci_watervapour.py} (81%) create mode 100644 esmvaltool/references/esacci-watervapour.bibtex diff --git a/esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV-CDR1.yml b/esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV-CDR1.yml deleted file mode 100644 index 14b24ba0a2..0000000000 --- a/esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV-CDR1.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# Common global attributes for Cmorizer output -# ESACCI-WATERVAPOUR-L3S-TCWV-olci-cmsaf_hoaps-05deg-201708-fv3.1.nc -# ESACCI SST Namen -# Rawobs: 20010416120000-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_LT-v02.0-fv01.1.nc -# oder 20190215_regridded_sst.nc -# OBS: OBS_ESACCI-SST_sat_L4-GHRSST-SSTdepth-OSTIA-GLOB_Amon_tsStderr_200910-200910.nc -# oder OBS_ESACCI-SST_sat_2.2_Amon_ts_200801-200812.nc - -# Input -filename: 'ESACCI-WATERVAPOUR-L3?-TCWV-*-05deg-{year}{month}-fv3.1.nc' -attributes: - dataset_id: ESACCI-TCWV-CDR1 - version: 'L3-05deg_fv3.1' - tier: 3 - modeling_realm: sat - project_id: OBS - source: "TBD" - reference: [""] - comment: "" - -# Variables to cmorize (here use only filename prefix) -variables: - prw: - mip: Amon - raw: tcwv - # Output automatially added: Amon__200910-200910.nc - file: OBS_ESACCI-WATERVAPOUR-L3-CDR1-TCWV-05deg - start_year: 2003 - end_year: 2017 diff --git a/esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV.yml b/esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV.yml deleted file mode 100644 index 9bd8d63e4e..0000000000 --- a/esmvaltool/cmorizers/obs/cmor_config/ESACCI-TCWV.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# Common global attributes for Cmorizer output -# ESACCI-WATERVAPOUR-L3S-TCWV-olci-cmsaf_hoaps-05deg-201708-fv3.1.nc -# ESACCI SST Namen -# Rawobs: 20010416120000-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_LT-v02.0-fv01.1.nc -# oder 20190215_regridded_sst.nc -# OBS: OBS_ESACCI-SST_sat_L4-GHRSST-SSTdepth-OSTIA-GLOB_Amon_tsStderr_200910-200910.nc -# oder OBS_ESACCI-SST_sat_2.2_Amon_ts_200801-200812.nc - -# Input -filename: 'ESACCI-WATERVAPOUR-L3S-TCWV-*-05deg-{year}{month}-fv3.1.nc' -attributes: - dataset_id: ESACCI-TCWV - version: 'L3S-05deg_fv3.1' - tier: 3 - modeling_realm: sat - project_id: OBS - source: "TBD" - reference: [""] - comment: "" - -# Variables to cmorize (here use only filename prefix) -variables: - prw: - mip: Amon - raw: tcwv - # Output automatially added: Amon__200910-200910.nc - file: OBS_ESACCI-WATERVAPOUR-L3S-TCWV-05deg - start_year: 2003 - end_year: 2017 diff --git a/esmvaltool/cmorizers/obs/cmor_config/ESACCI-WATERVAPOUR.yml b/esmvaltool/cmorizers/obs/cmor_config/ESACCI-WATERVAPOUR.yml new file mode 100644 index 0000000000..bad81d03d3 --- /dev/null +++ b/esmvaltool/cmorizers/obs/cmor_config/ESACCI-WATERVAPOUR.yml @@ -0,0 +1,34 @@ +--- +# Common global attributes for Cmorizer output + + +# Input +# CDR-2 +filename: 'ESACCI-WATERVAPOUR-L3S-TCWV-*-05deg-{year}{month}-fv3.1.nc' +# CDR-1 +# filename: 'dataset3_1/CDR-1/monthlies/ESACCI-WATERVAPOUR-L3?-TCWV-*-05deg-{year}{month}-fv3.1.nc' +attributes: + dataset_id: ESACCI-WATERVAPOUR + # CDR-2 + version: 'CDR2-L3S-05deg_fv3.1' + # CDR-1 + # version: 'CDR1-L3-05deg_fv3.1' + tier: 3 + modeling_realm: sat + project_id: OBS + source: "ftp.brockmann-consult.de, access currently restrictet" + reference: ["esacci-watervapour"] + comment: "Preliminary data." + +# Variables to cmorize (here use only filename prefix) +variables: + prw: + mip: Amon + raw: tcwv + # Output automatially added: Amon__200910-200910.nc + # CDR-2 + file: OBS_ESACCI-WATERVAPOUR-CDR2-L3S-TCWV-05deg + # CDR-1 + # file: OBS_ESACCI-WATERVAPOUR-CDR1-L3-TCWV-05deg + start_year: 2003 + end_year: 2017 diff --git a/esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv_cdr1.py b/esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv_cdr1.py deleted file mode 100644 index dfeb56c93f..0000000000 --- a/esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv_cdr1.py +++ /dev/null @@ -1,28 +0,0 @@ -"""ESMValTool CMORizer for ESACCI-TCWV-CDR1 data. - -Tier - Tier 3: currently still restricted because preliminary. - -Source - Marc Schröder, ftp.brockmann-consult.de - -Last access - 20212903 - -Download and processing instructions - TBD - -Modification history - 20210408-weigel_katja: written. - -""" - -import logging - -from esmvaltool.cmorizers.obs.cmorize_obs_esacci_tcwv import (cmorization, - extract_variable) - -logger = logging.getLogger(__name__) -logger.info("Load def from cmorize_obs_esacci_tcwv.py") -logger.info(extract_variable) -logger.info(cmorization) diff --git a/esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv.py b/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py similarity index 81% rename from esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv.py rename to esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py index dce6ce420b..6ca2f988ef 100644 --- a/esmvaltool/cmorizers/obs/cmorize_obs_esacci_tcwv.py +++ b/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py @@ -1,4 +1,4 @@ -"""ESMValTool CMORizer for ESACCI-TCWV data. +"""ESMValTool CMORizer for ESACCI-WATERVAPOUR data. Tier Tier 3: currently still restricted because preliminary. @@ -7,12 +7,15 @@ Marc Schröder, ftp.brockmann-consult.de Last access - 20212903 + 20210329 Download and processing instructions - TBD + FTP server: ftp.brockmann-consult.de, access currently restrictet + data/tcwv/dataset3_1/CDR-*/... + All files need to be in one directory, not in yearly subdirectories. Modification history + 20210607-weigel_katja: Fix for monthly time bounds. 20210408-weigel_katja: written. """ @@ -69,8 +72,11 @@ def cmorization(in_dir, out_dir, cfg, _): raw_info['file']) cube = extract_variable(var_info, raw_info, glob_attrs, year) monthly_cubes.append(cube) - # yearly_cube = concatenate(monthly_cubes) - save_variable(concatenate(monthly_cubes), + yearly_cube = concatenate(monthly_cubes) + # Fix monthly time bounds + fix_coords(yearly_cube, overwrite_lon_bounds=False, + overwrite_lat_bounds=False) + save_variable(yearly_cube, var, out_dir, glob_attrs, diff --git a/esmvaltool/references/esacci-watervapour.bibtex b/esmvaltool/references/esacci-watervapour.bibtex new file mode 100644 index 0000000000..bdccb12a5e --- /dev/null +++ b/esmvaltool/references/esacci-watervapour.bibtex @@ -0,0 +1,10 @@ +@misc{esacci-watervapour, + doi = {CCIWV.REP.015}, + url = {https://climate.esa.int/documents/357/Water_Vapour_cci_D4.2_CRDP_v2.1.pdf}, + year = 2020, + month = {october}, + publisher = {ESA / ECSAT}, + issue = {2.1}, + author = {Michaela Hegglin, Olaf Danne, Marc Schröder, Hao Ye}, + title = {Climate Research Data Package (CRDP) Water Vapour Climate Change Initiative (WV{\_}cci)- CCI+ Phase 1} +} From 058f0a351edd7b656acc45b69cf11e4a4c50545e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ckatjaweigel=E2=80=9D?= <“weigel@iup.physik.uni-bremen.de”> Date: Fri, 18 Jun 2021 10:36:08 +0200 Subject: [PATCH 3/7] Using core function (esmvalcore.cmor.check _get_time_bounds) for time bounds. --- esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py b/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py index 6ca2f988ef..849bbebf15 100644 --- a/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py +++ b/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py @@ -26,6 +26,7 @@ import iris from esmvalcore.preprocessor import concatenate +from esmvalcore.cmor.check import _get_time_bounds from esmvaltool.cmorizers.obs.utilities import (convert_timeunits, fix_coords, fix_var_metadata, save_variable, set_global_atts) @@ -74,8 +75,7 @@ def cmorization(in_dir, out_dir, cfg, _): monthly_cubes.append(cube) yearly_cube = concatenate(monthly_cubes) # Fix monthly time bounds - fix_coords(yearly_cube, overwrite_lon_bounds=False, - overwrite_lat_bounds=False) + yearly_cube.coord('time').bounds = _get_time_bounds(yearly_cube.coord('time'), 'mon') save_variable(yearly_cube, var, out_dir, From 01c1ae761302187d50d9357b7b02c7e7ecbdb3e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Ckatjaweigel=E2=80=9D?= <“weigel@iup.physik.uni-bremen.de”> Date: Fri, 18 Jun 2021 10:47:03 +0200 Subject: [PATCH 4/7] Prospector fix. --- .../cmorizers/obs/cmorize_obs_esacci_watervapour.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py b/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py index 849bbebf15..02af597594 100644 --- a/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py +++ b/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py @@ -43,7 +43,7 @@ def extract_variable(var_info, raw_info, attrs, year): if cube.var_name == rawvar: fix_var_metadata(cube, var_info) convert_timeunits(cube, year) - fix_coords(cube) + fix_coords(cube, overwrite_time_bounds=False) set_global_atts(cube, attrs) # Remove disfunctional ancillary data without sandard name for ancillary_variable_, dim in cube._ancillary_variables_and_dims: @@ -71,11 +71,12 @@ def cmorization(in_dir, out_dir, cfg, _): raw_info['file'] = inpfile.format(year=year, month=month) logger.info("CMORizing var %s from file type %s", var, raw_info['file']) - cube = extract_variable(var_info, raw_info, glob_attrs, year) - monthly_cubes.append(cube) + monthly_cubes.append(extract_variable(var_info, raw_info, + glob_attrs, year)) yearly_cube = concatenate(monthly_cubes) # Fix monthly time bounds - yearly_cube.coord('time').bounds = _get_time_bounds(yearly_cube.coord('time'), 'mon') + time = yearly_cube.coord('time') + time.bounds = _get_time_bounds(time, 'mon') save_variable(yearly_cube, var, out_dir, From 594bd147da0c8572e423e5b53d9953f1296b26a3 Mon Sep 17 00:00:00 2001 From: Axel Lauer Date: Tue, 22 Jun 2021 12:57:07 +0200 Subject: [PATCH 5/7] Update esmvaltool/cmorizers/obs/cmor_config/ESACCI-WATERVAPOUR.yml --- esmvaltool/cmorizers/obs/cmor_config/ESACCI-WATERVAPOUR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esmvaltool/cmorizers/obs/cmor_config/ESACCI-WATERVAPOUR.yml b/esmvaltool/cmorizers/obs/cmor_config/ESACCI-WATERVAPOUR.yml index bad81d03d3..400fb7e8da 100644 --- a/esmvaltool/cmorizers/obs/cmor_config/ESACCI-WATERVAPOUR.yml +++ b/esmvaltool/cmorizers/obs/cmor_config/ESACCI-WATERVAPOUR.yml @@ -16,7 +16,7 @@ attributes: tier: 3 modeling_realm: sat project_id: OBS - source: "ftp.brockmann-consult.de, access currently restrictet" + source: "ftp.brockmann-consult.de, access currently restricted" reference: ["esacci-watervapour"] comment: "Preliminary data." From 9f35f3bf88f563865be4206d7362bc8201066e35 Mon Sep 17 00:00:00 2001 From: Axel Lauer Date: Tue, 22 Jun 2021 12:57:16 +0200 Subject: [PATCH 6/7] Update esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py --- esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py b/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py index 02af597594..a3852f6885 100644 --- a/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py +++ b/esmvaltool/cmorizers/obs/cmorize_obs_esacci_watervapour.py @@ -10,7 +10,7 @@ 20210329 Download and processing instructions - FTP server: ftp.brockmann-consult.de, access currently restrictet + FTP server: ftp.brockmann-consult.de, access currently restricted data/tcwv/dataset3_1/CDR-*/... All files need to be in one directory, not in yearly subdirectories. From 3210babd451530cb1f30a1559133b3a679b480ff Mon Sep 17 00:00:00 2001 From: Axel Lauer Date: Tue, 22 Jun 2021 13:09:19 +0200 Subject: [PATCH 7/7] updated recipe_check_obs.yml + input.rst --- doc/sphinx/source/input.rst | 2 ++ esmvaltool/recipes/examples/recipe_check_obs.yml | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/doc/sphinx/source/input.rst b/doc/sphinx/source/input.rst index d1aa66fcd6..a6cbfa0e58 100644 --- a/doc/sphinx/source/input.rst +++ b/doc/sphinx/source/input.rst @@ -222,6 +222,8 @@ A list of the datasets for which a cmorizers is available is provided in the fol +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+ | ESACCI-SST | ts, tsStderr (Amon) | 2 | NCL | +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+ +| ESACCI-WATERVAPOUR | prw (Amon) | 3 | Python | ++------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+ | ESRL | co2s (Amon) | 2 | NCL | +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+ | FLUXCOM | gpp (Lmon) | 3 | Python | diff --git a/esmvaltool/recipes/examples/recipe_check_obs.yml b/esmvaltool/recipes/examples/recipe_check_obs.yml index adedde1fa1..45e08dc2f4 100644 --- a/esmvaltool/recipes/examples/recipe_check_obs.yml +++ b/esmvaltool/recipes/examples/recipe_check_obs.yml @@ -1117,6 +1117,17 @@ diagnostics: scripts: null + ESACCI-WATERVAPOUR: + description: ESACCI-WV check + variables: + prw: + additional_datasets: + - {dataset: ESACCI-WATERVAPOUR, project: OBS, mip: Amon, tier: 3, + type: sat, version: CDR2-L3S-05deg_fv3.1, + start_year: 2003, end_year: 2017} + scripts: null + + GRACE: description: GRACE check variables: