Replace underscores in facets of observational datasets with minuses (#…

…3840)
ESMValGroup · Feb 3, 2025 · 7528556 · 7528556
1 parent 50eabc0
commit 7528556
Show file tree

Hide file tree

Showing 22 changed files with 85 additions and 85 deletions.
diff --git a/doc/sphinx/source/input.rst b/doc/sphinx/source/input.rst
@@ -407,7 +407,7 @@ A list of the datasets for which a CMORizers is available is provided in the fol
 +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
 | MLS-AURA* [#t3]_             | hur, hurStderr (day)                                                                                 |   3  | Python          |
 +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
-| MOBO-DIC_MPIM                | dissic (Omon)                                                                                        |   2  | Python          |
+| MOBO-DIC-MPIM                | dissic (Omon)                                                                                        |   2  | Python          |
 +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
 | MOBO-DIC2004-2019            | dissic (Omon)                                                                                        |   2  | Python          |
 +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+

diff --git a/esmvaltool/cmorizers/data/cmor_config/CowtanWay.yml b/esmvaltool/cmorizers/data/cmor_config/CowtanWay.yml
@@ -6,14 +6,14 @@ filename: '{version}_0_0.nc'
 attributes:
   dataset_id: CowtanWay
   version:
-    v1: 'had4_krig_v1'
-    v2: 'had4_uah_v1'
-    v3: 'had4_short_krig_v2'
-    v4: 'had4_short_uah_v2'
-    v5: 'ghcn_short_krig_v2'
-    v6: 'ghcn_short_uah_v2'
-    v7: 'had4sst4_krig_v2'
-    v8: 'had4_krig_v2'
+    v1: 'had4-krig-v1'
+    v2: 'had4-uah-v1'
+    v3: 'had4-short-krig-v2'
+    v4: 'had4-short-uah-v2'
+    v5: 'ghcn-short-krig-v2'
+    v6: 'ghcn-short-uah-v2'
+    v7: 'had4sst4-krig-v2'
+    v8: 'had4-krig-v2'
   baseline:
     v1: '1981-2010'
     v2: '1981-2010'

diff --git a/esmvaltool/cmorizers/data/cmor_config/GPCC.yml b/esmvaltool/cmorizers/data/cmor_config/GPCC.yml
@@ -6,10 +6,10 @@ filename: 'full_data_monthly_{version}.nc'
 attributes:
   dataset_id: GPCC
   version:
-    v1: 'v2018_25'
-    v2: 'v2018_10'
-    v3: 'v2018_05'
-    v4: 'v2018_025'
+    v1: 'v2018-25'
+    v2: 'v2018-10'
+    v3: 'v2018-05'
+    v4: 'v2018-025'
   tier: 2
   modeling_realm: reanaly
   project_id: OBS

diff --git a/esmvaltool/cmorizers/data/cmor_config/LAI3g.yml b/esmvaltool/cmorizers/data/cmor_config/LAI3g.yml
@@ -14,7 +14,7 @@ regrid:
 # Common global attributes for Cmorizer output
 attributes:
   dataset_id: LAI3g
-  version: '1_regridded'
+  version: '1-regridded'
   tier: 3
   modeling_realm: reanaly
   project_id: OBS

diff --git a/...rizers/data/cmor_config/MOBO-DIC_MPIM.yml → ...rizers/data/cmor_config/MOBO-DIC-MPIM.yml b/...rizers/data/cmor_config/MOBO-DIC_MPIM.yml → ...rizers/data/cmor_config/MOBO-DIC-MPIM.yml
@@ -1,7 +1,7 @@
 ---
 # Common global attributes for Cmorizer output
 attributes:
-  dataset_id: MOBO-DIC_MPIM
+  dataset_id: MOBO-DIC-MPIM
   version: '1.1'
   tier: 2
   modeling_realm: clim

diff --git a/esmvaltool/cmorizers/data/datasets.yml b/esmvaltool/cmorizers/data/datasets.yml
@@ -918,7 +918,7 @@ datasets:
       information).
       A registration is required.
 
