Merge pull request #4 from ecmwf-projects/feature/harmonise_with_cgul

cgul harmonise method

emohawk/__init__.py

@@ -42,9 +42,17 @@ def to_numpy(self, *args, **kwargs):
     def to_pandas(self, *args, **kwargs):
         self._not_implemented()
 
-    def to_xarray(self, *args, **kwargs):
+    def _to_xarray(self, *args, **kwargs):
         self._not_implemented()
 
+    def to_xarray(self, *args, harmonise=False, **kwargs):
+        xarray_object = self._to_xarray(self, *args, **kwargs)
+        if harmonise:
+            import cgul
+
+            xarray_object = cgul.harmonise(xarray_object)
+        return xarray_object
+
     def to_netcdf(self, *args, **kwargs):
         self._not_implemented()
 

emohawk/readers/grib.py

@@ -154,15 +154,15 @@ def to_pandas(self, **kwargs):
         """
         return self._xarray_wrapper(**self.__xarray_kwargs).to_pandas(**kwargs)
 
-    def to_xarray(self, **kwargs):
+    def _to_xarray(self, *args, **kwargs):
         """
         Return an xarray representation of the data.
 
         Returns
         -------
         xarray.core.dataarray.DataArray
         """
-        return self._xarray_wrapper(**self.__xarray_kwargs).to_xarray()
+        return self._xarray_wrapper(**self.__xarray_kwargs)._to_xarray()
 
 
 def reader(path, magic=None, deeper_check=False):

emohawk/readers/netcdf.py

@@ -93,15 +93,15 @@ def to_pandas(self, **kwargs):
         """
         return self._xarray_wrapper(**self.__xarray_kwargs).to_pandas(**kwargs)
 
-    def to_xarray(self, **kwargs):
+    def _to_xarray(self, *args, **kwargs):
         """
         Return an xarray representation of the data.
 
         Returns
         -------
         xarray.core.dataarray.DataArray
         """
-        return self._xarray_wrapper(**self.__xarray_kwargs).to_xarray()
+        return self._xarray_wrapper(**self.__xarray_kwargs)._to_xarray()
 
     @classmethod
     def to_xarray_multi_from_paths(cls, paths, **kwargs):

emohawk/wrappers/pandas.py

@@ -62,7 +62,7 @@ def to_numpy(self, *args, **kwargs):
         """
         return self.source.to_numpy(*args, **kwargs)
 
-    def to_xarray(self, *args, **kwargs):
+    def _to_xarray(self, *args, **kwargs):
         """
         Return an xarray representation of the data.
 

emohawk/wrappers/xarray.py

@@ -44,7 +44,7 @@ def axis(self, axis):
                 raise ValueError(f"No coordinate found with axis '{axis}'")
         return self.source.coords[coord]
 
-    def to_xarray(self):
+    def _to_xarray(self, *args, **kwargs):
         """
         Return an xarray representation of the data.
 

setup.cfg

@@ -19,6 +19,7 @@ packages = find:
 install_requires =
     numpy
     xarray
+    cgul
 
 
 [flake8]