FEM: new solver frame work, fix it in the regard of the analysis object change to a real group object
This commit is contained in:
@@ -170,7 +170,7 @@ class _Container(object):
|
||||
self.contact_constraints = []
|
||||
self.transform_constraints = []
|
||||
|
||||
for m in analysis.Member:
|
||||
for m in analysis.Group:
|
||||
if m.isDerivedFrom("Fem::FemMeshObject"):
|
||||
if not self.mesh:
|
||||
self.mesh = m
|
||||
|
||||
@@ -132,7 +132,7 @@ class Solve(run.Solve):
|
||||
"App::TextDocument", self.solver.Name + "Output")
|
||||
self.solver.ElmerOutput.Label = self.solver.Label + "Output"
|
||||
self.solver.ElmerOutput.ReadOnly = True
|
||||
self.analysis.Member += [self.solver.ElmerOutput]
|
||||
self.analysis.addObject(self.solver.ElmerOutput)
|
||||
|
||||
|
||||
class Results(run.Results):
|
||||
@@ -149,4 +149,4 @@ class Results(run.Results):
|
||||
self.solver.ElmerResult = self.analysis.Document.addObject(
|
||||
"Fem::FemPostPipeline", self.solver.Name + "Result")
|
||||
self.solver.ElmerResult.Label = self.solver.Label + "Result"
|
||||
self.analysis.Member += [self.solver.ElmerResult]
|
||||
self.analysis.addObject(self.solver.ElmerResult)
|
||||
|
||||
@@ -283,7 +283,7 @@ class Check(BaseTask):
|
||||
return True
|
||||
|
||||
def checkSupported(self, allSupported):
|
||||
for m in self.analysis.Member:
|
||||
for m in self.analysis.Group:
|
||||
if FemUtils.isOfType(m, "Fem::Constraint"):
|
||||
supported = False
|
||||
for sc in allSupported:
|
||||
@@ -326,7 +326,7 @@ class _DocObserver(object):
|
||||
for doc in App.listDocuments().itervalues():
|
||||
for obj in doc.Objects:
|
||||
if obj.isDerivedFrom("Fem::FemAnalysis"):
|
||||
self._saved[obj] = obj.Member
|
||||
self._saved[obj] = obj.Group
|
||||
|
||||
@classmethod
|
||||
def attach(cls):
|
||||
@@ -399,8 +399,8 @@ class _DocObserver(object):
|
||||
def _getAdded(self, analysis):
|
||||
if analysis not in self._saved:
|
||||
self._saved[analysis] = []
|
||||
delta = set(analysis.Member) - set(self._saved[analysis])
|
||||
self._saved[analysis] = analysis.Member
|
||||
delta = set(analysis.Group) - set(self._saved[analysis])
|
||||
self._saved[analysis] = analysis.Group
|
||||
return delta
|
||||
|
||||
def _resetAll(self, analysis):
|
||||
|
||||
@@ -168,7 +168,7 @@ class _Container(object):
|
||||
self.contact_constraints = []
|
||||
self.transform_constraints = []
|
||||
|
||||
for m in analysis.Member:
|
||||
for m in analysis.Group:
|
||||
if m.isDerivedFrom("Fem::FemMeshObject"):
|
||||
if not self.mesh:
|
||||
self.mesh = m
|
||||
|
||||
Reference in New Issue
Block a user