Merge pull request #1070 from xylar/fix-decode-timedelta-warning

Set `decode_timedelta=False` to avoid future warnings in `xarray.open_dataset()` calls

Author: xylar

mpas_analysis/ocean/conservation.py

@@ -13,7 +13,7 @@
 # -------
 # Carolyn Begeman
 
-from distutils.spawn import find_executable
+import shutil
 import numpy as np
 import matplotlib.pyplot as plt
 import os
@@ -565,7 +565,7 @@ def _get_variable(self, ds, varname, mks=False):
                 ts_file = ts_files[0]
                 if not os.path.exists(ts_file):
                    raise ValueError(f'Could not find timeMonthlyStats file {ts_file}')
-                var = 'timeMonthly_avg_areaCellGlobal' 
+                var = 'timeMonthly_avg_areaCellGlobal'
                 ds_ts = open_mpas_dataset(fileName=ts_file,
                                           calendar=self.calendar,
                                           variableList=[var])
@@ -615,7 +615,7 @@ def _compute_time_series_with_ncrcat(self, variable_list):
             If ``ncrcat`` is not in the system path.
         """
 
-        if find_executable('ncrcat') is None:
+        if shutil.which('ncrcat') is None:
             raise OSError('ncrcat not found. Make sure the latest nco '
                           'package is installed: \n'
                           'conda install nco\n'

mpas_analysis/ocean/meridional_heat_transport.py

@@ -213,7 +213,7 @@ def run_task(self):
                     raise IOError('At least one file from stream {} is needed '
                                   'to compute MHT'.format(streamName))
 
-                with xr.open_dataset(inputFile) as ds:
+                with xr.open_dataset(inputFile, decode_timedelta=False) as ds:
                     if 'binBoundaryMerHeatTrans' in ds.data_vars:
                         binBoundaryMerHeatTrans = \
                             ds.binBoundaryMerHeatTrans

mpas_analysis/shared/climatology/mpas_climatology_task.py

@@ -12,7 +12,7 @@
 import xarray
 import os
 import subprocess
-from distutils.spawn import find_executable
+import shutil
 import dask
 import multiprocessing
 from multiprocessing.pool import ThreadPool
@@ -287,7 +287,8 @@ def setup_and_check(self):
 
         self.symlinkDirectory = self._create_symlinks()
 
-        with xarray.open_dataset(self.inputFiles[0]) as ds:
+        with xarray.open_dataset(self.inputFiles[0],
+                                 decode_timedelta=False) as ds:
             self.allVariables = list(ds.data_vars.keys())
 
     def run_task(self):
@@ -463,7 +464,7 @@ def _compute_climatologies_with_ncclimo(self, inDirectory, outDirectory,
         # -------
         # Xylar Asay-Davis
 
-        if find_executable('ncclimo') is None:
+        if shutil.which('ncclimo') is None:
             raise OSError('ncclimo not found. Make sure the latest nco '
                           'package is installed: \n'
                           'conda install nco\n'

mpas_analysis/shared/climatology/remap_mpas_climatology_subtask.py

@@ -237,7 +237,8 @@ def run_task(self):
         self.logger.info('\nRemapping climatology {}'.format(
             self.climatologyName))
 
-        dsMask = xr.open_dataset(self.mpasClimatologyTask.inputFiles[0])
+        dsMask = xr.open_dataset(self.mpasClimatologyTask.inputFiles[0],
+                                 decode_timedelta=False)
         dsMask = dsMask[self.variableList]
         iselValues = {'Time': 0}
         if self.iselValues is not None:

mpas_analysis/shared/time_series/mpas_time_series_task.py

@@ -11,7 +11,7 @@
 
 import os
 import subprocess
-from distutils.spawn import find_executable
+import shutil
 import xarray as xr
 import numpy
 
@@ -203,7 +203,8 @@ def setup_and_check(self):
 
         self.inputFiles = sorted(self.inputFiles)
 
-        with xr.open_dataset(self.inputFiles[0]) as ds:
+        with xr.open_dataset(self.inputFiles[0],
+                             decode_timedelta=False) as ds:
             self.allVariables = list(ds.data_vars.keys())
 
     def run_task(self):
@@ -237,7 +238,7 @@ def _compute_time_series_with_ncrcat(self):
         Xylar Asay-Davis
         """
 
-        if find_executable('ncrcat') is None:
+        if shutil.which('ncrcat') is None:
             raise OSError('ncrcat not found. Make sure the latest nco '
                           'package is installed: \n'
                           'conda install nco\n'

mpas_analysis/shared/time_series/time_series.py

@@ -18,7 +18,7 @@
 import xarray as xr
 import numpy
 import os
-from distutils.spawn import find_executable
+import shutil
 import glob
 import subprocess
 
@@ -53,7 +53,7 @@ def combine_time_series_with_ncrcat(inFileNames, outFileName,
     Xylar Asay-Davis
     """
 
-    if find_executable('ncrcat') is None:
+    if shutil.which('ncrcat') is None:
         raise OSError('ncrcat not found. Make sure the latest nco '
                       'package is installed: \n'
                       'conda install nco\n'