start of the sketch of Jvec (not to be trusted yet!)

This commit is contained in:
Lindsey Heagy
2016-04-22 17:48:26 -07:00
parent 5ec6e79a39
commit 8775364d8f
7 changed files with 168 additions and 4 deletions
+39 -3
View File
@@ -3,6 +3,7 @@ from SimPEG.EM.Base import BaseEMProblem
from SurveyDC import Survey
from FieldsDC import Fields, Fields_CC
import numpy as np
from SimPEG.Utils import Zero
class BaseDCProblem(BaseEMProblem):
@@ -21,7 +22,30 @@ class BaseDCProblem(BaseEMProblem):
return f
def Jvec(self, m, v, f=None):
raise NotImplementedError
if f is None:
f = self.fields(m)
self.curModel = m
Jv = self.dataPair(self.survey) #same size as the data
A = self.getA()
Ainv = self.Solver(A, **self.solverOpts)
for src in self.survey.srcList:
u_src = f[src, self._solutionType] # solution vector
dA_dm_v = self.getADeriv(u_src, v)
dRHS_dm_v = self.getRHSDeriv(src, v)
print type(dA_dm_v + dRHS_dm_v), (dA_dm_v + dRHS_dm_v).shape
du_dm_v = Ainv * ( - dA_dm_v + dRHS_dm_v )
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)
Ainv.clean()
return Utils.mkvc(Jv)
def Jtvec(self, m, v, f=None):
raise NotImplementedError
@@ -85,6 +109,18 @@ class Problem3D_CC(BaseDCProblem):
def getADeriv(self, u, v, adjoint= False):
D = self.mesh.faceDiv
MfRhoIDeriv = self.MfRhoIDeriv
V = self.Vol
if adjoint:
if self._makeASymmetric is True:
v = V * v
return V.T * ( D * ( MfRhoIDeriv(D * v) ) )
if self._makeASymmetric is True:
return V.T * ( D * ( MfRhoIDeriv( * D.T * ( V * u ) ) * v ) )
return D * ( MfRhoIDeriv( D.T * ( V * v ) ) )
def getRHS(self):
"""
@@ -98,8 +134,8 @@ class Problem3D_CC(BaseDCProblem):
return self.Vol.T * RHS
return RHS
def getRHSDeriv():
raise NotImplementedError
def getRHSDeriv(self, src, v, adjoint=False):
return Zero()
+1 -1
View File
@@ -48,7 +48,7 @@ class Dipole(BaseRx):
@property
def nD(self):
"""Number of data in the receiver."""
return self.locs[0].shape[0]
return int(self.locs[0].size / 2)
def getP(self, mesh, Gloc):
if mesh in self._Ps:
+38
View File
@@ -0,0 +1,38 @@
import numpy as np
def WennerSrcList(nElecs, aSpacing, in2D=False, plotIt=False):
import SimPEG.EM.Static.DC as DC
elocs = np.arange(0,aSpacing*nElecs,aSpacing)
elocs -= (nElecs*aSpacing - aSpacing)/2
space = 1
WENNER = np.zeros((0,),dtype=int)
for ii in range(nElecs):
for jj in range(nElecs):
test = np.r_[jj,jj+space,jj+space*2,jj+space*3]
if np.any(test >= nElecs):
break
WENNER = np.r_[WENNER, test]
space += 1
WENNER = WENNER.reshape((-1,4))
if plotIt:
for i, s in enumerate('rbkg'):
plt.plot(elocs[WENNER[:,i]],s+'.')
plt.show()
# Create sources and receivers
i = 0
if in2D:
getLoc = lambda ii, abmn: np.r_[elocs[WENNER[ii,abmn]],0]
else:
getLoc = lambda ii, abmn: np.r_[elocs[WENNER[ii,abmn]],0, 0]
srcList = []
for i in range(WENNER.shape[0]):
rx = DC.Rx.Dipole(getLoc(i,1),getLoc(i,2))
src = DC.Src.Dipole([rx], getLoc(i,0),getLoc(i,3))
srcList += [src]
return srcList
+1
View File
@@ -3,3 +3,4 @@ from SurveyDC import Survey
import SrcDC as Src #Pole
import RxDC as Rx
from FieldsDC import Fields_CC
import Utils