-  MOBO-DIC_MPIM:
+  MOBO-DIC-MPIM:
     tier: 2
     source: https://www.ncei.noaa.gov/data/oceans/ncei/ocads/data/0221526/
     last_access: 2022-11-03

diff --git a/esmvaltool/cmorizers/data/downloaders/datasets/mobo_dic_mpim.py b/esmvaltool/cmorizers/data/downloaders/datasets/mobo_dic_mpim.py
@@ -1,4 +1,4 @@
-"""Script to download MOBO-DIC_MPIM."""
+"""Script to download MOBO-DIC-MPIM."""
 import logging
 
 from esmvaltool.cmorizers.data.downloaders.wget import WGetDownloader

diff --git a/esmvaltool/cmorizers/data/formatters/datasets/clara_avhrr.ncl b/esmvaltool/cmorizers/data/formatters/datasets/clara_avhrr.ncl
@@ -88,7 +88,7 @@ begin
   TYPE = "sat"
 
   ; Version
-  VERSION = "V002_01"
+  VERSION = "V002-01"
 
   ; Global attributes
   SOURCE = "https://wui.cmsaf.eu/"

diff --git a/esmvaltool/cmorizers/data/formatters/datasets/gpcc.py b/esmvaltool/cmorizers/data/formatters/datasets/gpcc.py
@@ -14,8 +14,8 @@
     Download the following files:
         full_data_monthly_{version}.nc.gz
 
