moved DCProblem

SimPEG/__init__.py

@@ -1,4 +1,6 @@
 import mesh
 import utils
 import inverse
+import forward
+import regularization
 from Solver import Solver

SimPEG/forward/DCProblem.py

@@ -3,8 +3,8 @@ from SimPEG.forward import Problem, SyntheticProblem
 from SimPEG.tests import checkDerivative
 from SimPEG.utils import ModelBuilder, sdiag
 import numpy as np
+import scipy as sp
 import scipy.sparse.linalg as linalg
-import DCutils
 
 class DCProblem(Problem):
     """
@@ -134,7 +134,7 @@ if __name__ == '__main__':
     elecend = 0.5+spacelec*(nelec-1)
     elecLocR = np.linspace(elecini, elecend, nelec)
     rxmidLoc = (elecLocR[0:nelec-1]+elecLocR[1:nelec])*0.5
-    q, Q, rxmidloc = DCutils.genTxRxmat(nelec, spacelec, surfloc, elecini, mesh)
+    q, Q, rxmidloc = genTxRxmat(nelec, spacelec, surfloc, elecini, mesh)
     P = Q.T
 
     # Create some data
@@ -179,3 +179,32 @@ if __name__ == '__main__':
     print v.dot(problem.Jt(mSynth, w, u=u))
 
 
+
+
+
+def genTxRxmat(nelec, spacelec, surfloc, elecini, mesh):
+    """ Generate projection matrix (Q) and """
+    elecend = 0.5+spacelec*(nelec-1)
+    elecLocR = np.linspace(elecini, elecend, nelec)
+    elecLocT = elecLocR+1
+    nrx = nelec-1
+    ntx = nelec-1
+    q = np.zeros((mesh.nC, ntx))
+    Q = np.zeros((mesh.nC, nrx))
+
+    for i in range(nrx):
+
+        rxind1 = np.argwhere((mesh.gridCC[:,0]==surfloc) & (mesh.gridCC[:,1]==elecLocR[i]))
+        rxind2 = np.argwhere((mesh.gridCC[:,0]==surfloc) & (mesh.gridCC[:,1]==elecLocR[i+1]))
+
+        txind1 = np.argwhere((mesh.gridCC[:,0]==surfloc) & (mesh.gridCC[:,1]==elecLocT[i]))
+        txind2 = np.argwhere((mesh.gridCC[:,0]==surfloc) & (mesh.gridCC[:,1]==elecLocT[i+1]))
+
+        q[txind1,i] = 1
+        q[txind2,i] = -1
+        Q[rxind1,i] = 1
+        Q[rxind2,i] = -1
+
+    Q = sp.csr_matrix(Q)
+    rxmidLoc = (elecLocR[0:nelec-1]+elecLocR[1:nelec])*0.5
+    return q, Q, rxmidLoc

SimPEG/forward/DCProblem/DCutils.py

@@ -1,29 +0,0 @@
-import numpy as np
-import scipy.sparse as sp
-
-def genTxRxmat(nelec, spacelec, surfloc, elecini, mesh):
-    """ Generate projection matrix (Q) and """
-    elecend = 0.5+spacelec*(nelec-1)
-    elecLocR = np.linspace(elecini, elecend, nelec)
-    elecLocT = elecLocR+1
-    nrx = nelec-1
-    ntx = nelec-1
-    q = np.zeros((mesh.nC, ntx))
-    Q = np.zeros((mesh.nC, nrx))
-
-    for i in range(nrx):
-
-        rxind1 = np.argwhere((mesh.gridCC[:,0]==surfloc) & (mesh.gridCC[:,1]==elecLocR[i]))
-        rxind2 = np.argwhere((mesh.gridCC[:,0]==surfloc) & (mesh.gridCC[:,1]==elecLocR[i+1]))
-
-        txind1 = np.argwhere((mesh.gridCC[:,0]==surfloc) & (mesh.gridCC[:,1]==elecLocT[i]))
-        txind2 = np.argwhere((mesh.gridCC[:,0]==surfloc) & (mesh.gridCC[:,1]==elecLocT[i+1]))
-
-        q[txind1,i] = 1
-        q[txind2,i] = -1
-        Q[rxind1,i] = 1
-        Q[rxind2,i] = -1
-
-    Q = sp.csr_matrix(Q)
-    rxmidLoc = (elecLocR[0:nelec-1]+elecLocR[1:nelec])*0.5
-    return q, Q, rxmidLoc

SimPEG/forward/DCProblem/__init__.py

@@ -1,2 +0,0 @@
-from DCProblem import *
-from DCutils import *

SimPEG/forward/__init__.py

@@ -1,2 +1,2 @@
 from Problem import *
-import DCProblem
+from DCProblem import DCProblem