From b8118464b87abd49e80ffbf8c1b3b949a05c8c88 Mon Sep 17 00:00:00 2001 From: Lindsey Date: Fri, 8 May 2015 14:59:58 -0700 Subject: [PATCH] Time fields objects return arrays --- SimPEG/Problem.py | 6 ++++-- SimPEG/Tests/test_Survey.py | 12 ++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/SimPEG/Problem.py b/SimPEG/Problem.py index 7b337977..1787a472 100644 --- a/SimPEG/Problem.py +++ b/SimPEG/Problem.py @@ -216,6 +216,8 @@ class TimeFields(Fields): shape = nP, nSrc, nT if deflate: shape = tuple([s for s in shape if s > 1]) + if len(shape) == 1: + shape = shape + (1,) return shape def _setField(self, field, val, name, ind): @@ -260,8 +262,8 @@ class TimeFields(Fields): out = range(nT) for i, TIND_i in enumerate(timeII): fieldI = pointerFields[:,:,i] - if fieldI.ndim == 2 and fieldI.shape[1] == 1: - fieldI = Utils.mkvc(fieldI) + if fieldI.shape[0] == fieldI.size: + fieldI = Utils.mkvc(fieldI,2) out[i] = func(fieldI, srcII, TIND_i) if out[i].ndim == 1: out[i] = out[i][:,np.newaxis,np.newaxis] diff --git a/SimPEG/Tests/test_Survey.py b/SimPEG/Tests/test_Survey.py index fd3dbf06..efc1e901 100644 --- a/SimPEG/Tests/test_Survey.py +++ b/SimPEG/Tests/test_Survey.py @@ -249,7 +249,7 @@ class FieldsTest_Time(unittest.TestCase): b = np.random.rand(F.mesh.nF,1,nT) F[self.Src0, 'b', 0] = b[:,:,0] - self.assertTrue(np.all(F[self.Src0, 'b', 0] == b[:,0,0])) + self.assertTrue(np.all(F[self.Src0, 'b', 0] == Utils.mkvc(b[:,0,0],2))) phi = np.random.rand(F.mesh.nC,2,nT) F[[self.Src0,self.Src1], 'phi'] = phi @@ -265,10 +265,10 @@ class FieldsTest_Time(unittest.TestCase): self.assertTrue(F[self.Src0,'b'].shape == (F.mesh.nF,nT)) self.assertTrue(np.all(F[self.Src0,'b'] == b[:,0,:])) self.assertTrue(np.all(F[self.Src1,'b'] == b[:,1,:])) - self.assertTrue(np.all(F[self.Src0,'b',1] == b[:,0,1])) - self.assertTrue(np.all(F[self.Src1,'b',1] == b[:,1,1])) - self.assertTrue(np.all(F[self.Src0,'b',4] == b[:,0,4])) - self.assertTrue(np.all(F[self.Src1,'b',4] == b[:,1,4])) + self.assertTrue(np.all(F[self.Src0,'b',1] == Utils.mkvc(b[:,0,1],2))) + self.assertTrue(np.all(F[self.Src1,'b',1] == Utils.mkvc(b[:,1,1],2))) + self.assertTrue(np.all(F[self.Src0,'b',4] == Utils.mkvc(b[:,0,4],2))) + self.assertTrue(np.all(F[self.Src1,'b',4] == Utils.mkvc(b[:,1,4],2))) b = np.random.rand(F.mesh.nF, 2, nT) @@ -344,7 +344,7 @@ class FieldsTest_Time_Aliased(unittest.TestCase): self.assertTrue(np.all(F[self.Src0, 'e', :] == e[:,0,:] )) self.assertTrue(np.all(F[self.Src1, 'e', :] == e[:,1,:] )) for t in range(nT): - self.assertTrue(np.all(F[self.Src1, 'e', t] == e[:,1,t] )) + self.assertTrue(np.all(F[self.Src1, 'e', t] == Utils.mkvc(e[:,1,t],2) )) b = np.random.rand(F.mesh.nF,nT) F[self.Src0, 'b',:] = b