From 3b4b2dc2e36575b5e06f8e2a158bfd0b597f4724 Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Thu, 21 May 2020 22:10:32 +0200
Subject: [PATCH] FEM: make objects module, change standard names for material
 solid and fluid

---
 src/Mod/Fem/ObjectsFem.py            | 4 ++--
 src/Mod/Fem/femtest/app/test_open.py | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py
index 489bee27e6..63629f4ed1 100644
--- a/src/Mod/Fem/ObjectsFem.py
+++ b/src/Mod/Fem/ObjectsFem.py
@@ -365,7 +365,7 @@ def makeElementRotation1D(
 # ********* material objects *********************************************************************
 def makeMaterialFluid(
     doc,
-    name="FluidMaterial"
+    name="MaterialFluid"
 ):
     """makeMaterialFluid(document, [name]):
     makes a FEM Material for fluid"""
@@ -415,7 +415,7 @@ def makeMaterialReinforced(
 
 def makeMaterialSolid(
     doc,
-    name="MechanicalSolidMaterial"
+    name="MaterialSolid"
 ):
     """makeMaterialSolid(document, [name]):
     makes a FEM Material for solid"""
diff --git a/src/Mod/Fem/femtest/app/test_open.py b/src/Mod/Fem/femtest/app/test_open.py
index eecaa8e19c..335dea6266 100644
--- a/src/Mod/Fem/femtest/app/test_open.py
+++ b/src/Mod/Fem/femtest/app/test_open.py
@@ -181,13 +181,13 @@ class TestObjectOpen(unittest.TestCase):
         from femobjects._FemMaterial import _FemMaterial
         self.assertEqual(
             _FemMaterial,
-            doc.MechanicalSolidMaterial.Proxy.__class__
+            doc.MaterialFluid.Proxy.__class__
         )
 
         from femobjects._FemMaterial import _FemMaterial
         self.assertEqual(
             _FemMaterial,
-            doc.FluidMaterial.Proxy.__class__
+            doc.MaterialSolid.Proxy.__class__
         )
 
         from femobjects._FemMaterialMechanicalNonlinear import _FemMaterialMechanicalNonlinear
@@ -365,13 +365,13 @@ class TestObjectOpen(unittest.TestCase):
         from femguiobjects._ViewProviderFemMaterial import _ViewProviderFemMaterial
         self.assertEqual(
             _ViewProviderFemMaterial,
-            doc.MechanicalSolidMaterial.ViewObject.Proxy.__class__
+            doc.MaterialFluid.ViewObject.Proxy.__class__
         )
 
         from femguiobjects._ViewProviderFemMaterial import _ViewProviderFemMaterial
         self.assertEqual(
             _ViewProviderFemMaterial,
-            doc.FluidMaterial.ViewObject.Proxy.__class__
+            doc.MaterialSolid.ViewObject.Proxy.__class__
         )
 
         from femguiobjects._ViewProviderFemMaterialMechanicalNonlinear import _ViewProviderFemMaterialMechanicalNonlinear