FEM: solver calculix, change object type
This commit is contained in:
@@ -385,7 +385,7 @@ class _MaterialMechanicalNonlinear(CommandManager):
|
||||
# CalculiX solver or new frame work CalculiX solver
|
||||
if solver_object and (
|
||||
is_of_type(solver_object, "Fem::SolverCcxTools")
|
||||
or is_of_type(solver_object, "Fem::FemSolverObjectCalculix")
|
||||
or is_of_type(solver_object, "Fem::SolverCalculix")
|
||||
):
|
||||
FreeCAD.Console.PrintMessage(
|
||||
"Set MaterialNonlinearity and GeometricalNonlinearity to nonlinear for {}\n"
|
||||
|
||||
@@ -53,7 +53,7 @@ class Proxy(solverbase.Proxy):
|
||||
"""The Fem::FemSolver's Proxy python type, add solver specific properties
|
||||
"""
|
||||
|
||||
Type = "Fem::FemSolverObjectCalculix"
|
||||
Type = "Fem::SolverCalculix"
|
||||
|
||||
def __init__(self, obj):
|
||||
super(Proxy, self).__init__(obj)
|
||||
|
||||
@@ -346,7 +346,7 @@ class TestObjectType(unittest.TestCase):
|
||||
type_of_obj(ObjectsFem.makeSolverCalculixCcxTools(doc))
|
||||
)
|
||||
self.assertEqual(
|
||||
"Fem::FemSolverObjectCalculix",
|
||||
"Fem::SolverCalculix",
|
||||
type_of_obj(ObjectsFem.makeSolverCalculix(doc))
|
||||
)
|
||||
self.assertEqual(
|
||||
@@ -546,7 +546,7 @@ class TestObjectType(unittest.TestCase):
|
||||
))
|
||||
self.assertTrue(is_of_type(
|
||||
ObjectsFem.makeSolverCalculix(doc),
|
||||
"Fem::FemSolverObjectCalculix"
|
||||
"Fem::SolverCalculix"
|
||||
))
|
||||
self.assertTrue(is_of_type(
|
||||
solverelmer,
|
||||
@@ -1161,7 +1161,7 @@ class TestObjectType(unittest.TestCase):
|
||||
))
|
||||
self.assertTrue(is_derived_from(
|
||||
solver_calculix,
|
||||
"Fem::FemSolverObjectCalculix"
|
||||
"Fem::SolverCalculix"
|
||||
))
|
||||
|
||||
# FemSolverObjectElmer
|
||||
|
||||
Reference in New Issue
Block a user