From 99008859849be416b1b44258250e42e32a8d1b46 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Sat, 4 Jul 2015 16:15:16 -0700 Subject: [PATCH] removed comment block and made deriv mD2 term consistent with eval call --- SimPEG/Regularization.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/SimPEG/Regularization.py b/SimPEG/Regularization.py index 183c8fb5..e3506290 100644 --- a/SimPEG/Regularization.py +++ b/SimPEG/Regularization.py @@ -277,10 +277,6 @@ class Tikhonov(BaseRegularization): """Full regularization matrix W""" if getattr(self, '_W', None) is None: wlist = (self.Ws, self.Wsmooth) - # if self.mesh.dim > 1: - # wlist += (self.Wy, self.Wyy) - # if self.mesh.dim > 2: - # wlist += (self.Wz, self.Wzz) self._W = sp.vstack(wlist) return self._W @@ -314,12 +310,12 @@ class Tikhonov(BaseRegularization): """ if self.smoothModel == True: mD1 = self.mapping.deriv(m) - mD2 = self.mapping.deriv(self.mref) + mD2 = self.mapping.deriv(m - self.mref) r1 = self.Wsmooth * ( self.mapping * (m)) r2 = self.Ws * ( self.mapping * (m - self.mref) ) out1 = mD1.T * ( self.Wsmooth.T * r1 ) out2 = mD2.T * ( self.Ws.T * r2 ) - out = out1-out2 + out = out1+out2 elif self.smoothModel == False: mD = self.mapping.deriv(m - self.mref) r = self.W * ( self.mapping * (m - self.mref) )