Refactor time operations

esmvalcore/preprocessor/__init__.py

@@ -20,8 +20,10 @@
 from ._reformat import (cmor_check_data, cmor_check_metadata, fix_data,
                         fix_file, fix_metadata)
 from ._regrid import extract_levels, regrid
-from ._time import (annual_mean, extract_month, extract_season, extract_time,
-                    regrid_time, seasonal_mean, time_average)
+from ._time import (extract_month, extract_season, extract_time, regrid_time,
+                    daily_statistics, monthly_statistics, seasonal_statistics,
+                    annual_statistics, decadal_statistics,
+                    climate_statistics)
 from ._volume import (volume_statistics, depth_integration, extract_trajectory,
                       extract_transect, extract_volume)
 
@@ -77,9 +79,12 @@
     # 'annual_cycle': annual_cycle,
     # 'diurnal_cycle': diurnal_cycle,
     'zonal_means',
-    'annual_mean',
-    'seasonal_mean',
-    'time_average',
+    'daily_statistics',
+    'monthly_statistics',
+    'seasonal_statistics',
+    'annual_statistics',
+    'decadal_statistics',
+    'climate_statistics',
     'regrid_time',
     'cmor_check_data',
     # Save to file

esmvalcore/preprocessor/_area.py

@@ -8,20 +8,11 @@
 
 import iris
 from dask import array as da
+from ._shared import guess_bounds, get_iris_analysis_operation
 
 logger = logging.getLogger(__name__)
 
 
-# guess bounds tool
-def _guess_bounds(cube, coords):
-    """Guess bounds of a cube, or not."""
-    # check for bounds just in case
-    for coord in coords:
-        if not cube.coord(coord).has_bounds():
-            cube.coord(coord).guess_bounds()
-    return cube
-
-
 # slice cube over a restricted area (box)
 def extract_region(cube, start_longitude, end_longitude, start_latitude,
                    end_latitude):
@@ -72,37 +63,6 @@ def extract_region(cube, start_longitude, end_longitude, start_latitude,
     return cube.copy(data)
 
 
-def get_iris_analysis_operation(operator):
-    """
-    Determine the iris analysis operator from a string.
-
-    Map string to functional operator.
-
-    Parameters
-    ----------
-    operator: str
-        A named operator.
-
-    Returns
-    -------
-        function: A function from iris.analysis
-
-    Raises
-    ------
-    ValueError
-        operator not in allowed operators list.
-        allowed operators: mean, median, std_dev, variance, min, max
-    """
-    operators = ['mean', 'median', 'std_dev', 'variance', 'min', 'max']
-    operator = operator.lower()
-    if operator not in operators:
-        raise ValueError("operator {} not recognised. "
-                         "Accepted values are: {}."
-                         "".format(operator, ', '.join(operators)))
-    operation = getattr(iris.analysis, operator.upper())
-    return operation
-
-
 def zonal_means(cube, coordinate, mean_type):
     """
     Get zonal means.
@@ -230,7 +190,7 @@ def area_statistics(cube, operator, fx_files=None):
 
     coord_names = ['longitude', 'latitude']
     if grid_areas is None or not grid_areas.any():
-        cube = _guess_bounds(cube, coord_names)
+        cube = guess_bounds(cube, coord_names)
         grid_areas = iris.analysis.cartography.area_weights(cube)
         logger.info('Calculated grid area shape: %s', grid_areas.shape)
 

esmvalcore/preprocessor/_shared.py

@@ -0,0 +1,71 @@
+"""
+Shared functions for preprocessor.
+
+Utility functions that can be used for multiple preprocessor steps
+"""
+import logging
+
+import iris
+import iris.analysis
+
+logger = logging.getLogger(__name__)
+
+
+# guess bounds tool
+def guess_bounds(cube, coords):
+    """Guess bounds of a cube, or not."""
+    # check for bounds just in case
+    for coord in coords:
+        if not cube.coord(coord).has_bounds():
+            cube.coord(coord).guess_bounds()
+    return cube
+
+
+def get_iris_analysis_operation(operator):
+    """
+    Determine the iris analysis operator from a string.
+
+    Map string to functional operator.
+
+    Parameters
+    ----------
+    operator: str
+        A named operator.
+
+    Returns
+    -------
+        function: A function from iris.analysis
+
+    Raises
+    ------
+    ValueError
+        operator not in allowed operators list.
+        allowed operators: mean, median, std_dev, variance, min, max
+    """
+    operators = ['mean', 'median', 'std_dev', 'variance', 'min', 'max']
+    operator = operator.lower()
+    if operator not in operators:
+        raise ValueError("operator {} not recognised. "
+                         "Accepted values are: {}."
+                         "".format(operator, ', '.join(operators)))
+    operation = getattr(iris.analysis, operator.upper())
+    return operation
+
+
+def operator_accept_weights(operator):
+    """
+    Get if operator support weights.
+
+    Parameters
+    ----------
+    operator: str
+        A named operator.
+
+    Returns
+    -------
+        bool: True if operator support weights, False otherwise
+
+    """
+    if operator.lower() in ('mean',):
+        return True
+    return False