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

Merge branch 'feat/GlobalProblem' of https://github.com/simpeg/simpeg into feat/GlobalProblem

Browse Source 
Conflicts:
	SimPEG/Problem.py
This commit is contained in:
seogi_macbook
2016-01-28 18:54:43 -08:00
parent e3a22a713f 97cec29612
commit 89928369ea
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/Maps.py
+9 -4
View File
@@ -502,12 +502,17 @@ class Mesh2MeshTopo(IdentityMap):
if self.tree==None:
self.tree = cKDTree(zip(self.mesh.gridCC[self.actind,0], self.mesh.gridCC[self.actind,1], self.mesh.gridCC[self.actind,2]))
d, inds = self.tree.query(zip(self.mesh2.gridCC[self.actind2,0],self.mesh2.gridCC[self.actind2,1],self.mesh2.gridCC[self.actind2,2]), k=self.nIterpPts)
w = 1./ d**2
w = Utils.sdiag(1./np.sum(w, axis=1)) * w
I = Utils.mkvc(np.arange(inds.shape[0]).reshape([-1,1]).repeat(6, axis=1))
# Not sure consideration of the volume ...
# vol = np.zeros((self.actind2.sum(), self.nIterpPts))
# for i in range(self.nIterpPts):
# vol[:,i] = self.mesh.vol[inds[:,i]]
w = 1. / d**2
w = Utils.sdiag(1./np.sum(w, axis=1)) * (w)
I = Utils.mkvc(np.arange(inds.shape[0]).reshape([-1,1]).repeat(self.nIterpPts, axis=1))
J = Utils.mkvc(inds)
P = sp.coo_matrix( (Utils.mkvc(w),(I, J)), shape=(inds.shape[0], (self.actind).sum()) )
self.P = P.tocsc()
# self.P = Utils.sdiag(self.mesh2.vol[self.actind2])*P.tocsc()
self.P = P.tocsc()
@property
def shape(self):