From a01ffba4940f9078bc2818e81132bd7a3581dfcf Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Sun, 2 Mar 2014 18:39:31 -0800 Subject: [PATCH] make modelPair be OK in problem if first ComboModel is the right one. --- SimPEG/Problem.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SimPEG/Problem.py b/SimPEG/Problem.py index 414d0c33..a509f6cd 100644 --- a/SimPEG/Problem.py +++ b/SimPEG/Problem.py @@ -44,7 +44,9 @@ class BaseProblem(object): def __init__(self, mesh, model, **kwargs): Utils.setKwargs(self, **kwargs) self.mesh = mesh - assert isinstance(model, self.modelPair), "Model object must be an instance of a %s class."%(self.modelPair.__name__) + assert (isinstance(model, self.modelPair) or + isinstance(model, Model.ComboModel) and isinstance(model.models[0], self.modelPair) + ), "Model object must be an instance of a %s class."%(self.modelPair.__name__) self.model = model @property