diff --git a/esmvaltool/cmorizers/data/cmor_config/OceanSODA-ETHZ.yml b/esmvaltool/cmorizers/data/cmor_config/OceanSODA-ETHZ.yml index 87752e3947..b037a3428e 100644 --- a/esmvaltool/cmorizers/data/cmor_config/OceanSODA-ETHZ.yml +++ b/esmvaltool/cmorizers/data/cmor_config/OceanSODA-ETHZ.yml @@ -1,10 +1,8 @@ --- # Common global attributes for Cmorizer output -# Note that the filename says version 'v2021a', but the file attribute and the -# documentation says 'v2021e'. Therefore, we use 'v2021e' here. attributes: dataset_id: OceanSODA-ETHZ - version: v2021e + version: v2023 tier: 2 modeling_realm: reanaly project_id: OBS6 @@ -14,35 +12,35 @@ attributes: # Variables to cmorize variables: areacello: - filename: OceanSODA-ETHZ_GRaCER_v2021a_1982-2020.nc + filename: OceanSODA_ETHZ-v2023.OCADS.01_1982-2022.nc mip: Ofx raw_name: area co3os: - filename: OceanSODA-ETHZ_GRaCER_v2021a_1982-2020.nc + filename: OceanSODA_ETHZ-v2023.OCADS.01_1982-2022.nc mip: Omon raw_name: co3 raw_units: '1e-6 mol kg-1' comment: 'The original units of this variable are mumol/kg. To convert to the CMOR units mol/m3, we assume a constant sea water density of 1028 kg/m3, which is approximately the sea water density for T=4°C, salinity=35PSU, and p=0bar according to the UNESCO formula (UNESCO, 1981, Tenth report of the joint panel on oceanographic tables and standards, UNESCO Technical Papers in Marine Science, see https://www.wkcgroup.com/tools-room/seawater-density-calculator/ and https://link.springer.com/content/pdf/bbm:978-3-319-18908-6/1.pdf).' dissicos: - filename: OceanSODA-ETHZ_GRaCER_v2021a_1982-2020.nc + filename: OceanSODA_ETHZ-v2023.OCADS.01_1982-2022.nc mip: Omon raw_name: dic raw_units: '1e-6 mol kg-1' comment: 'The original units of this variable are mumol/kg. To convert to the CMOR units mol/m3, we assume a constant sea water density of 1028 kg/m3, which is approximately the sea water density for T=4°C, salinity=35PSU, and p=0bar according to the UNESCO formula (UNESCO, 1981, Tenth report of the joint panel on oceanographic tables and standards, UNESCO Technical Papers in Marine Science, see https://www.wkcgroup.com/tools-room/seawater-density-calculator/ and https://link.springer.com/content/pdf/bbm:978-3-319-18908-6/1.pdf).' fgco2: - filename: OceanSODA-ETHZ_GRaCER_v2021a_1982-2020.nc + filename: OceanSODA_ETHZ-v2023.OCADS.01_1982-2022.nc mip: Omon phos: - filename: OceanSODA-ETHZ_GRaCER_v2021a_1982-2020.nc + filename: OceanSODA_ETHZ-v2023.OCADS.01_1982-2022.nc mip: Omon raw_name: ph_total raw_units: '1' spco2: - filename: OceanSODA-ETHZ_GRaCER_v2021a_1982-2020.nc + filename: OceanSODA_ETHZ-v2023.OCADS.01_1982-2022.nc mip: Omon raw_units: '1e-6 atm' talkos: - filename: OceanSODA-ETHZ_GRaCER_v2021a_1982-2020.nc + filename: OceanSODA_ETHZ-v2023.OCADS.01_1982-2022.nc mip: Omon raw_name: talk raw_units: '1e-6 mol kg-1' diff --git a/esmvaltool/cmorizers/data/datasets.yml b/esmvaltool/cmorizers/data/datasets.yml index 54f6f23f7e..19dc71e0c8 100644 --- a/esmvaltool/cmorizers/data/datasets.yml +++ b/esmvaltool/cmorizers/data/datasets.yml @@ -1073,9 +1073,9 @@ datasets: OceanSODA-ETHZ: tier: 2 source: https://www.ncei.noaa.gov/data/oceans/ncei/ocads/data/0220059/ - last_access: 2022-11-03 + last_access: 2024-02-15 info: | - Download the file OceanSODA-ETHZ_GRaCER_v2021a_1982-2020.nc + Download the file OceanSODA_ETHZ-v2023.OCADS.01_1982-2022.nc OSI-450-nh: tier: 2 diff --git a/esmvaltool/cmorizers/data/downloaders/datasets/oceansoda_ethz.py b/esmvaltool/cmorizers/data/downloaders/datasets/oceansoda_ethz.py index cc01632cb3..2e099814dd 100644 --- a/esmvaltool/cmorizers/data/downloaders/datasets/oceansoda_ethz.py +++ b/esmvaltool/cmorizers/data/downloaders/datasets/oceansoda_ethz.py @@ -34,6 +34,6 @@ def download_dataset(config, dataset, dataset_info, start_date, end_date, downloader.download_file( "https://www.ncei.noaa.gov/data/oceans/ncei/ocads/data/0220059/" - "OceanSODA-ETHZ_GRaCER_v2021a_1982-2020.nc", + "OceanSODA_ETHZ-v2023.OCADS.01_1982-2022.nc", wget_options=[], ) diff --git a/esmvaltool/cmorizers/data/formatters/datasets/oceansoda_ethz.py b/esmvaltool/cmorizers/data/formatters/datasets/oceansoda_ethz.py index 7867db259d..a818af0424 100644 --- a/esmvaltool/cmorizers/data/formatters/datasets/oceansoda_ethz.py +++ b/esmvaltool/cmorizers/data/formatters/datasets/oceansoda_ethz.py @@ -7,10 +7,10 @@ https://www.ncei.noaa.gov/data/oceans/ncei/ocads/data/0220059/ Last access - 20221103 + 20240215 Download and processing instructions - Download the file OceanSODA-ETHZ_GRaCER_v2021a_1982-2020.nc + Download the file OceanSODA_ETHZ-v2023.OCADS.01_1982-2022.nc """ diff --git a/esmvaltool/recipes/examples/recipe_check_obs.yml b/esmvaltool/recipes/examples/recipe_check_obs.yml index 4d1b78aa17..f3c01226aa 100644 --- a/esmvaltool/recipes/examples/recipe_check_obs.yml +++ b/esmvaltool/recipes/examples/recipe_check_obs.yml @@ -730,7 +730,7 @@ diagnostics: mip: Omon additional_datasets: - {dataset: OceanSODA-ETHZ, project: OBS6, tier: 2, type: reanaly, - version: v2021e, start_year: 1982, end_year: 2020} + version: v2023, start_year: 1982, end_year: 2022} scripts: null