From 3f097a106d64bdfa9e74c65d4e61b3956bb2e34f Mon Sep 17 00:00:00 2001 From: Rowan Cockett Date: Wed, 6 Nov 2013 11:28:30 -0800 Subject: [PATCH] Issue #28: fixed the aveN2CC and vector quantities. --- SimPEG/mesh/Cyl1DMesh.py | 2 +- SimPEG/mesh/DiffOperators.py | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/SimPEG/mesh/Cyl1DMesh.py b/SimPEG/mesh/Cyl1DMesh.py index d9b62273..fa2bb729 100644 --- a/SimPEG/mesh/Cyl1DMesh.py +++ b/SimPEG/mesh/Cyl1DMesh.py @@ -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" diff --git a/SimPEG/mesh/DiffOperators.py b/SimPEG/mesh/DiffOperators.py index b295b970..756b9a48 100644 --- a/SimPEG/mesh/DiffOperators.py +++ b/SimPEG/mesh/DiffOperators.py @@ -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