make modelPair be OK in problem if first ComboModel is the right one.

This commit is contained in:
rowanc1
2014-03-02 18:39:31 -08:00
parent 908b9ab4cc
commit a01ffba494
+3 -1
View File
@@ -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