kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: utils, rename get member

Browse Source
This commit is contained in:
Bernd Hahnebach
2018-12-07 10:36:42 +01:00
committed by Yorik van Havre
parent 5c5b100b2f
commit 986dc046d8
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Fem/femsolver/calculix/tasks.py
View File

@@ -120,7 +120,7 @@ class Results(run.Results):
self.load_results_ccxdat()
def purge_results(self):
for m in FemUtils.getMember(self.analysis, "Fem::FemResultObject"):
for m in FemUtils.get_member(self.analysis, "Fem::FemResultObject"):
if FemUtils.is_of_type(m.Mesh, "Fem::FemMeshResult"):
self.analysis.Document.removeObject(m.Mesh.Name)
self.analysis.Document.removeObject(m.Name)
@@ -147,7 +147,7 @@ class Results(run.Results):
raise Exception(
'FEM: No .dat results found at {}!'.format(dat_result_file))
if mode_frequencies:
for m in FemUtils.getMember(self.analysis, "Fem::FemResultObject"):
for m in FemUtils.get_member(self.analysis, "Fem::FemResultObject"):
if m.Eigenmode > 0:
for mf in mode_frequencies:
if m.Eigenmode == mf['eigenmode']:

2
src/Mod/Fem/femsolver/elmer/tasks.py
View File

@@ -84,7 +84,7 @@ class Prepare(run.Prepare):
def checkHandled(self, w):
handled = w.getHandledConstraints()
allConstraints = FemUtils.getMember(self.analysis, "Fem::Constraint")
allConstraints = FemUtils.get_member(self.analysis, "Fem::Constraint")
for obj in set(allConstraints) - handled:
self.report.warning("Ignored constraint %s." % obj.Label)

2
src/Mod/Fem/femsolver/elmer/writer.py
View File

@@ -773,7 +773,7 @@ class Writer(object):
self._builder.addSection(section)
def _getMember(self, t):
return FemUtils.getMember(self.analysis, t)
return FemUtils.get_member(self.analysis, t)
def _getSingleMember(self, t):
return FemUtils.getSingleMember(self.analysis, t)

4
src/Mod/Fem/femsolver/run.py
View File

@@ -257,7 +257,7 @@ class Machine(BaseTask):
class Check(BaseTask):
def checkMesh(self):
meshes = FemUtils.getMember(
meshes = FemUtils.get_member(
self.analysis, "Fem::FemMeshObject")
if len(meshes) == 0:
self.report.error("Missing a mesh object.")
@@ -272,7 +272,7 @@ class Check(BaseTask):
return True
def checkMaterial(self):
matObjs = FemUtils.getMember(
matObjs = FemUtils.get_member(
self.analysis, "App::MaterialObjectPython")
if len(matObjs) == 0:
self.report.error(

2
src/Mod/Fem/femsolver/z88/tasks.py
View File

@@ -134,7 +134,7 @@ class Results(run.Results):
self.load_results_z88o2()
def purge_results(self):
for m in FemUtils.getMember(self.analysis, "Fem::FemResultObject"):
for m in FemUtils.get_member(self.analysis, "Fem::FemResultObject"):
if FemUtils.is_of_type(m.Mesh, "Fem::FemMeshResult"):
self.analysis.Document.removeObject(m.Mesh.Name)
self.analysis.Document.removeObject(m.Name)

7
src/Mod/Fem/femtools/femutils.py
View File

@@ -60,19 +60,18 @@ def _searchGroups(member, objs):
return False
# collect analyis members used in Elmer
def getMember(analysis, t):
def get_member(analysis, t):
if analysis is None:
raise ValueError("Analysis must not be None")
matching = []
for m in analysis.Group:
if is_derived_from(m, t):
if is_derived_from(m, t): # since is _derived_from is used the father could be used to test too (ex. 'Fem::FemMeshObject')
matching.append(m)
return matching
def getSingleMember(analysis, t):
objs = getMember(analysis, t)
objs = get_member(analysis, t)
return objs[0] if objs else None