Updates to examples and documentation.

SimPEG/Examples/Forward_BasicDirectCurrent.py

@@ -12,7 +12,6 @@ def run(plotIt=True):
     tM = Mesh.TensorMesh(sz)
     # Curvilinear Mesh
     rM = Mesh.CurvilinearMesh(Utils.meshutils.exampleLrmGrid(sz,'rotate'))
-
     # Step2: Direct Current (DC) operator
     def DCfun(mesh, pts):
         D = mesh.faceDiv
@@ -39,6 +38,7 @@ def run(plotIt=True):
     phirM = AinvrM*rhsrM
 
     if not plotIt: return
+
     #Step4: Making Figure
     fig, axes = plt.subplots(1,2,figsize=(12*1.2,4*1.2))
     label = ["(a)", "(b)"]
@@ -69,7 +69,9 @@ def run(plotIt=True):
         else:
             axes[i].set_ylabel(" ")
         axes[i].set_xlabel("x")
+    plt.show()
 
 
 if __name__ == '__main__':
+    Utils._makeExample(__file__)
     run()

SimPEG/Examples/Inversion_Linear.py

@@ -23,7 +23,9 @@ class LinearProblem(Problem.BaseProblem):
         return self.G.T.dot(v)
 
 
-def run(N, plotIt=True):
+def run(N=100, plotIt=True):
+    np.random.seed(1)
+
     mesh = Mesh.TensorMesh([N])
 
     nk = 20
@@ -52,7 +54,7 @@ def run(N, plotIt=True):
 
     reg = Regularization.Tikhonov(mesh)
     dmis = DataMisfit.l2_DataMisfit(survey)
-    opt = Optimization.InexactGaussNewton(maxIter=20)
+    opt = Optimization.InexactGaussNewton(maxIter=35)
     invProb = InvProblem.BaseInvProblem(dmis, reg, opt)
     beta = Directives.BetaSchedule()
     betaest = Directives.BetaEstimate_ByEig()
@@ -63,16 +65,19 @@ def run(N, plotIt=True):
 
     if plotIt:
         import matplotlib.pyplot as plt
-        plt.figure(1)
-        for i in range(prob.G.shape[0]):
-            plt.plot(prob.G[i,:])
 
-        plt.figure(2)
-        plt.plot(M.vectorCCx, survey.mtrue, 'b-')
-        plt.plot(M.vectorCCx, mrec, 'r-')
+        fig, axes = plt.subplots(1,2,figsize=(12*1.2,4*1.2))
+        for i in range(prob.G.shape[0]):
+            axes[0].plot(prob.G[i,:])
+        axes[0].set_title('Columns of matrix G')
+
+        axes[1].plot(M.vectorCCx, survey.mtrue, 'b-')
+        axes[1].plot(M.vectorCCx, mrec, 'r-')
+        axes[1].legend(('True Model', 'Recovered Model'))
         plt.show()
 
     return prob, survey, mesh, mrec
 
 if __name__ == '__main__':
-    run(100)
+    Utils._makeExample(__file__)
+    run()

SimPEG/Examples/Mesh_QuadTree_Create.py

@@ -0,0 +1,18 @@
+from SimPEG import *
+
+def run(plotIt=True):
+    from SimPEG import Mesh, np
+    M = Mesh.TreeMesh([32,32])
+    M.refine(3)
+    def function(cell):
+        xyz = cell.center
+        for i in range(3):
+            if np.abs(np.sin(xyz[0]*np.pi*2)*0.5 + 0.5 - xyz[1]) < 0.2*i:
+                return 6-i
+        return 0
+    M.refine(function);
+    if plotIt: M.plotGrid(showIt=True)
+
+if __name__ == '__main__':
+    Utils._makeExample(__file__)
+    run()

SimPEG/Examples/Mesh_ThreeMeshes.py

@@ -0,0 +1,24 @@
+from SimPEG import *
+
+def run(plotIt=True):
+    sz = [16,16]
+    tM = Mesh.TensorMesh(sz)
+    qM = Mesh.TreeMesh(sz)
+    qM.refine(lambda cell: 4 if np.sqrt(((np.r_[cell.center]-0.5)**2).sum()) < 0.4 else 3)
+    rM = Mesh.CurvilinearMesh(Utils.meshutils.exampleLrmGrid(sz,'rotate'))
+
+    if plotIt:
+        import matplotlib.pyplot as plt
+        fig, axes = plt.subplots(1,3,figsize=(14,5))
+        opts = {}
+        tM.plotGrid(ax=axes[0], **opts)
+        axes[0].set_title('TensorMesh')
+        qM.plotGrid(ax=axes[1], **opts)
+        axes[1].set_title('TreeMesh')
+        rM.plotGrid(ax=axes[2], **opts)
+        axes[2].set_title('CurvilinearMesh')
+        plt.show()
+
+if __name__ == '__main__':
+    Utils._makeExample(__file__)
+    run()

SimPEG/Examples/__init__.py

@@ -1 +1,9 @@
-import Linear, DCfwd
+# This will import everything in the directory into this file
+from os import path as p
+from glob import glob
+__all__ = []
+for x in glob(p.join(p.dirname(__file__), '*.py')):
+    if not p.basename(x).startswith('__'):
+        __import__(p.basename(x)[:-3], globals(), locals())
+        __all__ += [p.basename(x)]
+del glob, p, x