From 592979b8293aebc1c96296c9bb7c35c80cb440da Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Fri, 7 Dec 2018 10:36:42 +0100
Subject: [PATCH] FEM: utils, rename get member

---
 src/Mod/Fem/femsolver/calculix/tasks.py | 4 ++--
 src/Mod/Fem/femsolver/elmer/tasks.py    | 2 +-
 src/Mod/Fem/femsolver/elmer/writer.py   | 2 +-
 src/Mod/Fem/femsolver/run.py            | 4 ++--
 src/Mod/Fem/femsolver/z88/tasks.py      | 2 +-
 src/Mod/Fem/femtools/femutils.py        | 7 +++----
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Mod/Fem/femsolver/calculix/tasks.py b/src/Mod/Fem/femsolver/calculix/tasks.py
index 860f4a7b10..a4a9c15c47 100644
--- a/src/Mod/Fem/femsolver/calculix/tasks.py
+++ b/src/Mod/Fem/femsolver/calculix/tasks.py
@@ -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']:
diff --git a/src/Mod/Fem/femsolver/elmer/tasks.py b/src/Mod/Fem/femsolver/elmer/tasks.py
index 410b132557..d7d78ff87f 100644
--- a/src/Mod/Fem/femsolver/elmer/tasks.py
+++ b/src/Mod/Fem/femsolver/elmer/tasks.py
@@ -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)
 
diff --git a/src/Mod/Fem/femsolver/elmer/writer.py b/src/Mod/Fem/femsolver/elmer/writer.py
index 30d402ce5b..dd2e460a2d 100644
--- a/src/Mod/Fem/femsolver/elmer/writer.py
+++ b/src/Mod/Fem/femsolver/elmer/writer.py
@@ -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)
diff --git a/src/Mod/Fem/femsolver/run.py b/src/Mod/Fem/femsolver/run.py
index 405505ecb4..28941e6522 100644
--- a/src/Mod/Fem/femsolver/run.py
+++ b/src/Mod/Fem/femsolver/run.py
@@ -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(
diff --git a/src/Mod/Fem/femsolver/z88/tasks.py b/src/Mod/Fem/femsolver/z88/tasks.py
index 769464293c..ec0b962f34 100644
--- a/src/Mod/Fem/femsolver/z88/tasks.py
+++ b/src/Mod/Fem/femsolver/z88/tasks.py
@@ -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)
diff --git a/src/Mod/Fem/femtools/femutils.py b/src/Mod/Fem/femtools/femutils.py
index ee40de134e..f1c2a9e580 100644
--- a/src/Mod/Fem/femtools/femutils.py
+++ b/src/Mod/Fem/femtools/femutils.py
@@ -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