From dd766a3ce36c3efbd83ad4ca9515429f37d6ece9 Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Fri, 4 Jul 2014 14:51:54 -0700 Subject: [PATCH] update the code to use sources differently. --- simpegEM/FDEM/FDEM.py | 5 +---- simpegEM/TDEM/SurveyTDEM.py | 14 ++++---------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/simpegEM/FDEM/FDEM.py b/simpegEM/FDEM/FDEM.py index d137060c..9e31002a 100644 --- a/simpegEM/FDEM/FDEM.py +++ b/simpegEM/FDEM/FDEM.py @@ -164,10 +164,7 @@ class ProblemFDEM_e(BaseFDEMProblem): src = Sources.MagneticDipoleVectorPotential else: raise NotImplemented('%s txType is not implemented' % tx.txType) - SRCx = src(tx.loc, self.mesh.gridEx, 'x') - SRCy = src(tx.loc, self.mesh.gridEy, 'y') - SRCz = src(tx.loc, self.mesh.gridEz, 'z') - rhs[i] = np.concatenate((SRCx, SRCy, SRCz)) + rhs[i] = src(tx.loc, self.mesh, ['Ex','Ey','Ez']) a = np.concatenate(rhs).reshape((self.mesh.nE, len(Txs)), order='F') mui = self.MfMui diff --git a/simpegEM/TDEM/SurveyTDEM.py b/simpegEM/TDEM/SurveyTDEM.py index 2b0b2ce5..e4901663 100644 --- a/simpegEM/TDEM/SurveyTDEM.py +++ b/simpegEM/TDEM/SurveyTDEM.py @@ -78,14 +78,11 @@ class TxTDEM(Survey.BaseTx): """Vertical magnetic dipole, magnetic vector potential""" if mesh._meshType is 'CYL': if mesh.isSymmetric: - MVP = Sources.MagneticDipoleVectorPotential(self.loc, mesh.gridEy, 'y') + MVP = Sources.MagneticDipoleVectorPotential(self.loc, mesh, 'Ey') else: raise NotImplementedError('Non-symmetric cyl mesh not implemented yet!') elif mesh._meshType is 'TENSOR': - MVPx = Sources.MagneticDipoleVectorPotential(self.loc, mesh.gridEx, 'x') - MVPy = Sources.MagneticDipoleVectorPotential(self.loc, mesh.gridEy, 'y') - MVPz = Sources.MagneticDipoleVectorPotential(self.loc, mesh.gridEz, 'z') - MVP = np.concatenate((MVPx, MVPy, MVPz)) + MVP = Sources.MagneticDipoleVectorPotential(self.loc, mesh, ['Ex','Ey','Ez']) else: raise Exception('Unknown mesh for VMD') @@ -95,14 +92,11 @@ class TxTDEM(Survey.BaseTx): """Circular Loop, magnetic vector potential""" if mesh._meshType is 'CYL': if mesh.isSymmetric: - MVP = Sources.MagneticLoopVectorPotential(self.loc, mesh.gridEy, 'y', self.radius) + MVP = Sources.MagneticLoopVectorPotential(self.loc, mesh, 'Ey', self.radius) else: raise NotImplementedError('Non-symmetric cyl mesh not implemented yet!') elif mesh._meshType is 'TENSOR': - MVPx = Sources.MagneticLoopVectorPotential(self.loc, mesh.gridEx, 'x', self.radius) - MVPy = Sources.MagneticLoopVectorPotential(self.loc, mesh.gridEy, 'y', self.radius) - MVPz = Sources.MagneticLoopVectorPotential(self.loc, mesh.gridEz, 'z', self.radius) - MVP = np.concatenate((MVPx, MVPy, MVPz)) + MVP = Sources.MagneticLoopVectorPotential(self.loc, mesh, ['Ex','Ey','Ez']) else: raise Exception('Unknown mesh for CircularLoop')