Working on the namespace, renamed problems.

simpegMT/Problem1D/__init__.py

@@ -0,0 +1 @@
+from Probs import eForm_TotalField, eForm_psField

simpegMT/Problem3D/__init__.py

@@ -0,0 +1 @@
+from Probs import eForm_ps, eForm_Tp

simpegMT/ProblemMT1D/__init__.py

@@ -1 +0,0 @@
-from Problems import eForm_TotalField, eForm_psField

simpegMT/ProblemMT3D/__init__.py

@@ -1 +0,0 @@
-from Problems import eForm_ps, eForm_Tp

simpegMT/Problems/__init__.py

@@ -0,0 +1 @@
+import 1D, 2D, 3D

simpegMT/Tests/test_Problem1D_againstAnalyticHalfspace.py

@@ -63,7 +63,7 @@ def appRes_TotalFieldNorm(sigmaHalf):
 
     # Make the survey
     survey, sigma, mesh = setupSurvey(sigmaHalf)
-    problem = simpegmt.ProblemMT1D.eForm_TotalField(mesh)
+    problem = simpegmt.Problems.1D.eForm_TotalField(mesh)
     problem.pair(survey)
 
     # Get the fields
@@ -81,7 +81,7 @@ def appPhs_TotalFieldNorm(sigmaHalf):
 
     # Make the survey
     survey, sigma, mesh = setupSurvey(sigmaHalf)
-    problem = simpegmt.ProblemMT1D.eForm_TotalField(mesh)
+    problem = simpegmt.Problems.1D.eForm_TotalField(mesh)
     problem.pair(survey)
 
     # Get the fields
@@ -99,7 +99,7 @@ def appRes_psFieldNorm(sigmaHalf):
 
     # Make the survey
     survey, sigma, mesh = setupSurvey(sigmaHalf,False)
-    problem = simpegmt.ProblemMT1D.eForm_psField(mesh, sigmaPrimary = sigma)
+    problem = simpegmt.Problems.1D.eForm_psField(mesh, sigmaPrimary = sigma)
     problem.pair(survey)
 
     # Get the fields
@@ -117,7 +117,7 @@ def appPhs_psFieldNorm(sigmaHalf):
 
     # Make the survey
     survey, sigma, mesh = setupSurvey(sigmaHalf,False)
-    problem = simpegmt.ProblemMT1D.eForm_psField(mesh, sigmaPrimary = sigma)
+    problem = simpegmt.Problems.1D.eForm_psField(mesh, sigmaPrimary = sigma)
     problem.pair(survey)
 
     # Get the fields

simpegMT/Tests/test_Problem1D_totalDvsPSvsAnalytic.py

@@ -87,7 +87,7 @@ def dataMis_AnalyticTotalDomain(sigmaHalf):
 
     # Total domain solution
     surveyTD, sigma, mesh = setupSurvey(sigmaHalf)
-    problemTD = simpegmt.ProblemMT1D.eForm_TotalField(mesh)
+    problemTD = simpegmt.Problem1D.eForm_TotalField(mesh)
     problemTD.pair(surveyTD)
     # Analytic data
     dataAnaObj = calculateAnalyticSolution(surveyTD.srcList,mesh,sigma)
@@ -109,7 +109,7 @@ def dataMis_AnalyticPrimarySecondary(sigmaHalf):
     # Make the survey
     # Primary secondary
     surveyPS, sigmaPS, mesh = setupSurvey(sigmaHalf,tD=False)
-    problemPS = simpegmt.ProblemMT1D.eForm_psField(mesh)
+    problemPS = simpegmt.Problem1D.eForm_psField(mesh)
     problemPS.sigmaPrimary = sigmaPS
     problemPS.pair(surveyPS)
     # Analytic data

simpegMT/Tests/test_Problem3D_againstAnalytic.py

@@ -105,11 +105,11 @@ def setupSimpegMTfwd_eForm_ps(inputSetup,comp='All',singleFreq=False,expMap=True
     ## Setup the problem object
     sigma1d = M.r(sigBG,'CC','CC','M')[0,0,:]
     if expMap:
-        problem = simpegmt.ProblemMT3D.eForm_ps(M,sigmaPrimary= np.log(sigma1d) )
+        problem = simpegmt.Problem3D.eForm_ps(M,sigmaPrimary= np.log(sigma1d) )
         problem.mapping = simpeg.Maps.ExpMap(problem.mesh)
         problem.curModel = np.log(sig)
     else:
-        problem = simpegmt.ProblemMT3D.eForm_ps(M,sigmaPrimary= sigma1d)
+        problem = simpegmt.Problem3D.eForm_ps(M,sigmaPrimary= sigma1d)
         problem.curModel = sig
     problem.pair(survey)
     problem.verbose = False
@@ -146,11 +146,11 @@ def setupSimpegMTfwd_eForm_ps_multiRx(inputSetup,comp='All',singleFreq=False,exp
     ## Setup the problem object
     sigma1d = M.r(sigBG,'CC','CC','M')[0,0,:]
     if expMap:
-        problem = simpegmt.ProblemMT3D.eForm_ps(M,sigmaPrimary= np.log(sigma1d) )
+        problem = simpegmt.Problem3D.eForm_ps(M,sigmaPrimary= np.log(sigma1d) )
         problem.mapping = simpeg.Maps.ExpMap(problem.mesh)
         problem.curModel = np.log(sig)
     else:
-        problem = simpegmt.ProblemMT3D.eForm_ps(M,sigmaPrimary= sigma1d)
+        problem = simpegmt.Problem3D.eForm_ps(M,sigmaPrimary= sigma1d)
         problem.curModel = sig
     problem.pair(survey)
     problem.verbose = False

simpegMT/__init__.py

@@ -3,6 +3,6 @@ import Utils
 # import Tests
 import Sources
 # from BaseMT import SurveyMT, RxMT, srcMT, DataMT, FieldsMT
-import BaseMT
+# import BaseMT
 import SurveyMT, DataMT, FieldsMT
-import ProblemMT1D, ProblemMT2D, ProblemMT3D
+import Problem1D, Problem2D, Problem3D