From 1457e51fc1e8949a3cf6e765a92a2c7c6c09aab3 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Thu, 28 Jan 2016 23:44:02 -0800 Subject: [PATCH] from SimPEG.EM import mu_0 --- SimPEG/EM/FDEM/FDEM.py | 2 +- SimPEG/EM/__init__.py | 2 +- SimPEG/Examples/EM_FDEM_1D_Inversion.py | 4 ++-- SimPEG/Examples/EM_TDEM_1D_Inversion.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SimPEG/EM/FDEM/FDEM.py b/SimPEG/EM/FDEM/FDEM.py index ed440144..4c8b0c89 100644 --- a/SimPEG/EM/FDEM/FDEM.py +++ b/SimPEG/EM/FDEM/FDEM.py @@ -142,7 +142,7 @@ class BaseFDEMProblem(BaseEMProblem): raise Exception('Must be real or imag') ATinv.clean() - + return Utils.mkvc(Jtv) def getSourceTerm(self, freq): diff --git a/SimPEG/EM/__init__.py b/SimPEG/EM/__init__.py index 6a1ca774..565f63a8 100644 --- a/SimPEG/EM/__init__.py +++ b/SimPEG/EM/__init__.py @@ -1,6 +1,6 @@ -# from EM import * import TDEM import FDEM import Base import Analytics import Utils +from scipy.constants import mu_0, epsilon_0 diff --git a/SimPEG/Examples/EM_FDEM_1D_Inversion.py b/SimPEG/Examples/EM_FDEM_1D_Inversion.py index a6478016..ff87b6a6 100644 --- a/SimPEG/Examples/EM_FDEM_1D_Inversion.py +++ b/SimPEG/Examples/EM_FDEM_1D_Inversion.py @@ -1,6 +1,6 @@ from SimPEG import * import SimPEG.EM as EM -from scipy.constants import mu_0 +from SimPEG.EM import mu_0 def run(plotIt=True): @@ -59,7 +59,7 @@ def run(plotIt=True): prb.Solver = MumpsSolver except ImportError, e: prb.Solver = SolverLU - + prb.pair(survey) std = 0.05 diff --git a/SimPEG/Examples/EM_TDEM_1D_Inversion.py b/SimPEG/Examples/EM_TDEM_1D_Inversion.py index f217912d..65ae6669 100644 --- a/SimPEG/Examples/EM_TDEM_1D_Inversion.py +++ b/SimPEG/Examples/EM_TDEM_1D_Inversion.py @@ -1,6 +1,6 @@ from SimPEG import * import SimPEG.EM as EM -from scipy.constants import mu_0 +from SimPEG.EM import mu_0 def run(plotIt=True):