FEM: elmer equation objects, better type checking

FreeCAD · Mar 2, 2020 · aa5b050 · aa5b050
1 parent 5a5753a
commit aa5b050
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/src/Mod/Fem/femsolver/elmer/equations/elasticity.py b/src/Mod/Fem/femsolver/elmer/equations/elasticity.py
@@ -38,7 +38,7 @@ def create(doc, name="Elasticity"):
 
 class Proxy(linear.Proxy, equationbase.ElasticityProxy):
 
-    Type = "Fem::FemEquationElmerElasticity"
+    Type = "Fem::EquationElmerElasticity"
 
     def __init__(self, obj):
         super(Proxy, self).__init__(obj)

diff --git a/src/Mod/Fem/femsolver/elmer/equations/electrostatic.py b/src/Mod/Fem/femsolver/elmer/equations/electrostatic.py
@@ -38,7 +38,7 @@ def create(doc, name="Electrostatic"):
 
 class Proxy(linear.Proxy, equationbase.ElectrostaticProxy):
 
-    Type = "Fem::FemEquationElmerElectrostatic"
+    Type = "Fem::EquationElmerElectrostatic"
 
     def __init__(self, obj):
         super(Proxy, self).__init__(obj)

diff --git a/src/Mod/Fem/femsolver/elmer/equations/flow.py b/src/Mod/Fem/femsolver/elmer/equations/flow.py
@@ -38,7 +38,7 @@ def create(doc, name="Flow"):
 
 class Proxy(nonlinear.Proxy, equationbase.FlowProxy):
 
-    Type = "Fem::FemEquationElmerFlow"
+    Type = "Fem::EquationElmerFlow"
 
     def __init__(self, obj):
         super(Proxy, self).__init__(obj)

diff --git a/src/Mod/Fem/femsolver/elmer/equations/fluxsolver.py b/src/Mod/Fem/femsolver/elmer/equations/fluxsolver.py
@@ -38,7 +38,7 @@ def create(doc, name="Fluxsolver"):
 
 class Proxy(linear.Proxy, equationbase.FluxsolverProxy):
 
-    Type = "Fem::FemEquationElmerFluxsolver"
+    Type = "Fem::EquationElmerFluxsolver"
 
     def __init__(self, obj):
         super(Proxy, self).__init__(obj)

diff --git a/src/Mod/Fem/femsolver/elmer/equations/heat.py b/src/Mod/Fem/femsolver/elmer/equations/heat.py
@@ -38,7 +38,7 @@ def create(doc, name="Heat"):
 
 class Proxy(nonlinear.Proxy, equationbase.HeatProxy):
 
-    Type = "Fem::FemEquationElmerHeat"
+    Type = "Fem::EquationElmerHeat"
 
     def __init__(self, obj):
         super(Proxy, self).__init__(obj)

diff --git a/src/Mod/Fem/femsolver/elmer/writer.py b/src/Mod/Fem/femsolver/elmer/writer.py
@@ -201,7 +201,7 @@ def _handleSimulation(self):
     def _handleHeat(self):
         activeIn = []
         for equation in self.solver.Group:
-            if femutils.is_of_type(equation, "Fem::FemEquationElmerHeat"):
+            if femutils.is_of_type(equation, "Fem::EquationElmerHeat"):
                 if equation.References:
                     activeIn = equation.References[0][1]
                 else:
@@ -302,7 +302,7 @@ def _handleHeatMaterial(self, bodies):
     def _handleElectrostatic(self):
         activeIn = []
         for equation in self.solver.Group:
-            if femutils.is_of_type(equation, "Fem::FemEquationElmerElectrostatic"):
+            if femutils.is_of_type(equation, "Fem::EquationElmerElectrostatic"):
                 if equation.References:
                     activeIn = equation.References[0][1]
                 else:
@@ -374,7 +374,7 @@ def _handleElectrostaticBndConditions(self):
     def _handleFluxsolver(self):
         activeIn = []
         for equation in self.solver.Group:
-            if femutils.is_of_type(equation, "Fem::FemEquationElmerFluxsolver"):
+            if femutils.is_of_type(equation, "Fem::EquationElmerFluxsolver"):
                 if equation.References:
                     activeIn = equation.References[0][1]
                 else:
@@ -395,7 +395,7 @@ def _getFluxsolverSolver(self, equation):
     def _handleElasticity(self):
         activeIn = []
         for equation in self.solver.Group:
-            if femutils.is_of_type(equation, "Fem::FemEquationElmerElasticity"):
+            if femutils.is_of_type(equation, "Fem::EquationElmerElasticity"):
                 if equation.References:
                     activeIn = equation.References[0][1]
                 else:
