Merge pull request #1432 from ESMValGroup/era5_cmorizer_recipe

ERA5 CMORization by recipe
ESMValGroup · Feb 13, 2020 · 62554ae · 62554ae
2 parents a7e0984 + d16621c
commit 62554ae
Show file tree

Hide file tree

Showing 7 changed files with 386 additions and 337 deletions.
diff --git a/config-user-example.yml b/config-user-example.yml
@@ -5,9 +5,14 @@
 
 # Rootpaths to the data from different projects (lists are also possible)
 rootpath:
+  CMIP3: [~/cmip3_inputpath1, ~/cmip3_inputpath2]
   CMIP5: [~/cmip5_inputpath1, ~/cmip5_inputpath2]
   CMIP6: [~/cmip6_inputpath1, ~/cmip6_inputpath2]
   OBS: ~/obs_inputpath
+  OBS6: ~/obs6_inputpath
+  obs4mips: ~/obs4mips_inputpath
+  ana4mips: ~/ana4mips_inputpath
+  native6:  ~/native6_inputpath
   RAWOBS: ~/rawobs_inputpath
   default: ~/default_inputpath
 

diff --git a/doc/sphinx/source/esmvaldiag/observations.rst b/doc/sphinx/source/esmvaldiag/observations.rst
@@ -18,6 +18,14 @@ data set for the use in ESMValTool.
 | `6. Naming convention of the observational data files`_
 | `7. Test the cmorized dataset`_
 
+.. note::
+  **CMORization as a fix.** As of early 2020, we've started implementing cmorization as
+  *fixes*. As compared to the workflow described below, this has the advantage that
+  the user does not need to store a duplicate (CMORized) copy of the data. Instead, the
+  CMORization is performed 'on the fly' when running a recipe. **ERA5** is the first dataset
+  for which this 'CMORization on the fly' is supported. For more information about fixes,
+  see: :ref:`fixing data <esmvalcore:fixing_data>`
+
 
 1. Check if your variable is CMOR standard
 ==========================================

diff --git a/esmvaltool/cmorizers/obs/cmor_config/ERA5.yml b/esmvaltool/cmorizers/obs/cmor_config/ERA5.yml
diff --git a/esmvaltool/cmorizers/obs/cmorize_obs_era5.py b/esmvaltool/cmorizers/obs/cmorize_obs_era5.py