wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-08-13 12:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bug Fixes and Adjoint Test.

Browse Source
This commit is contained in:
Rowan Cockett
2013-11-14 18:01:53 -08:00
parent 8f4e1174c8
commit bc49c6058f
3 changed files with 67 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/tests/TestUtils.py
+1 -1
View File
@@ -189,7 +189,7 @@ def Rosenbrock(x, return_g=True, return_H=True):
out += (H,)
return out if len(out) > 1 else out[0]
def checkDerivative(fctn, x0, num=7, plotIt=True, dx=None, expectedOrder=2, tolerance=0.9, eps=1e-10):
def checkDerivative(fctn, x0, num=7, plotIt=True, dx=None, expectedOrder=2, tolerance=0.85, eps=1e-10):
"""
Basic derivative check
SimPEG/tests/test_Richards.py
+46 -8
View File
@@ -1,4 +1,5 @@
import numpy as np
import scipy.sparse as sp
import unittest
from SimPEG.mesh import TensorMesh
from TestUtils import OrderTest, checkDerivative
@@ -6,6 +7,8 @@ from scipy.sparse.linalg import dsolve
from SimPEG.forward import Richards
TOL = 1E-8
class RichardsTests(unittest.TestCase):
def setUp(self):
@@ -13,16 +16,18 @@ class RichardsTests(unittest.TestCase):
Ks = 9.4400e-03
E = Richards.Haverkamp(Ks=np.log(Ks), A=1.1750e+06, gamma=4.74, alpha=1.6110e+06, theta_s=0.287, theta_r=0.075, beta=3.96)
prob = Richards.RichardsProblem(M,E)
prob.timeStep = 1
prob.boundaryConditions = np.array([-61.5,-20.7])
prob.doNewton = True
prob.method = 'mixed'
bc = np.array([-61.5,-20.7])
h = np.zeros(M.nC) + bc[0]
prob = Richards.RichardsProblem(M,E, timeStep=30, timeEnd=360, boundaryConditions=bc, initialConditions=h, doNewton=False, method='mixed')
q = sp.csr_matrix((np.ones(4),(np.arange(4),np.array([20, 30, 35, 38]))),shape=(4,M.nCx))
P = sp.kron(sp.identity(prob.numIts),q)
prob.P = P
h = np.zeros(M.nC) + prob.boundaryConditions[0]
self.h0 = h
self.M = M
self.Ks = Ks
self.prob = prob
def test_VanGenuchten_moistureContent(self):
@@ -71,11 +76,44 @@ class RichardsTests(unittest.TestCase):
def test_Richards_getResidual_Newton(self):
self.prob.doNewton = True
checkDerivative(lambda hn1: self.prob.getResidual(self.h0,hn1), self.h0, plotIt=False)
passed = checkDerivative(lambda hn1: self.prob.getResidual(self.h0,hn1), self.h0, plotIt=False)
self.assertTrue(passed,True)
def test_Richards_getResidual_Picard(self):
self.prob.doNewton = False
checkDerivative(lambda hn1: self.prob.getResidual(self.h0,hn1), self.h0, plotIt=False, expectedOrder=1)
passed = checkDerivative(lambda hn1: self.prob.getResidual(self.h0,hn1), self.h0, plotIt=False, expectedOrder=1)
self.assertTrue(passed,True)
def test_Adjoint_PressureHead(self):
# self.prob.dataType = 'pressureHead'
Ks = self.Ks
v = np.random.rand(self.prob.P.shape[0])
z = np.random.rand(self.M.nC)
Hs = self.prob.field(np.log(Ks))
vJz = v.dot(self.prob.J(np.log(Ks),z,u=Hs))
zJv = z.dot(self.prob.Jt(np.log(Ks),v,u=Hs))
tol = TOL*(10**int(np.log10(zJv)))
passed = np.abs(vJz - zJv) < tol
print 'Richards Adjoint Test - PressureHead'
print '%4.4e === %4.4e, diff=%4.4e < %4.e'%(vJz, zJv,np.abs(vJz - zJv),tol)
self.assertTrue(passed,True)
def test_Adjoint_Saturation(self):
self.prob.dataType = 'saturation'
Ks = self.Ks
v = np.random.rand(self.prob.P.shape[0])
z = np.random.rand(self.M.nC)
Hs = self.prob.field(np.log(Ks))
vJz = v.dot(self.prob.J(np.log(Ks),z,u=Hs))
zJv = z.dot(self.prob.Jt(np.log(Ks),v,u=Hs))
tol = TOL*(10**int(np.log10(zJv)))
passed = np.abs(vJz - zJv) < tol
print 'Richards Adjoint Test - Saturation'
print '%4.4e === %4.4e, diff=%4.4e < %4.e'%(vJz, zJv,np.abs(vJz - zJv),tol)
self.assertTrue(passed,True)