clean up after sputils delete

SimPEG/Solver.py

@@ -1,8 +1,7 @@
 import numpy as np
 import scipy.sparse as sp
 import scipy.sparse.linalg as linalg
-from Utils.matutils import mkvc
-from Utils.sputils import sdiag
+from Utils.matutils import mkvc, sdiag
 import warnings
 
 DEFAULTS = {'direct':'scipy', 'iter':'scipy', 'triangular':'fortran', 'diagonal':'python'}

SimPEG/Utils/interputils.py

@@ -1,7 +1,6 @@
 import numpy as np
 import scipy.sparse as sp
-from sputils import spzeros
-from matutils import mkvc, sub2ind
+from matutils import mkvc, sub2ind, spzeros
 
 def _interp_point_1D(x, xr_i):
     """

SimPEG/Utils/lomutils.py

@@ -1,7 +1,6 @@
 import numpy as np
 from scipy import sparse as sp
-from matutils import mkvc, ndgrid, sub2ind
-from sputils import sdiag
+from matutils import mkvc, ndgrid, sub2ind, sdiag
 
 
 def volTetra(xyz, A, B, C, D):

SimPEG/Utils/meshutils.py

@@ -1,7 +1,6 @@
 import numpy as np
 from scipy import sparse as sp
-from matutils import mkvc, ndgrid, sub2ind
-from sputils import sdiag
+from matutils import mkvc, ndgrid, sub2ind, sdiag
 
 def exampleLomGird(nC, exType):
     assert type(nC) == list, "nC must be a list containing the number of nodes"