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

modelObj and dataObj --> eval

Browse Source
This commit is contained in:
rowanc1
2014-05-18 17:09:44 -07:00
parent c153183894
commit 8f69670fce
5 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/InvProblem.py
+8 -8
View File
@@ -50,8 +50,8 @@ class BaseInvProblem(object):
self.m_current = m0
print 'SimPEG.InvProblem is setting bfgsH0 to the inverse of the modelObj2Deriv. \n ***Done using direct methods***'
self.opt.bfgsH0 = Solver(self.reg.modelObj2Deriv(self.m_current))
print 'SimPEG.InvProblem is setting bfgsH0 to the inverse of the eval2Deriv. \n ***Done using direct methods***'
self.opt.bfgsH0 = Solver(self.reg.eval2Deriv(self.m_current))
@Utils.timeIt
def evalFunction(self, m, return_g=True, return_H=True):
@@ -66,8 +66,8 @@ class BaseInvProblem(object):
u = self.prob.fields(m)
self.u_current = u
phi_d = self.dmisfit.dataObj(m, u=u)
phi_m = self.reg.modelObj(m)
phi_d = self.dmisfit.eval(m, u=u)
phi_m = self.reg.eval(m)
self.dpred = self.survey.dpred(m, u=u) # This is a cheap matrix vector calculation.
@@ -78,16 +78,16 @@ class BaseInvProblem(object):
out = (f,)
if return_g:
phi_dDeriv = self.dmisfit.dataObjDeriv(m, u=u)
phi_mDeriv = self.reg.modelObjDeriv(m)
phi_dDeriv = self.dmisfit.evalDeriv(m, u=u)
phi_mDeriv = self.reg.evalDeriv(m)
g = phi_dDeriv + self.beta * phi_mDeriv
out += (g,)
if return_H:
def H_fun(v):
phi_d2Deriv = self.dmisfit.dataObj2Deriv(m, v, u=u)
phi_m2Deriv = self.reg.modelObj2Deriv(m, v=v)
phi_d2Deriv = self.dmisfit.eval2Deriv(m, v, u=u)
phi_m2Deriv = self.reg.eval2Deriv(m, v=v)
return phi_d2Deriv + self.beta * phi_m2Deriv