From f080c61f74246ff734274a87de0df459625a1212 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Thu, 28 May 2015 08:35:41 -0700 Subject: [PATCH] fixed test_FDEM_analytics.py --- simpegEM/Analytics/FDEM.py | 5 ++++- simpegEM/Tests/test_FDEM_analytics.py | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/simpegEM/Analytics/FDEM.py b/simpegEM/Analytics/FDEM.py index d542cd4e..a0ec6776 100644 --- a/simpegEM/Analytics/FDEM.py +++ b/simpegEM/Analytics/FDEM.py @@ -34,7 +34,10 @@ def hzAnalyticDipoleF(r, freq, sigma, secondary=True): if secondary: hp =-1/(4*np.pi*r**3) - return hz-hp + hz = hz-hp + + if hz.ndim == 1: + hz = Utils.mkvc(hz,2) return hz diff --git a/simpegEM/Tests/test_FDEM_analytics.py b/simpegEM/Tests/test_FDEM_analytics.py index 0584ba3c..c0fc4210 100644 --- a/simpegEM/Tests/test_FDEM_analytics.py +++ b/simpegEM/Tests/test_FDEM_analytics.py @@ -3,7 +3,7 @@ from SimPEG import * import simpegEM as EM from scipy.constants import mu_0 -plotIt = True +plotIt = False freq = 1e2 class FDEM_analyticTests(unittest.TestCase): @@ -23,7 +23,7 @@ class FDEM_analyticTests(unittest.TestCase): x = np.linspace(-10,10,5) XYZ = Utils.ndgrid(x,np.r_[0],np.r_[0]) rxList = EM.FDEM.RxFDEM(XYZ, 'exi') - Src0 = EM.FDEM.SrcFDEM_MagDipole([rxList],freq,np.r_[0.,0.,0.]) + Src0 = EM.FDEM.SrcFDEM_MagDipole([rxList],loc=np.r_[0.,0.,0.], freq=freq) survey = EM.FDEM.SurveyFDEM([Src0]) @@ -53,7 +53,6 @@ class FDEM_analyticTests(unittest.TestCase): u = self.prb.fields(self.m) bfz = self.mesh.r(u[self.Src0, 'b'],'F','Fz','M') - x = np.linspace(-55,55,12) XYZ = Utils.ndgrid(x,np.r_[0],np.r_[0])