From e179b5e71d280a5c3c41b00e55e8420c3d7fe267 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Tue, 28 Jun 2016 11:25:17 -0700 Subject: [PATCH 1/2] make sure factors of JtVec get cleaned --- SimPEG/EM/TDEM/TDEM.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SimPEG/EM/TDEM/TDEM.py b/SimPEG/EM/TDEM/TDEM.py index a56982c0..88954d97 100644 --- a/SimPEG/EM/TDEM/TDEM.py +++ b/SimPEG/EM/TDEM/TDEM.py @@ -175,7 +175,7 @@ class BaseTDEMProblem(Problem.BaseTimeProblem, BaseEMProblem): for src in self.survey.srcList: PT_v = Fields_Derivs(self.mesh, self.survey) # initialize storage for PT_v (don't need to preserve over sources) # initialize size - df_duT_v[src, '%sDeriv'%self._fieldType, :] = np.zeros_like(f[src, self._fieldType, :]) + df_duT_v[src, '%sDeriv'%self._fieldType, :] = sp.zeros_like(f[src, self._fieldType, :]) for rx in src.rxList: PT_v[src,'%sDeriv'%rx.projField,:] = rx.evalDeriv(src, self.mesh, self.timeMesh, Utils.mkvc(v[src,rx]), adjoint=True) # this is += @@ -272,7 +272,7 @@ class BaseTDEMProblem(Problem.BaseTimeProblem, BaseEMProblem): # JTv = JTv - Utils.mkvc(self.getAdiagDeriv(0, f[src, ftype, tInd], v, adjoint = True)) # # JTv = JTv + self.getInitialFieldsDeriv(Utils.mkvc(df_duT_v[src,'%sDeriv'%self._fieldType,0] - Asubdiag.T * Utils.mkvc(ATinv_df_duT_v[isrc,:])), adjoint=True) - + AdiagTinv.clean() return Utils.mkvc(JTv).astype(float) From 875885c684c7b7c955d608c9deb34132b344bba6 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Tue, 28 Jun 2016 11:28:44 -0700 Subject: [PATCH 2/2] typo fix --- SimPEG/EM/TDEM/TDEM.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SimPEG/EM/TDEM/TDEM.py b/SimPEG/EM/TDEM/TDEM.py index 88954d97..37f9c54d 100644 --- a/SimPEG/EM/TDEM/TDEM.py +++ b/SimPEG/EM/TDEM/TDEM.py @@ -175,7 +175,7 @@ class BaseTDEMProblem(Problem.BaseTimeProblem, BaseEMProblem): for src in self.survey.srcList: PT_v = Fields_Derivs(self.mesh, self.survey) # initialize storage for PT_v (don't need to preserve over sources) # initialize size - df_duT_v[src, '%sDeriv'%self._fieldType, :] = sp.zeros_like(f[src, self._fieldType, :]) + df_duT_v[src, '%sDeriv'%self._fieldType, :] = np.zeros_like(f[src, self._fieldType, :]) for rx in src.rxList: PT_v[src,'%sDeriv'%rx.projField,:] = rx.evalDeriv(src, self.mesh, self.timeMesh, Utils.mkvc(v[src,rx]), adjoint=True) # this is += @@ -272,7 +272,8 @@ class BaseTDEMProblem(Problem.BaseTimeProblem, BaseEMProblem): # JTv = JTv - Utils.mkvc(self.getAdiagDeriv(0, f[src, ftype, tInd], v, adjoint = True)) # # JTv = JTv + self.getInitialFieldsDeriv(Utils.mkvc(df_duT_v[src,'%sDeriv'%self._fieldType,0] - Asubdiag.T * Utils.mkvc(ATinv_df_duT_v[isrc,:])), adjoint=True) - AdiagTinv.clean() + if AdiagTinv is not None: + AdiagTinv.clean() return Utils.mkvc(JTv).astype(float)