Merge pull request #144 from lee1043/143_projectField_error

Bug fix for conflict between `dask` array and `np.where`

lib/eofs/standard.py

@@ -153,7 +153,10 @@ def __init__(self, dataset, weights=None, center=True, ddof=1):
         if not self._valid_nan(self._data):
             raise ValueError('missing values detected in different '
                              'locations at different times')
-        nonMissingIndex = np.where(np.logical_not(np.isnan(self._data[0])))[0]
+        if has_dask:
+            nonMissingIndex = dask.array.where(np.logical_not(np.isnan(self._data[0])))[0]
+        else:
+            nonMissingIndex = np.where(np.logical_not(np.isnan(self._data[0])))[0]
         # Remove missing values from the design matrix.
         dataNoMissing = self._data[:, nonMissingIndex]
         if dataNoMissing.size == 0:
@@ -741,7 +744,10 @@ def projectField(self, field, neofs=None, eofscaling=0, weighted=True):
         if not self._valid_nan(field_flat):
             raise ValueError('missing values detected in different '
                              'locations at different times')
-        nonMissingIndex = np.where(np.logical_not(np.isnan(field_flat[0])))[0]
+        if has_dask:
+            nonMissingIndex = dask.array.where(np.logical_not(np.isnan(self._data[0])))[0]  # lee1043 testing
+        else:
+            nonMissingIndex = np.where(np.logical_not(np.isnan(field_flat[0])))[0]
         try:
             # Compute chunk sizes if nonMissingIndex is a dask array, so its
             # shape can be compared with eofsNonMissingIndex later.