-Two files are generated per version, one with version_grid (i.e. v2018_25),
-one with version_grid-numgauge1 (i.e. v2018_25-numgauge1), which is constrained
+Two files are generated per version, one with version_grid (i.e. v2018-25),
+one with version-grid-numgauge1 (i.e. v2018-25-numgauge1), which is constrained
 on holding gridpoint values relying on data from at least one station (i.e.
 removing gridpoints solely relying on climatological infilling).
 """

diff --git a/esmvaltool/cmorizers/data/formatters/datasets/mobo_dic_mpim.py b/esmvaltool/cmorizers/data/formatters/datasets/mobo_dic_mpim.py
@@ -1,4 +1,4 @@
-"""ESMValTool CMORizer for MOBO-DIC_MPIM data.
+"""ESMValTool CMORizer for MOBO-DIC-MPIM data.
 
 Tier
     Tier 2: other freely-available dataset.
@@ -166,7 +166,7 @@ def _extract_variable(var_info, cmor_info, attrs, filepath, out_dir):
     _fix_var_metadata(var_info, cmor_info, cube)
 
     # Fix coordinates
-    if cube.coords('month of the year'):  # MOBO-DIC_MPIM
+    if cube.coords('month of the year'):  # MOBO-DIC-MPIM
         _fix_climatological_time(cube)
     elif cube.coords('Julian Day'):  # MOBO-DIC2004-2019
         _fix_time(cube)

diff --git a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig1_clim.yml b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig1_clim.yml
@@ -135,7 +135,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA,
              tier: 2, start_year: 1982, end_year: 2016}
@@ -160,7 +160,7 @@ diagnostics:
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
              start_year: 2006, end_year: 2017, tier: 3}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3,
              tier: 3, start_year: 2003, end_year: 2018}
@@ -182,7 +182,7 @@ diagnostics:
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
           - {dataset: CLARA-AVHRR, project: OBS, type: sat,
-             version: V002_01, tier: 3,
+             version: V002-01, tier: 3,
              start_year: 1982, end_year: 2018}
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
@@ -292,7 +292,7 @@ diagnostics:
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
           - {dataset: CLARA-AVHRR, project: OBS, type: sat,
-             version: V002_01, tier: 3, start_year: 1982, end_year: 2018}
+             version: V002-01, tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA,
              tier: 2, start_year: 1982, end_year: 2016}
           - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3,
@@ -316,7 +316,7 @@ diagnostics:
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
              start_year: 2006, end_year: 2017, tier: 3}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3,
              tier: 3, start_year: 2003, end_year: 2018}
@@ -338,7 +338,7 @@ diagnostics:
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
           - {dataset: CLARA-AVHRR, project: OBS, type: sat,
-             version: V002_01, tier: 3, start_year: 1982, end_year: 2018}
+             version: V002-01, tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
              start_year: 2006, end_year: 2017, tier: 3}

diff --git a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig1_clim_amip.yml b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig1_clim_amip.yml
@@ -151,7 +151,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA,
              tier: 2, start_year: 1982, end_year: 2016}
@@ -176,7 +176,7 @@ diagnostics:
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
              start_year: 2006, end_year: 2017, tier: 3}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3,
              tier: 3, start_year: 2003, end_year: 2018}
@@ -197,7 +197,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
@@ -306,7 +306,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA,
              tier: 2, start_year: 1982, end_year: 2016}
@@ -331,7 +331,7 @@ diagnostics:
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
              start_year: 2006, end_year: 2017, tier: 3}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3,
              tier: 3, start_year: 2003, end_year: 2018}
@@ -352,7 +352,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,

diff --git a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig2_taylor.yml b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig2_taylor.yml
@@ -49,7 +49,7 @@ diagnostics:
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
           - {dataset: CLARA-AVHRR, project: OBS, type: sat,
-             version: V002_01, tier: 3,
+             version: V002-01, tier: 3,
              start_year: 1982, end_year: 2018}
           - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA,
              tier: 2, start_year: 1982, end_year: 2016}
@@ -71,7 +71,7 @@ diagnostics:
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
              start_year: 2006, end_year: 2017, tier: 3}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3,
              tier: 3, start_year: 2003, end_year: 2018}
@@ -89,7 +89,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,

diff --git a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig2_taylor_amip.yml b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig2_taylor_amip.yml
@@ -48,7 +48,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA,
              tier: 2, start_year: 1982, end_year: 2016}
@@ -70,7 +70,7 @@ diagnostics:
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
              start_year: 2006, end_year: 2017, tier: 3}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3,
              tier: 3, start_year: 2003, end_year: 2018}
@@ -88,7 +88,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,

diff --git a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig6_interannual.yml b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig6_interannual.yml
@@ -136,7 +136,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA,
              tier: 2, start_year: 1982, end_year: 2016}
@@ -157,7 +157,7 @@ diagnostics:
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
              start_year: 2006, end_year: 2017, tier: 3}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3,
              tier: 3, start_year: 2003, end_year: 2018}
@@ -174,7 +174,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
@@ -282,7 +282,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA,
              tier: 2, start_year: 1982, end_year: 2016}
@@ -303,7 +303,7 @@ diagnostics:
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
              start_year: 2006, end_year: 2017, tier: 3}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3,
              tier: 3, start_year: 2003, end_year: 2018}
@@ -320,7 +320,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,

diff --git a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig7_seas.yml b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig7_seas.yml
@@ -133,7 +133,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA, tier: 2,
              start_year: 1982, end_year: 2016}
@@ -158,7 +158,7 @@ diagnostics:
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
              start_year: 2006, end_year: 2017, tier: 3}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3,
              tier: 3, start_year: 2003, end_year: 2018}
@@ -179,7 +179,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
@@ -286,7 +286,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA, tier: 2,
              start_year: 1982, end_year: 2016}
@@ -311,7 +311,7 @@ diagnostics:
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,
              start_year: 2006, end_year: 2017, tier: 3}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3,
              tier: 3, start_year: 2003, end_year: 2018}
@@ -332,7 +332,7 @@ diagnostics:
           - {dataset: ESACCI-CLOUD, project: OBS, type: sat,
              version: AVHRR-AMPM-fv3.0, tier: 2,
              start_year: 1992, end_year: 2016}
-          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01,
+          - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01,
              tier: 3, start_year: 1982, end_year: 2018}
           - {dataset: CLOUDSAT-L2, project: OBS, type: sat,
              version: P1-R05-gridbox-average-noprecip,