- doc the simple regularization, sparse regularization and regulariza…

…tion mesh

- typo fix in MT_3D_Forward example - Solver
- use EM.Static.DC for DC example

SimPEG/Examples/DC_Analytic_Dipole.py

@@ -1,5 +1,5 @@
 from SimPEG import *
-import SimPEG.DCIP as DC
+import SimPEG.EM.Static.DC as DC
 
 def run(plotIt=False):
     cs = 25.
@@ -21,10 +21,10 @@ def run(plotIt=False):
     #     ax.plot(xyz_rxP[:,0],xyz_rxP[:,1], 'w.')
     #     ax.plot(xyz_rxN[:,0],xyz_rxN[:,1], 'r.', ms = 3)
 
-    rx = DC.RxDipole(xyz_rxP, xyz_rxN)
-    src = DC.SrcDipole([rx], [-200, 0, -12.5], [+200, 0, -12.5])
-    survey = DC.SurveyDC([src])
-    problem = DC.ProblemDC_CC(mesh)
+    rx = DC.Rx.Dipole(xyz_rxP, xyz_rxN)
+    src = DC.Src.Dipole([rx], np.r_[-200, 0, -12.5], np.r_[+200, 0, -12.5])
+    survey = DC.Survey([src])
+    problem = DC.Problem3D_CC(mesh)
     problem.pair(survey)
     try:
         from pymatsolver import MumpsSolver

SimPEG/Examples/MT_3D_Foward.py

@@ -5,9 +5,9 @@
 from SimPEG import MT
 import numpy as np
 try:
-    from pymatsolver import MumpsSolver as solver
+    from pymatsolver import MumpsSolver as Solver
 except:
-    from SimPEG import solver
+    from SimPEG import Solver
 
 def run(plotIt=True, nFreq=1):
     """
@@ -46,7 +46,7 @@ def run(plotIt=True, nFreq=1):
     survey = MT.Survey(srcList)
 
     ## Setup the problem object
-    problem = MT.Problem3D.eForm_ps(M, sigmaPrimary=sigBG, Solver=solver)
+    problem = MT.Problem3D.eForm_ps(M, sigmaPrimary=sigBG, Solver=Solver)
     problem.pair(survey)
 
     # Calculate the data

docs/content/api_core/api_Regularization.rst

@@ -91,10 +91,21 @@ The API
     :members:
     :undoc-members:
 
+.. autoclass:: SimPEG.Regularization.Simple
+    :show-inheritance:
+    :members:
 
 .. autoclass:: SimPEG.Regularization.Tikhonov
     :show-inheritance:
     :members:
 
+.. autoclass:: SimPEG.Regularization.Sparse
+    :show-inheritance:
+    :members:
+
+.. autoclass:: SimPEG.Regularization.RegularizationMesh
+    :show-inheritance:
+    :members:
+