@@ -555,7 +555,7 @@ def _getYoungsModulus(self, m):
     def _handleFlow(self):
         activeIn = []
         for equation in self.solver.Group:
-            if femutils.is_of_type(equation, "Fem::FemEquationElmerFlow"):
+            if femutils.is_of_type(equation, "Fem::EquationElmerFlow"):
                 if equation.References:
                     activeIn = equation.References[0][1]
                 else:

diff --git a/src/Mod/Fem/femtest/app/test_object.py b/src/Mod/Fem/femtest/app/test_object.py
@@ -347,23 +347,23 @@ def test_femobjects_type(
             type_of_obj(ObjectsFem.makeSolverZ88(doc))
         )
         self.assertEqual(
-            "Fem::FemEquationElmerElasticity",
+            "Fem::EquationElmerElasticity",
             type_of_obj(ObjectsFem.makeEquationElasticity(doc, solverelmer))
         )
         self.assertEqual(
-            "Fem::FemEquationElmerElectrostatic",
+            "Fem::EquationElmerElectrostatic",
             type_of_obj(ObjectsFem.makeEquationElectrostatic(doc, solverelmer))
         )
         self.assertEqual(
-            "Fem::FemEquationElmerFlow",
+            "Fem::EquationElmerFlow",
             type_of_obj(ObjectsFem.makeEquationFlow(doc, solverelmer))
         )
         self.assertEqual(
-            "Fem::FemEquationElmerFluxsolver",
+            "Fem::EquationElmerFluxsolver",
             type_of_obj(ObjectsFem.makeEquationFluxsolver(doc, solverelmer))
         )
         self.assertEqual(
-            "Fem::FemEquationElmerHeat",
+            "Fem::EquationElmerHeat",
             type_of_obj(ObjectsFem.makeEquationHeat(doc, solverelmer))
         )
 
@@ -547,23 +547,23 @@ def test_femobjects_isoftype(
         ))
         self.assertTrue(is_of_type(
             ObjectsFem.makeEquationElasticity(doc, solverelmer),
-            "Fem::FemEquationElmerElasticity"
+            "Fem::EquationElmerElasticity"
         ))
         self.assertTrue(is_of_type(
             ObjectsFem.makeEquationElectrostatic(doc, solverelmer),
-            "Fem::FemEquationElmerElectrostatic"
+            "Fem::EquationElmerElectrostatic"
         ))
         self.assertTrue(is_of_type(
             ObjectsFem.makeEquationFlow(doc, solverelmer),
-            "Fem::FemEquationElmerFlow"
+            "Fem::EquationElmerFlow"
         ))
         self.assertTrue(is_of_type(
             ObjectsFem.makeEquationFluxsolver(doc, solverelmer),
-            "Fem::FemEquationElmerFluxsolver"
+            "Fem::EquationElmerFluxsolver"
         ))
         self.assertTrue(is_of_type(
             ObjectsFem.makeEquationHeat(doc, solverelmer),
-            "Fem::FemEquationElmerHeat"
+            "Fem::EquationElmerHeat"
         ))
 
         fcc_print("doc objects count: {}, method: {}".format(
@@ -1203,7 +1203,7 @@ def test_femobjects_derivedfromfem(
         ))
         self.assertTrue(is_derived_from(
             equation_elasticity,
-            "Fem::FemEquationElmerElasticity"
+            "Fem::EquationElmerElasticity"
         ))
 
         # FemEquationElmerElectrostatic
@@ -1218,7 +1218,7 @@ def test_femobjects_derivedfromfem(
         ))
         self.assertTrue(is_derived_from(
             equation_electrostatic,
-            "Fem::FemEquationElmerElectrostatic"
+            "Fem::EquationElmerElectrostatic"
         ))
 
         # FemEquationElmerFlow
@@ -1233,7 +1233,7 @@ def test_femobjects_derivedfromfem(
         ))
         self.assertTrue(is_derived_from(
             equation_flow,
-            "Fem::FemEquationElmerFlow"
+            "Fem::EquationElmerFlow"
         ))
 
         # FemEquationElmerFluxsolver
@@ -1248,7 +1248,7 @@ def test_femobjects_derivedfromfem(
         ))
         self.assertTrue(is_derived_from(
             equation_flux,
-            "Fem::FemEquationElmerFluxsolver"
+            "Fem::EquationElmerFluxsolver"
         ))
 
         # FemEquationElmerHeat
@@ -1263,7 +1263,7 @@ def test_femobjects_derivedfromfem(
         ))
         self.assertTrue(is_derived_from(
             equation_heat,
-            "Fem::FemEquationElmerHeat"
+            "Fem::EquationElmerHeat"
         ))
 
         fcc_print("doc objects count: {}, method: {}".format(