diff --git a/src/Mod/Fem/femexamples/boxanalysis_base.py b/src/Mod/Fem/femexamples/boxanalysis_base.py index fdf0484023..e90bfce7eb 100644 --- a/src/Mod/Fem/femexamples/boxanalysis_base.py +++ b/src/Mod/Fem/femexamples/boxanalysis_base.py @@ -73,9 +73,10 @@ def setup_boxanalysisbase(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.CharacteristicLengthMin = "8.0 mm" + femmesh_obj.ElementOrder = "2nd" doc.recompute() return doc diff --git a/src/Mod/Fem/femexamples/buckling_lateraltorsionalbuckling.py b/src/Mod/Fem/femexamples/buckling_lateraltorsionalbuckling.py index 74018d2ac5..70e8232ca2 100644 --- a/src/Mod/Fem/femexamples/buckling_lateraltorsionalbuckling.py +++ b/src/Mod/Fem/femexamples/buckling_lateraltorsionalbuckling.py @@ -186,7 +186,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.CharacteristicLengthMax = "50.0 mm" femmesh_obj.ElementDimension = "2D" diff --git a/src/Mod/Fem/femexamples/buckling_platebuckling.py b/src/Mod/Fem/femexamples/buckling_platebuckling.py index 65b8f1ea9f..d0d85a2b5d 100644 --- a/src/Mod/Fem/femexamples/buckling_platebuckling.py +++ b/src/Mod/Fem/femexamples/buckling_platebuckling.py @@ -159,7 +159,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.CharacteristicLengthMax = "300.0 mm" femmesh_obj.ElementDimension = "2D" diff --git a/src/Mod/Fem/femexamples/ccx_buckling_flexuralbuckling.py b/src/Mod/Fem/femexamples/ccx_buckling_flexuralbuckling.py index 264696e7d3..9086a72981 100644 --- a/src/Mod/Fem/femexamples/ccx_buckling_flexuralbuckling.py +++ b/src/Mod/Fem/femexamples/ccx_buckling_flexuralbuckling.py @@ -139,7 +139,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj doc.recompute() return doc diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_base_edge.py b/src/Mod/Fem/femexamples/ccx_cantilever_base_edge.py index 8528a59bd3..c3642287cf 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_base_edge.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_base_edge.py @@ -130,7 +130,7 @@ def setup_cantilever_base_edge(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.ElementDimension = "1D" femmesh_obj.CharacteristicLengthMax = "1750.0 mm" diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_base_face.py b/src/Mod/Fem/femexamples/ccx_cantilever_base_face.py index e241fa6dc8..6a360c1dd3 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_base_face.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_base_face.py @@ -115,7 +115,7 @@ def setup_cantilever_base_face(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.ElementDimension = "2D" femmesh_obj.CharacteristicLengthMax = "500.0 mm" diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_base_solid.py b/src/Mod/Fem/femexamples/ccx_cantilever_base_solid.py index 9edc993cf1..b2ddec593b 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_base_solid.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_base_solid.py @@ -102,7 +102,7 @@ def setup_cantilever_base_solid(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_ele_quad4.py b/src/Mod/Fem/femexamples/ccx_cantilever_ele_quad4.py index 732bf67b9b..213af6ea74 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_ele_quad4.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_ele_quad4.py @@ -92,7 +92,7 @@ def setup(doc=None, solvertype="ccxtools"): femmesh_obj.FemMesh = new_fem_mesh # set mesh obj parameter - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.ElementDimension = "2D" femmesh_obj.ElementOrder = "1st" diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_ele_quad8.py b/src/Mod/Fem/femexamples/ccx_cantilever_ele_quad8.py index 81aba770d7..17e0706694 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_ele_quad8.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_ele_quad8.py @@ -92,7 +92,7 @@ def setup(doc=None, solvertype="ccxtools"): femmesh_obj.FemMesh = new_fem_mesh # set mesh obj parameter - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.ElementDimension = "2D" femmesh_obj.ElementOrder = "1st" diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_ele_seg2.py b/src/Mod/Fem/femexamples/ccx_cantilever_ele_seg2.py index 6a3b39e430..e5565329f0 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_ele_seg2.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_ele_seg2.py @@ -92,7 +92,7 @@ def setup(doc=None, solvertype="ccxtools"): femmesh_obj.FemMesh = new_fem_mesh # set mesh obj parameter - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.ElementDimension = "1D" femmesh_obj.ElementOrder = "1st" diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_ele_tetra4.py b/src/Mod/Fem/femexamples/ccx_cantilever_ele_tetra4.py index aaee791155..210526eb70 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_ele_tetra4.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_ele_tetra4.py @@ -82,7 +82,7 @@ def setup(doc=None, solvertype="ccxtools"): # clear mesh and set meshing parameter femmesh_obj.FemMesh = Fem.FemMesh() - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.ElementDimension = "3D" femmesh_obj.ElementOrder = "1st" diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_ele_tria3.py b/src/Mod/Fem/femexamples/ccx_cantilever_ele_tria3.py index 2ce9f607ef..bbc17eacb6 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_ele_tria3.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_ele_tria3.py @@ -92,7 +92,7 @@ def setup(doc=None, solvertype="ccxtools"): femmesh_obj.FemMesh = new_fem_mesh # set mesh obj parameter - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.ElementDimension = "2D" femmesh_obj.ElementOrder = "1st" diff --git a/src/Mod/Fem/femexamples/constraint_centrif.py b/src/Mod/Fem/femexamples/constraint_centrif.py index caa95808fc..e2cda8bea9 100644 --- a/src/Mod/Fem/femexamples/constraint_centrif.py +++ b/src/Mod/Fem/femexamples/constraint_centrif.py @@ -191,7 +191,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.CharacteristicLengthMax = "5.0 mm" diff --git a/src/Mod/Fem/femexamples/constraint_contact_shell_shell.py b/src/Mod/Fem/femexamples/constraint_contact_shell_shell.py index c179c107e3..4d082c63f9 100644 --- a/src/Mod/Fem/femexamples/constraint_contact_shell_shell.py +++ b/src/Mod/Fem/femexamples/constraint_contact_shell_shell.py @@ -210,7 +210,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/constraint_contact_solid_solid.py b/src/Mod/Fem/femexamples/constraint_contact_solid_solid.py index a5ed032b5f..272df1e6e7 100644 --- a/src/Mod/Fem/femexamples/constraint_contact_solid_solid.py +++ b/src/Mod/Fem/femexamples/constraint_contact_solid_solid.py @@ -197,7 +197,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/constraint_section_print.py b/src/Mod/Fem/femexamples/constraint_section_print.py index ce3352e532..c474b9b342 100644 --- a/src/Mod/Fem/femexamples/constraint_section_print.py +++ b/src/Mod/Fem/femexamples/constraint_section_print.py @@ -272,7 +272,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/constraint_selfweight_cantilever.py b/src/Mod/Fem/femexamples/constraint_selfweight_cantilever.py index fbfe5afafb..e56a79da18 100644 --- a/src/Mod/Fem/femexamples/constraint_selfweight_cantilever.py +++ b/src/Mod/Fem/femexamples/constraint_selfweight_cantilever.py @@ -140,7 +140,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/constraint_tie.py b/src/Mod/Fem/femexamples/constraint_tie.py index c95428f017..2001ad8ff7 100644 --- a/src/Mod/Fem/femexamples/constraint_tie.py +++ b/src/Mod/Fem/femexamples/constraint_tie.py @@ -169,7 +169,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/constraint_transform_beam_hinged.py b/src/Mod/Fem/femexamples/constraint_transform_beam_hinged.py index 0f33d65d8d..bcc0f2cfa8 100644 --- a/src/Mod/Fem/femexamples/constraint_transform_beam_hinged.py +++ b/src/Mod/Fem/femexamples/constraint_transform_beam_hinged.py @@ -184,7 +184,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.CharacteristicLengthMax = "7 mm" diff --git a/src/Mod/Fem/femexamples/constraint_transform_torque.py b/src/Mod/Fem/femexamples/constraint_transform_torque.py index bd94609898..800d49e21e 100644 --- a/src/Mod/Fem/femexamples/constraint_transform_torque.py +++ b/src/Mod/Fem/femexamples/constraint_transform_torque.py @@ -173,7 +173,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/elmer_nonguitutorial01_eigenvalue_of_elastic_beam.py b/src/Mod/Fem/femexamples/elmer_nonguitutorial01_eigenvalue_of_elastic_beam.py index dc5a1ce143..5104cd4200 100644 --- a/src/Mod/Fem/femexamples/elmer_nonguitutorial01_eigenvalue_of_elastic_beam.py +++ b/src/Mod/Fem/femexamples/elmer_nonguitutorial01_eigenvalue_of_elastic_beam.py @@ -137,7 +137,7 @@ def setup(doc=None, solvertype="elmer"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.CharacteristicLengthMax = "40.80 mm" diff --git a/src/Mod/Fem/femexamples/equation_deformation_spring_elmer.py b/src/Mod/Fem/femexamples/equation_deformation_spring_elmer.py index 136d894777..378a5565a3 100644 --- a/src/Mod/Fem/femexamples/equation_deformation_spring_elmer.py +++ b/src/Mod/Fem/femexamples/equation_deformation_spring_elmer.py @@ -192,7 +192,7 @@ def setup(doc=None, solvertype="elmer"): # mesh femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] - femmesh_obj.Part = body + femmesh_obj.Shape = body femmesh_obj.CharacteristicLengthMax = "1.25 mm" femmesh_obj.ElementOrder = "1st" femmesh_obj.ViewObject.Visibility = False diff --git a/src/Mod/Fem/femexamples/equation_electrostatics_capacitance_two_balls.py b/src/Mod/Fem/femexamples/equation_electrostatics_capacitance_two_balls.py index 1141e4c82f..95a8cc6deb 100644 --- a/src/Mod/Fem/femexamples/equation_electrostatics_capacitance_two_balls.py +++ b/src/Mod/Fem/femexamples/equation_electrostatics_capacitance_two_balls.py @@ -165,7 +165,7 @@ def setup(doc=None, solvertype="elmer"): # mesh femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.CharacteristicLengthMax = "600 mm" femmesh_obj.ViewObject.Visibility = False diff --git a/src/Mod/Fem/femexamples/equation_electrostatics_electricforce_elmer_nongui6.py b/src/Mod/Fem/femexamples/equation_electrostatics_electricforce_elmer_nongui6.py index 8ca92caab6..e69043aaa2 100644 --- a/src/Mod/Fem/femexamples/equation_electrostatics_electricforce_elmer_nongui6.py +++ b/src/Mod/Fem/femexamples/equation_electrostatics_electricforce_elmer_nongui6.py @@ -228,7 +228,7 @@ def setup(doc=None, solvertype="elmer"): # mesh femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.CharacteristicLengthMax = "500 mm" femmesh_obj.ViewObject.Visibility = False diff --git a/src/Mod/Fem/femexamples/equation_flow_elmer_2D.py b/src/Mod/Fem/femexamples/equation_flow_elmer_2D.py index c083da38da..df958bcb9c 100644 --- a/src/Mod/Fem/femexamples/equation_flow_elmer_2D.py +++ b/src/Mod/Fem/femexamples/equation_flow_elmer_2D.py @@ -252,7 +252,7 @@ def setup(doc=None, solvertype="elmer"): # mesh femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] - femmesh_obj.Part = BooleanFragments + femmesh_obj.Shape = BooleanFragments femmesh_obj.ElementOrder = "1st" femmesh_obj.CharacteristicLengthMax = "4 mm" femmesh_obj.ViewObject.Visibility = False diff --git a/src/Mod/Fem/femexamples/equation_flow_initial_elmer_2D.py b/src/Mod/Fem/femexamples/equation_flow_initial_elmer_2D.py index 0098726fdb..2b82ae1b89 100644 --- a/src/Mod/Fem/femexamples/equation_flow_initial_elmer_2D.py +++ b/src/Mod/Fem/femexamples/equation_flow_initial_elmer_2D.py @@ -260,7 +260,7 @@ def setup(doc=None, solvertype="elmer"): # mesh femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] - femmesh_obj.Part = BooleanFragments + femmesh_obj.Shape = BooleanFragments femmesh_obj.ElementOrder = "1st" femmesh_obj.CharacteristicLengthMax = "4 mm" femmesh_obj.ViewObject.Visibility = False diff --git a/src/Mod/Fem/femexamples/equation_flow_turbulent_elmer_2D.py b/src/Mod/Fem/femexamples/equation_flow_turbulent_elmer_2D.py index 2b2e088df8..41965c1c11 100644 --- a/src/Mod/Fem/femexamples/equation_flow_turbulent_elmer_2D.py +++ b/src/Mod/Fem/femexamples/equation_flow_turbulent_elmer_2D.py @@ -258,7 +258,7 @@ def setup(doc=None, solvertype="elmer"): # mesh femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] - femmesh_obj.Part = BooleanFragments + femmesh_obj.Shape = BooleanFragments femmesh_obj.ElementOrder = "1st" femmesh_obj.CharacteristicLengthMax = "4 mm" femmesh_obj.ViewObject.Visibility = False diff --git a/src/Mod/Fem/femexamples/equation_flux_elmer.py b/src/Mod/Fem/femexamples/equation_flux_elmer.py index 0e90a34ce9..67b38c99d0 100644 --- a/src/Mod/Fem/femexamples/equation_flux_elmer.py +++ b/src/Mod/Fem/femexamples/equation_flux_elmer.py @@ -153,7 +153,7 @@ def setup(doc=None, solvertype="elmer"): # mesh femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] - femmesh_obj.Part = cube + femmesh_obj.Shape = cube femmesh_obj.CharacteristicLengthMax = "1 mm" femmesh_obj.ViewObject.Visibility = False diff --git a/src/Mod/Fem/femexamples/equation_magnetodynamics_2D_elmer.py b/src/Mod/Fem/femexamples/equation_magnetodynamics_2D_elmer.py index 540dec6471..6f99c1ff5a 100644 --- a/src/Mod/Fem/femexamples/equation_magnetodynamics_2D_elmer.py +++ b/src/Mod/Fem/femexamples/equation_magnetodynamics_2D_elmer.py @@ -258,7 +258,7 @@ def setup(doc=None, solvertype="elmer"): # mesh femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] - femmesh_obj.Part = BooleanFragments + femmesh_obj.Shape = BooleanFragments femmesh_obj.CharacteristicLengthMax = "3 mm" femmesh_obj.ViewObject.Visibility = False diff --git a/src/Mod/Fem/femexamples/equation_magnetodynamics_elmer.py b/src/Mod/Fem/femexamples/equation_magnetodynamics_elmer.py index e639de873d..fa56c42130 100644 --- a/src/Mod/Fem/femexamples/equation_magnetodynamics_elmer.py +++ b/src/Mod/Fem/femexamples/equation_magnetodynamics_elmer.py @@ -201,7 +201,7 @@ def setup(doc=None, solvertype="elmer"): # mesh femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] - femmesh_obj.Part = BooleanFragments + femmesh_obj.Shape = BooleanFragments femmesh_obj.ElementOrder = "1st" femmesh_obj.CharacteristicLengthMax = "0.5 mm" femmesh_obj.ViewObject.Visibility = False diff --git a/src/Mod/Fem/femexamples/equation_magnetostatics_2D_elmer.py b/src/Mod/Fem/femexamples/equation_magnetostatics_2D_elmer.py index d4000cb0d4..15f3f41758 100644 --- a/src/Mod/Fem/femexamples/equation_magnetostatics_2D_elmer.py +++ b/src/Mod/Fem/femexamples/equation_magnetostatics_2D_elmer.py @@ -260,7 +260,7 @@ def setup(doc=None, solvertype="elmer"): # mesh femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] - femmesh_obj.Part = BooleanFragments + femmesh_obj.Shape = BooleanFragments femmesh_obj.CharacteristicLengthMax = "100.0 mm" femmesh_obj.ViewObject.Visibility = False diff --git a/src/Mod/Fem/femexamples/frequency_beamsimple.py b/src/Mod/Fem/femexamples/frequency_beamsimple.py index f68265f1b4..d016873806 100644 --- a/src/Mod/Fem/femexamples/frequency_beamsimple.py +++ b/src/Mod/Fem/femexamples/frequency_beamsimple.py @@ -150,7 +150,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.CharacteristicLengthMax = "25.0 mm" diff --git a/src/Mod/Fem/femexamples/material_multiple_bendingbeam_fiveboxes.py b/src/Mod/Fem/femexamples/material_multiple_bendingbeam_fiveboxes.py index 1d091eeeca..1ccd05783e 100644 --- a/src/Mod/Fem/femexamples/material_multiple_bendingbeam_fiveboxes.py +++ b/src/Mod/Fem/femexamples/material_multiple_bendingbeam_fiveboxes.py @@ -201,7 +201,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/material_multiple_bendingbeam_fivefaces.py b/src/Mod/Fem/femexamples/material_multiple_bendingbeam_fivefaces.py index 6a402c949b..451983314c 100644 --- a/src/Mod/Fem/femexamples/material_multiple_bendingbeam_fivefaces.py +++ b/src/Mod/Fem/femexamples/material_multiple_bendingbeam_fivefaces.py @@ -194,7 +194,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/material_multiple_tensionrod_twoboxes.py b/src/Mod/Fem/femexamples/material_multiple_tensionrod_twoboxes.py index 46d2f052e7..7d04aa70ed 100644 --- a/src/Mod/Fem/femexamples/material_multiple_tensionrod_twoboxes.py +++ b/src/Mod/Fem/femexamples/material_multiple_tensionrod_twoboxes.py @@ -170,7 +170,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/material_nl_platewithhole.py b/src/Mod/Fem/femexamples/material_nl_platewithhole.py index acd7897799..192b12915d 100644 --- a/src/Mod/Fem/femexamples/material_nl_platewithhole.py +++ b/src/Mod/Fem/femexamples/material_nl_platewithhole.py @@ -178,7 +178,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/mystran_plate.py b/src/Mod/Fem/femexamples/mystran_plate.py index ca3d3eac37..d25c9f0e85 100644 --- a/src/Mod/Fem/femexamples/mystran_plate.py +++ b/src/Mod/Fem/femexamples/mystran_plate.py @@ -188,7 +188,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.CharacteristicLengthMax = "1.0 mm" femmesh_obj.ElementDimension = "2D" diff --git a/src/Mod/Fem/femexamples/rc_wall_2d.py b/src/Mod/Fem/femexamples/rc_wall_2d.py index a1bf4c961e..b74a865e13 100644 --- a/src/Mod/Fem/femexamples/rc_wall_2d.py +++ b/src/Mod/Fem/femexamples/rc_wall_2d.py @@ -176,7 +176,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/square_pipe_end_twisted_edgeforces.py b/src/Mod/Fem/femexamples/square_pipe_end_twisted_edgeforces.py index c6f01e2008..9fed8cb4bc 100644 --- a/src/Mod/Fem/femexamples/square_pipe_end_twisted_edgeforces.py +++ b/src/Mod/Fem/femexamples/square_pipe_end_twisted_edgeforces.py @@ -178,7 +178,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/square_pipe_end_twisted_nodeforces.py b/src/Mod/Fem/femexamples/square_pipe_end_twisted_nodeforces.py index 5386677255..4297d41f57 100644 --- a/src/Mod/Fem/femexamples/square_pipe_end_twisted_nodeforces.py +++ b/src/Mod/Fem/femexamples/square_pipe_end_twisted_nodeforces.py @@ -448,7 +448,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/thermomech_bimetal.py b/src/Mod/Fem/femexamples/thermomech_bimetal.py index 6b00686a11..8b7a61d85c 100644 --- a/src/Mod/Fem/femexamples/thermomech_bimetal.py +++ b/src/Mod/Fem/femexamples/thermomech_bimetal.py @@ -215,7 +215,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False doc.recompute() diff --git a/src/Mod/Fem/femexamples/truss_3d_cs_circle_ele_seg3.py b/src/Mod/Fem/femexamples/truss_3d_cs_circle_ele_seg3.py index 245527b089..333f0add1f 100644 --- a/src/Mod/Fem/femexamples/truss_3d_cs_circle_ele_seg3.py +++ b/src/Mod/Fem/femexamples/truss_3d_cs_circle_ele_seg3.py @@ -461,7 +461,7 @@ def setup(doc=None, solvertype="ccxtools"): FreeCAD.Console.PrintError("Error on creating elements.\n") femmesh_obj = analysis.addObject(ObjectsFem.makeMeshGmsh(doc, get_meshname()))[0] femmesh_obj.FemMesh = fem_mesh - femmesh_obj.Part = geom_obj + femmesh_obj.Shape = geom_obj femmesh_obj.SecondOrderLinear = False femmesh_obj.ElementDimension = "1D" # four elements for each bar diff --git a/src/Mod/Fem/femtest/app/test_femimport.py b/src/Mod/Fem/femtest/app/test_femimport.py index 7c3771766f..832fa20593 100644 --- a/src/Mod/Fem/femtest/app/test_femimport.py +++ b/src/Mod/Fem/femtest/app/test_femimport.py @@ -125,6 +125,7 @@ class TestObjectExistance(unittest.TestCase): "Fem::FemAnalysisPython", "Fem::FemMeshObject", "Fem::FemMeshObjectPython", + "Fem::FemMeshShapeBaseObjectPython", "Fem::FemMeshShapeNetgenObject", "Fem::FemMeshShapeObject", "Fem::FemResultObject", diff --git a/src/Mod/Fem/femtest/app/test_object.py b/src/Mod/Fem/femtest/app/test_object.py index e972e2fa50..31cc829fb9 100644 --- a/src/Mod/Fem/femtest/app/test_object.py +++ b/src/Mod/Fem/femtest/app/test_object.py @@ -721,7 +721,7 @@ class TestObjectType(unittest.TestCase): # FemMeshGmsh mesh_gmsh = ObjectsFem.makeMeshGmsh(doc) self.assertTrue(is_derived_from(mesh_gmsh, "App::DocumentObject")) - self.assertTrue(is_derived_from(mesh_gmsh, "Fem::FemMeshObjectPython")) + self.assertTrue(is_derived_from(mesh_gmsh, "Fem::FemMeshShapeBaseObjectPython")) self.assertTrue(is_derived_from(mesh_gmsh, "Fem::FemMeshGmsh")) # MeshBoundaryLayer @@ -965,7 +965,7 @@ class TestObjectType(unittest.TestCase): ObjectsFem.makeMaterialReinforced(doc).isDerivedFrom("App::MaterialObjectPython") ) mesh = ObjectsFem.makeMeshGmsh(doc) - self.assertTrue(mesh.isDerivedFrom("Fem::FemMeshObjectPython")) + self.assertTrue(mesh.isDerivedFrom("Fem::FemMeshShapeBaseObjectPython")) self.assertTrue( ObjectsFem.makeMeshBoundaryLayer(doc, mesh).isDerivedFrom("Fem::FeaturePython") )