From ff5cd54297e35e04f007da64573a49877ec542d2 Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Fri, 21 Feb 2014 21:53:44 -0800 Subject: [PATCH] clean up after sputils delete --- SimPEG/Solver.py | 3 +-- SimPEG/Utils/interputils.py | 3 +-- SimPEG/Utils/lomutils.py | 3 +-- SimPEG/Utils/meshutils.py | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/SimPEG/Solver.py b/SimPEG/Solver.py index 60ca5558..6c47be27 100644 --- a/SimPEG/Solver.py +++ b/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'} diff --git a/SimPEG/Utils/interputils.py b/SimPEG/Utils/interputils.py index 3f9b7e71..f1dc28b9 100644 --- a/SimPEG/Utils/interputils.py +++ b/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): """ diff --git a/SimPEG/Utils/lomutils.py b/SimPEG/Utils/lomutils.py index 210a134d..b641ef7f 100644 --- a/SimPEG/Utils/lomutils.py +++ b/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): diff --git a/SimPEG/Utils/meshutils.py b/SimPEG/Utils/meshutils.py index d7fe0836..f8add82b 100644 --- a/SimPEG/Utils/meshutils.py +++ b/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"