allow (and test) xarray data structures as input and output

Author: Try2Code

python/cdo/cdo.py

@@ -94,7 +94,7 @@ def setupLogging(logFile):
     return logger
 # }}}
 
-# extra execptions for CDO {{{
+# extra exceptions for CDO {{{
 
 class CDOException(Exception):
 
@@ -452,7 +452,7 @@ def __call__(self, *args, **kwargs):
                 cmd.append(' '.join(kwargs["input"]))
             elif self.hasXarray:
                 import xarray  # <<-- python2 workaround
-                if type(kwargs["input"]) == xarray.core.dataset.Dataset:
+                if type(kwargs["input"]) in [xarray.core.dataset.Dataset,xarray.core.dataarray.DataArray]:
                     # create a temp nc file from input data
                     tmpfile = self.tempStore.newFile()
                     kwargs["input"].to_netcdf(tmpfile)

python/test/test_cdo.py

@@ -460,6 +460,15 @@ def test_xarray_input(self):
 
       xarrayFile.close()
 
+    def test_xarray_input_and_output(self):
+      cdo = Cdo()
+      ifile = cdo.setcalendar('360_day', input=' -settaxis,1800-01-01,12:00:00,1months -seq,1,10000',options='-f nc -r')
+      (var,) = cdo.showname(input=ifile)
+      self.assertEqual('seq',var)
+      x = cdo.selyear('1985/2100', input=ifile, returnXArray=var)
+      y = cdo.yearsum(input=x, returnXArray=var)
+      self.assertEqual(4059768.0,float(y[:,0,0].sum()))
+
     def test_xarray_output(self):
       cdo = Cdo()
       try: