Merge branch 'dcip/spectralIP' of https://github.com/simpeg/simpeg into dcip/dev

Merge spectral IP stuff, and incorporate Lindsey's comments
This commit is contained in:
seogi_macbook
2016-05-25 14:22:58 -07:00
12 changed files with 1162 additions and 36 deletions
+3 -5
View File
@@ -89,7 +89,7 @@ class BaseIPProblem(BaseEMProblem):
dA_dmT = self.getADeriv(u_src, ATinvdf_duT, adjoint=True)
dRHS_dmT = self.getRHSDeriv(src, ATinvdf_duT, adjoint=True)
du_dmT = -dA_dmT + dRHS_dmT
Jtv += df_dmT + du_dmT
Jtv += (df_dmT + du_dmT).astype(float)
# Conductivity ((d u / d log sigma).T)
if self._formulation is 'EB':
return -Utils.mkvc(Jtv)
@@ -180,13 +180,12 @@ class Problem3D_CC(BaseIPProblem):
Make the A matrix for the cell centered DC resistivity problem
A = D MfRhoI D^\\top V
A = D MfRhoI G
"""
D = self.Div
G = self.Grad
# TODO: this won't work for full anisotropy
MfRhoI = self.MfRhoI
A = D * MfRhoI * G
@@ -313,11 +312,10 @@ class Problem3D_N(BaseIPProblem):
Make the A matrix for the cell centered DC resistivity problem
A = D MfRhoI D^\\top V
A = G.T MeSigma G
"""
# TODO: this won't work for full anisotropy
MeSigma = self.MeSigma
Grad = self.mesh.nodalGrad
A = Grad.T * MeSigma * Grad