FEM: material object, change type

src/Mod/Fem/femmesh/meshtools.py

@@ -735,7 +735,7 @@ def get_elset_short_name(
     i
 ):
     from femtools.femutils import is_of_type
-    if is_of_type(obj, "Fem::Material"):
+    if is_of_type(obj, "Fem::MaterialCommon"):
         return "M" + str(i)
     elif is_of_type(obj, "Fem::ElementGeometry1D"):
         return "B" + str(i)
@@ -1877,7 +1877,7 @@ def get_analysis_group_elements(
             elif (
                 len(m.References) == 0
                 and (
-                    is_of_type(m, "Fem::Material")
+                    is_of_type(m, "Fem::MaterialCommon")
                     # TODO test and implement ElementGeometry1D and ElementGeometry2D
                     # or is_of_type(m, "Fem::ElementGeometry1D")
                     # or is_of_type(m, "Fem::ElementGeometry2D")

src/Mod/Fem/femobjects/_FemMaterial.py

@@ -38,7 +38,7 @@ class _FemMaterial(FemConstraint.Proxy):
     The FEM Material object
     """
 
-    Type = "Fem::Material"
+    Type = "Fem::MaterialCommon"
 
     def __init__(self, obj):
         super(_FemMaterial, self).__init__(obj)

src/Mod/Fem/femresult/resulttools.py

@@ -430,7 +430,7 @@ def get_concrete_nodes(res_obj):
                     for cn in concrete_nodes:
                         ic[cn - 1] = 1
         elif obj.isDerivedFrom("App::MaterialObjectPython") \
-                and is_of_type(obj, "Fem::Material"):
+                and is_of_type(obj, "Fem::MaterialCommon"):
             FreeCAD.Console.PrintMessage("No ReinforcedMaterial\n")
             if obj.References == []:
                 for iic in range(nsr):

src/Mod/Fem/femtest/app/test_object.py

@@ -238,11 +238,11 @@ class TestObjectType(unittest.TestCase):
         )
         materialsolid = ObjectsFem.makeMaterialSolid(doc)
         self.assertEqual(
-            "Fem::Material",
+            "Fem::MaterialCommon",
             type_of_obj(ObjectsFem.makeMaterialFluid(doc))
         )
         self.assertEqual(
-            "Fem::Material",
+            "Fem::MaterialCommon",
             type_of_obj(materialsolid))
         self.assertEqual(
             "Fem::MaterialMechanicalNonlinear",
@@ -436,11 +436,11 @@ class TestObjectType(unittest.TestCase):
         materialsolid = ObjectsFem.makeMaterialSolid(doc)
         self.assertTrue(is_of_type(
             ObjectsFem.makeMaterialFluid(doc),
-            "Fem::Material"
+            "Fem::MaterialCommon"
         ))
         self.assertTrue(is_of_type(
             materialsolid,
-            "Fem::Material"
+            "Fem::MaterialCommon"
         ))
         self.assertTrue(is_of_type(
             ObjectsFem.makeMaterialMechanicalNonlinear(doc, materialsolid),
@@ -917,7 +917,7 @@ class TestObjectType(unittest.TestCase):
         ))
         self.assertTrue(is_derived_from(
             material_fluid,
-            "Fem::Material"
+            "Fem::MaterialCommon"
         ))
 
         # Material Solid
@@ -932,7 +932,7 @@ class TestObjectType(unittest.TestCase):
         ))
         self.assertTrue(is_derived_from(
             material_solid,
-            "Fem::Material"
+            "Fem::MaterialCommon"
         ))
 
         # MaterialMechanicalNonlinear

src/Mod/Fem/femtools/membertools.py

@@ -240,7 +240,7 @@ class AnalysisMember():
         # get member
         # materials
         std_mats = self.get_several_member(
-            "Fem::Material"
+            "Fem::MaterialCommon"
         )
         rei_mats = self.get_several_member(
             "Fem::MaterialReinforced"