From ec7ed8a585f60c63a942e9d53f9416172ef7e114 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Thu, 28 May 2015 08:39:49 -0700 Subject: [PATCH] consistent size checking --- SimPEG/Problem.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SimPEG/Problem.py b/SimPEG/Problem.py index 1787a472..e729ee10 100644 --- a/SimPEG/Problem.py +++ b/SimPEG/Problem.py @@ -160,7 +160,7 @@ 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 isinstance(out, np.ndarray) and (out.shape[0] == out.size or out.ndim == 1): + if out.shape[0] == out.size or out.ndim == 1: out = Utils.mkvc(out,2) return out @@ -263,7 +263,7 @@ class TimeFields(Fields): for i, TIND_i in enumerate(timeII): fieldI = pointerFields[:,:,i] if fieldI.shape[0] == fieldI.size: - fieldI = Utils.mkvc(fieldI,2) + fieldI = Utils.mkvc(fieldI,1) out[i] = func(fieldI, srcII, TIND_i) if out[i].ndim == 1: out[i] = out[i][:,np.newaxis,np.newaxis]