From dd0a2e3878d5336c1bbf5ea556a333d1f2b69ac6 Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Thu, 15 May 2014 12:28:46 -0700 Subject: [PATCH] Testing of fields in time with alias. --- SimPEG/Survey.py | 2 +- SimPEG/Tests/test_Survey.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SimPEG/Survey.py b/SimPEG/Survey.py index bd240263..f2637e95 100644 --- a/SimPEG/Survey.py +++ b/SimPEG/Survey.py @@ -434,7 +434,7 @@ class TimeFields(Fields): pointerFields = self._fields[alias][:,txInd,timeInd] pointerShape = self._correctShape(alias, ind, deflate=True) pointerFields = pointerFields.reshape(pointerShape, order='F') - if len(pointerShape) == 2: + if len(pointerShape) < 3: out = func(self, pointerFields, txInd) else: #loop over the time steps nT = pointerShape[2] diff --git a/SimPEG/Tests/test_Survey.py b/SimPEG/Tests/test_Survey.py index b5dfb076..53a252be 100644 --- a/SimPEG/Tests/test_Survey.py +++ b/SimPEG/Tests/test_Survey.py @@ -288,7 +288,6 @@ class FieldsTest_Time_Aliased(unittest.TestCase): prob = Problem.BaseTimeProblem(mesh, timeSteps=[(10.,3), (20.,2)]) survey.pair(prob) def alias(F, b, ind): - print 'aliasB: b.shape:', b.shape return F.mesh.edgeCurl.T * b self.F = Survey.TimeFields(mesh, survey, knownFields={'b':'F'}, aliasFields={'e':['b','E',alias]}) self.Tx0 = Tx0 @@ -322,6 +321,10 @@ class FieldsTest_Time_Aliased(unittest.TestCase): e[i] = e[i][:,:,np.newaxis] e = np.concatenate(e, axis=2) self.assertTrue(np.all(F[:, 'e', :] == e )) + self.assertTrue(np.all(F[self.Tx0, 'e', :] == e[:,0,:] )) + self.assertTrue(np.all(F[self.Tx1, 'e', :] == e[:,1,:] )) + for t in range(nT): + self.assertTrue(np.all(F[self.Tx1, 'e', t] == e[:,1,t] )) b = np.random.rand(F.mesh.nF,nT) F[self.Tx0, 'b',:] = b