From 24c754cea2cc1d8ba8201d138fb703416fed7432 Mon Sep 17 00:00:00 2001 From: Lindsey Date: Fri, 8 May 2015 09:21:43 -0700 Subject: [PATCH] Working on making fields 1 wide in Problem.mp --- SimPEG/Problem.py | 6 +++--- SimPEG/Tests/test_Survey.py | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SimPEG/Problem.py b/SimPEG/Problem.py index b629d723..7b337977 100644 --- a/SimPEG/Problem.py +++ b/SimPEG/Problem.py @@ -139,7 +139,7 @@ class Fields(object): return self._getField(name, ind) def _setField(self, field, val, name, ind): - if isinstance(val, np.ndarray) and (field.shape[1] == 1 or val.ndim == 1): + if isinstance(val, np.ndarray) and (field.shape[0] == field.size or val.ndim == 1): val = Utils.mkvc(val,2) field[:,ind] = val @@ -160,8 +160,8 @@ class Fields(object): assert hasattr(self, func), 'The alias field function is a string, but it does not exist in the Fields class.' func = getattr(self, func) out = func(self._fields[alias][:,ind], srcII) - if out.shape[0] == out.size: - out = Utils.mkvc(out) + if isinstance(out, np.ndarray) and (out.shape[0] == out.size or out.ndim == 1): + out = Utils.mkvc(out,2) return out def __contains__(self, other): diff --git a/SimPEG/Tests/test_Survey.py b/SimPEG/Tests/test_Survey.py index f93395ce..2a506f8a 100644 --- a/SimPEG/Tests/test_Survey.py +++ b/SimPEG/Tests/test_Survey.py @@ -80,9 +80,9 @@ class DataAndFieldsTest(unittest.TestCase): b = np.random.rand(F.mesh.nF,1) F[self.Src0, 'b'] = b - self.assertTrue(np.all(F[self.Src0, 'b'] == Utils.mkvc(b))) + self.assertTrue(np.all(F[self.Src0, 'b'] == b)) - b = np.random.rand(F.mesh.nF) + b = np.random.rand(F.mesh.nF,1) F[self.Src0, 'b'] = b self.assertTrue(np.all(F[self.Src0, 'b'] == b)) @@ -96,8 +96,8 @@ class DataAndFieldsTest(unittest.TestCase): b = np.random.rand(F.mesh.nF, 2) F[[self.Src0, self.Src1],'b'] = b - self.assertTrue(F[self.Src0]['b'].shape == (F.mesh.nF,)) - self.assertTrue(F[self.Src0,'b'].shape == (F.mesh.nF,)) + self.assertTrue(F[self.Src0]['b'].shape == (F.mesh.nF,1)) + self.assertTrue(F[self.Src0,'b'].shape == (F.mesh.nF,1)) self.assertTrue(np.all(F[self.Src0,'b'] == b[:,0])) self.assertTrue(np.all(F[self.Src1,'b'] == b[:,1])) @@ -158,7 +158,7 @@ class FieldsTest_Alias(unittest.TestCase): e = np.random.rand(F.mesh.nE,1) F[self.Src0, 'e'] = e - self.assertTrue(np.all(F[self.Src0, 'b'] == F.mesh.edgeCurl * Utils.mkvc(e))) + self.assertTrue(np.all(F[self.Src0, 'b'] == F.mesh.edgeCurl * e)) def f(): F[self.Src0, 'b'] = F[self.Src0, 'b']