From 3b62957d08b08f9e43f75ff557536f9d417cd986 Mon Sep 17 00:00:00 2001
From: Lindsey Heagy <lheagy@eos.ubc.ca>
Date: Fri, 13 Nov 2015 08:44:34 -0800
Subject: [PATCH] re-named SrcUtils to AnalyticUtils, cleaned up namespace for
 imports to close #159

---
 SimPEG/EM/FDEM/FDEM.py                            |  2 +-
 SimPEG/EM/FDEM/FieldsFDEM.py                      |  2 +-
 SimPEG/EM/FDEM/SurveyFDEM.py                      | 13 ++++++-------
 SimPEG/EM/Utils/{SrcUtils.py => AnalyticUtils.py} |  0
 SimPEG/EM/Utils/__init__.py                       |  4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)
 rename SimPEG/EM/Utils/{SrcUtils.py => AnalyticUtils.py} (100%)

diff --git a/SimPEG/EM/FDEM/FDEM.py b/SimPEG/EM/FDEM/FDEM.py
index 6d3df44f..9d3be6b2 100644
--- a/SimPEG/EM/FDEM/FDEM.py
+++ b/SimPEG/EM/FDEM/FDEM.py
@@ -3,7 +3,7 @@ from scipy.constants import mu_0
 from SurveyFDEM import SurveyFDEM
 from FieldsFDEM import FieldsFDEM, FieldsFDEM_e, FieldsFDEM_b, FieldsFDEM_h, FieldsFDEM_j
 from SimPEG.EM.Base import BaseEMProblem
-from SimPEG.EM.Utils.EMUtils import omega
+from SimPEG.EM.Utils import omega
 
 
 class BaseFDEMProblem(BaseEMProblem):
diff --git a/SimPEG/EM/FDEM/FieldsFDEM.py b/SimPEG/EM/FDEM/FieldsFDEM.py
index bb786bd1..53f90c4b 100644
--- a/SimPEG/EM/FDEM/FieldsFDEM.py
+++ b/SimPEG/EM/FDEM/FieldsFDEM.py
@@ -1,5 +1,5 @@
 from SimPEG import Survey, Problem, Utils, np, sp
-from SimPEG.EM.Utils.EMUtils import omega
+from SimPEG.EM.Utils import omega
 
 
 class FieldsFDEM(Problem.Fields):
diff --git a/SimPEG/EM/FDEM/SurveyFDEM.py b/SimPEG/EM/FDEM/SurveyFDEM.py
index dbda9f80..94cac712 100644
--- a/SimPEG/EM/FDEM/SurveyFDEM.py
+++ b/SimPEG/EM/FDEM/SurveyFDEM.py
@@ -1,6 +1,5 @@
 from SimPEG import Survey, Problem, Utils, np, sp
-from SimPEG.EM.Utils import SrcUtils
-from SimPEG.EM.Utils.EMUtils import omega, e_from_j, j_from_e, b_from_h, h_from_b
+from SimPEG.EM.Utils import *
 from scipy.constants import mu_0
 
 ####################################################
@@ -258,10 +257,10 @@ class SrcFDEM_MagDipole(SrcFDEM):
             if not prob.mesh.isSymmetric:
                 # TODO ?
                 raise NotImplementedError('Non-symmetric cyl mesh not implemented yet!')
-            a = SrcUtils.MagneticDipoleVectorPotential(self.loc, gridY, 'y', mu=self.mu, moment=self.moment)
+            a = MagneticDipoleVectorPotential(self.loc, gridY, 'y', mu=self.mu, moment=self.moment)
 
         else:
-            srcfct = SrcUtils.MagneticDipoleVectorPotential
+            srcfct = MagneticDipoleVectorPotential
             ax = srcfct(self.loc, gridX, 'x', mu=self.mu, moment=self.moment)
             ay = srcfct(self.loc, gridY, 'y', mu=self.mu, moment=self.moment)
             az = srcfct(self.loc, gridZ, 'z', mu=self.mu, moment=self.moment)
@@ -322,7 +321,7 @@ class SrcFDEM_MagDipole_Bfield(SrcFDEM):
             gridZ = prob.mesh.gridEz
             C = prob.mesh.edgeCurl.T
 
-        srcfct = SrcUtils.MagneticDipoleFields
+        srcfct = MagneticDipoleFields
         if prob.mesh._meshType is 'CYL':
             if not prob.mesh.isSymmetric:
                 # TODO ?
@@ -395,10 +394,10 @@ class SrcFDEM_CircularLoop(SrcFDEM):
             if not prob.mesh.isSymmetric:
                 # TODO ?
                 raise NotImplementedError('Non-symmetric cyl mesh not implemented yet!')
-            a = SrcUtils.MagneticDipoleVectorPotential(self.loc, gridY, 'y', moment=self.radius, mu=self.mu)
+            a = MagneticDipoleVectorPotential(self.loc, gridY, 'y', moment=self.radius, mu=self.mu)
 
         else:
-            srcfct = SrcUtils.MagneticDipoleVectorPotential
+            srcfct = MagneticDipoleVectorPotential
             ax = srcfct(self.loc, gridX, 'x', self.radius, mu=self.mu)
             ay = srcfct(self.loc, gridY, 'y', self.radius, mu=self.mu)
             az = srcfct(self.loc, gridZ, 'z', self.radius, mu=self.mu)
diff --git a/SimPEG/EM/Utils/SrcUtils.py b/SimPEG/EM/Utils/AnalyticUtils.py
similarity index 100%
rename from SimPEG/EM/Utils/SrcUtils.py
rename to SimPEG/EM/Utils/AnalyticUtils.py
diff --git a/SimPEG/EM/Utils/__init__.py b/SimPEG/EM/Utils/__init__.py
index 487bd909..18dddde9 100644
--- a/SimPEG/EM/Utils/__init__.py
+++ b/SimPEG/EM/Utils/__init__.py
@@ -1,5 +1,5 @@
 # import Sources
 # import Ana
 # import Solver
-from EMUtils import *
-from SrcUtils import * 
\ No newline at end of file
+from EMUtils import omega, e_from_j, j_from_e, b_from_h, h_from_b
+from AnalyticUtils import MagneticDipoleFields, MagneticDipoleVectorPotential, MagneticLoopVectorPotential
\ No newline at end of file