From f44a85766978b4b0101f7424dc6d30be6c74f622 Mon Sep 17 00:00:00 2001 From: Rowan Cockett Date: Fri, 1 Nov 2013 15:00:17 -0700 Subject: [PATCH] Moved solver to utilities. But it is still available as SimPEG.Solver (as defined in the main __init__.py file) --- SimPEG/__init__.py | 4 ++-- SimPEG/{ => utils}/Solver.py | 0 SimPEG/utils/__init__.py | 2 ++ docs/api_Solver.rst | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) rename SimPEG/{ => utils}/Solver.py (100%) diff --git a/SimPEG/__init__.py b/SimPEG/__init__.py index a17eaa74..7f059a74 100644 --- a/SimPEG/__init__.py +++ b/SimPEG/__init__.py @@ -1,6 +1,6 @@ -import mesh import utils +from utils import Solver +import mesh import inverse import forward import regularization -from Solver import Solver diff --git a/SimPEG/Solver.py b/SimPEG/utils/Solver.py similarity index 100% rename from SimPEG/Solver.py rename to SimPEG/utils/Solver.py diff --git a/SimPEG/utils/__init__.py b/SimPEG/utils/__init__.py index 7c976ce3..d5918b0d 100644 --- a/SimPEG/utils/__init__.py +++ b/SimPEG/utils/__init__.py @@ -2,6 +2,8 @@ import matutils import sputils import lomutils import ModelBuilder +import Solver +from Solver import Solver from matutils import getSubArray, mkvc, ndgrid, ind2sub, sub2ind from sputils import spzeros, kron3, speye, sdiag from lomutils import volTetra, faceInfo, inv2X2BlockDiagonal, inv3X3BlockDiagonal, indexCube, exampleLomGird diff --git a/docs/api_Solver.rst b/docs/api_Solver.rst index 74a81707..db75860b 100644 --- a/docs/api_Solver.rst +++ b/docs/api_Solver.rst @@ -3,7 +3,7 @@ Solver ****** -.. automodule:: SimPEG.Solver +.. automodule:: SimPEG.utils.Solver :members: :undoc-members: