FEM: make objects module, change standard names for material solid and fluid

This commit is contained in:
Bernd Hahnebach
2020-05-21 22:10:32 +02:00
parent 719a6a7155
commit 3b4b2dc2e3
2 changed files with 6 additions and 6 deletions

View File

@@ -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"""

View File

@@ -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