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

fixed Tikhonov deriv and added non-zero mref to testing

Browse Source
This commit is contained in:
Lindsey Heagy
2015-07-04 13:21:56 -07:00
parent 94ef2f1eb6
commit 001bcbce27
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/Regularization.py
+2 -2
View File
@@ -303,8 +303,8 @@ class Tikhonov(BaseRegularization):
if self.smoothModel == True:
mD1 = self.mapping.deriv(m)
mD2 = self.mapping.deriv(self.mref)
r1 = self.W * ( self.mapping * (m) )
r2 = self.Ws * ( self.mapping * (self.mref) )
r1 = self.W * ( self.mapping * (m - self.mref) )
r2 = self.Ws * ( self.mapping * (m - self.mref) )
out1 = mD1.T * ( self.W.T * r1 )
out2 = mD2.T * ( self.Ws.T * r2 )
out = out1-out2
SimPEG/Tests/test_regularization.py
+1 -1
View File
@@ -22,7 +22,7 @@ class RegularizationTests(unittest.TestCase):
mapping = r.mapPair(self.mesh2)
reg = r(self.mesh2, mapping=mapping)
m = np.random.rand(mapping.nP)
reg.mref = m[:]*0
reg.mref = m[:]*np.mean(m)
passed = checkDerivative(lambda m : [reg.eval(m), reg.evalDeriv(m)], m, plotIt=False)
self.assertTrue(passed)