diff --git a/esmvalcore/config/_config.py b/esmvalcore/config/_config.py index 6df9e9bf52..ee4d8ac8e8 100644 --- a/esmvalcore/config/_config.py +++ b/esmvalcore/config/_config.py @@ -10,6 +10,7 @@ from importlib.resources import files as importlib_files from pathlib import Path +import iris import yaml from esmvalcore.cmor.table import CMOR_TABLES, read_cmor_tables @@ -23,6 +24,17 @@ CFG = {} +# Set iris.FUTURE flags +for attr, value in { + "save_split_attrs": True, + "date_microseconds": True, +}.items(): + try: + setattr(iris.FUTURE, attr, value) + except AttributeError: + pass + + def _deep_update(dictionary, update): for key, value in update.items(): if isinstance(value, collections.abc.Mapping): diff --git a/esmvalcore/preprocessor/_io.py b/esmvalcore/preprocessor/_io.py index 0851e1d37e..0c554c3d9a 100644 --- a/esmvalcore/preprocessor/_io.py +++ b/esmvalcore/preprocessor/_io.py @@ -41,8 +41,6 @@ } GRIB_FORMATS = (".grib2", ".grib", ".grb2", ".grb", ".gb2", ".gb") -iris.FUTURE.save_split_attrs = True - def _get_attr_from_field_coord(ncfield, coord_name, attr): if coord_name is not None: