Move analytics and Sources into main directory.

simpegEM/FDEM/FDEM.py

@@ -1,7 +1,7 @@
 from SimPEG import Survey, Problem, Utils, np, sp, Solver as SimpegSolver
 from scipy.constants import mu_0
 from SurveyFDEM import SurveyFDEM, FieldsFDEM
-from simpegEM.Utils import Sources
+from simpegEM import Sources
 from simpegEM.Base import BaseEMProblem
 
 def omega(freq):

simpegEM/TDEM/BaseTDEM.py

@@ -1,6 +1,6 @@
 from SimPEG import Solver, Problem
 from SimPEG.Problem import BaseTimeProblem
-from simpegEM.Utils import Sources
+from simpegEM import Sources
 from scipy.constants import mu_0
 from SimPEG.Utils import sdiag, mkvc
 from SimPEG import Utils, Mesh

simpegEM/TDEM/SurveyTDEM.py

@@ -1,6 +1,6 @@
 from SimPEG import Utils, Survey, np
 from SimPEG.Survey import BaseSurvey
-from simpegEM.Utils import Sources
+from simpegEM import Sources
 from BaseTDEM import FieldsTDEM
 
 
@@ -106,7 +106,7 @@ class TxTDEM(Survey.BaseTx):
         else:
             raise Exception('Unknown mesh for CircularLoop')
 
-        return {"b": mesh.edgeCurl*MVP}        
+        return {"b": mesh.edgeCurl*MVP}
 
     def getJs(self, mesh, time):
         return None

simpegEM/Tests/test_FDEM_analytics.py

@@ -58,7 +58,7 @@ class FDEM_analyticTests(unittest.TestCase):
 
         P = self.mesh.getInterpolationMat(XYZ, 'Fz')
 
-        an = EM.Utils.Ana.FEM.hzAnalyticDipoleF(x, self.Tx0.freq, self.sig)
+        an = EM.Analytics.FEM.hzAnalyticDipoleF(x, self.Tx0.freq, self.sig)
 
         diff = np.log10(np.abs(P*np.imag(u[self.Tx0, 'b']) - mu_0*np.imag(an)))
 

simpegEM/Tests/test_TDEM_forward_Analytic.py

@@ -41,7 +41,7 @@ def halfSpaceProblemAnaDiff(meshType, sig_half=1e-2, rxOffset=50., bounds=[1e-5,
     sigma = np.log(sigma[active])
     prb.pair(survey)
 
-    bz_ana = mu_0*EM.Utils.Ana.hzAnalyticDipoleT(rx.locs[0][0]+1e-3, rx.times, sig_half)
+    bz_ana = mu_0*EM.Analytics.hzAnalyticDipoleT(rx.locs[0][0]+1e-3, rx.times, sig_half)
 
     bz_calc = survey.dpred(sigma)
 

simpegEM/Utils/__init__.py

@@ -1,3 +0,0 @@
-import Sources
-import Ana
-# import Solver

simpegEM/__init__.py

@@ -1,5 +1,6 @@
 # from EM import *
-import Utils
 import TDEM
 import FDEM
-import Base
+import Base
+import Sources
+import Analytics