Remove use of data class Jv when computing Jvec

This commit is contained in:
seogi_macbook
2016-06-30 11:50:56 -07:00
parent ea5064902c
commit 3f3b2e9232
+7 -5
View File
@@ -35,10 +35,11 @@ class BaseDCProblem(BaseEMProblem):
self.curModel = m
Jv = self.dataPair(self.survey) #same size as the data
# Jv = self.dataPair(self.survey) #same size as the data
A = self.getA()
Jv = []
for src in self.survey.srcList:
u_src = f[src, self._solutionType] # solution vector
dA_dm_v = self.getADeriv(u_src, v)
@@ -48,8 +49,10 @@ class BaseDCProblem(BaseEMProblem):
for rx in src.rxList:
df_dmFun = getattr(f, '_%sDeriv'%rx.projField, None)
df_dm_v = df_dmFun(src, du_dm_v, v, adjoint=False)
Jv[src, rx] = rx.evalDeriv(src, self.mesh, f, df_dm_v)
return Utils.mkvc(Jv)
# Jv[src, rx] = rx.evalDeriv(src, self.mesh, f, df_dm_v)
Jv.append(rx.evalDeriv(src, self.mesh, f, df_dm_v))
# return Utils.mkvc(Jv)
return np.hstack(Jv)
def Jtvec(self, m, v, f=None):
if f is None:
@@ -64,7 +67,6 @@ class BaseDCProblem(BaseEMProblem):
Jtv = np.zeros(m.size)
AT = self.getA()
for src in self.survey.srcList:
u_src = f[src, self._solutionType]
for rx in src.rxList: