wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-07-19 11:28:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed comment block and made deriv mD2 term consistent with eval call

Browse Source
This commit is contained in:
Lindsey Heagy
2015-07-04 16:15:16 -07:00
parent 0b5453dc98
commit 9900885984
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/Regularization.py
+2 -6
View File
@@ -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) )