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

Issue #28: fixed the aveN2CC and vector quantities.

Browse Source
This commit is contained in:
Rowan Cockett
2013-11-06 11:28:30 -08:00
parent abca84b954
commit 3f097a106d
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/mesh/Cyl1DMesh.py
+1 -1
View File
@@ -114,7 +114,7 @@ class Cyl1DMesh(object):
doc = "Total number of faces in each direction"
fget = lambda self: np.array([self.nFr, self.nFz])
return locals()
nF = property(**nF())
nFv = property(**nFv())
def nF():
doc = "Total number of faces"
SimPEG/mesh/DiffOperators.py
+7 -10
View File
@@ -306,12 +306,9 @@ class DiffOperators(object):
if(self.dim == 1):
self._aveN2CC = av(n[0])
elif(self.dim == 2):
self._aveN2CC = sp.hstack((sp.kron(av(n[1]), av(n[0])),
sp.kron(av(n[1]), av(n[0]))), format="csr")
self._aveN2CC = sp.kron(av(n[1]), av(n[0])).tocsr()
elif(self.dim == 3):
self._aveN2CC = sp.hstack((kron3(av(n[2]), av(n[1]), av(n[0])),
kron3(av(n[2]), av(n[1]), av(n[0])),
kron3(av(n[2]), av(n[1]), av(n[0]))), format="csr")
self._aveN2CC = kron3(av(n[2]), av(n[1]), av(n[0])).tocsr()
return self._aveN2CC
return locals()
_aveN2CC = None
@@ -327,12 +324,12 @@ class DiffOperators(object):
if(self.dim == 1):
self._aveN2CCv = av(n[0])
elif(self.dim == 2):
self._aveN2CCv = sp.block_diag((sp.kron(av(n[1]), av(n[0])),
sp.kron(av(n[1]), av(n[0]))), format="csr")
self._aveN2CCv = sp.block_diag((sp.kron(speye(n[1]), av(n[0])),
sp.kron(av(n[1]), speye(n[0]))), format="csr")
elif(self.dim == 3):
self._aveN2CCv = sp.block_diag((kron3(av(n[2]), av(n[1]), av(n[0])),
kron3(av(n[2]), av(n[1]), av(n[0])),
kron3(av(n[2]), av(n[1]), av(n[0]))), format="csr")
self._aveN2CCv = sp.block_diag((kron3(speye(n[2]), speye(n[1]), av(n[0])),
kron3(speye(n[2]), av(n[1]), speye(n[0])),
kron3(av(n[2]), speye(n[1]), speye(n[0]))), format="csr")
return self._aveN2CCv
return locals()
_aveN2CCv = None