diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 8c0f950471..52d9f14492 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -38,8 +38,8 @@ SET(FemExamples_SRCS femexamples/boxanalysis.py femexamples/ccx_cantilever_std.py femexamples/manager.py + femexamples/material_multiple_twoboxes.py femexamples/material_nl_platewithhole.py - femexamples/multimaterial_twoboxes.py femexamples/rc_wall_2d.py femexamples/thermomech_flow1d.py femexamples/thermomech_spine.py @@ -48,9 +48,9 @@ SET(FemExamples_SRCS SET(FemExampleMeshes_SRCS femexamples/meshes/__init__.py femexamples/meshes/mesh_boxanalysis.py + femexamples/meshes/mesh_boxes_2_vertikal_tetra10.py femexamples/meshes/mesh_canticcx_tetra10.py femexamples/meshes/mesh_rc_wall_2d_tria6.py - femexamples/meshes/mesh_multimaterial_twoboxes.py femexamples/meshes/mesh_platewithhole.py femexamples/meshes/mesh_thermomech_flow1d.py femexamples/meshes/mesh_thermomech_spine.py diff --git a/src/Mod/Fem/femexamples/manager.py b/src/Mod/Fem/femexamples/manager.py index efbde0fb42..f5610b44c4 100644 --- a/src/Mod/Fem/femexamples/manager.py +++ b/src/Mod/Fem/femexamples/manager.py @@ -80,7 +80,7 @@ def run_all(): run_ccx_cantilevernodeload() run_ccx_cantileverprescribeddisplacement() run_material_nl_platewithhole() - run_multimaterial_twoboxes() + run_material_multiple_twoboxes() run_rcwall2d() run_thermomech_flow1d() run_thermomech_spine() @@ -156,13 +156,13 @@ def run_ccx_cantileverprescribeddisplacement(solver=None, base_name=None): return doc -def run_material_nl_platewithhole(solver=None, base_name=None): +def run_material_multiple_twoboxes(solver=None, base_name=None): - from .material_nl_platewithhole import setup + from .material_multiple_twoboxes import setup doc = setup() if base_name is None: - base_name = "Nonlinear_material_plate_with_hole" + base_name = "Multimaterial_Two-Boxes" if solver is not None: base_name += "_" + solver run_analysis(doc, base_name) @@ -170,13 +170,13 @@ def run_material_nl_platewithhole(solver=None, base_name=None): return doc -def run_multimaterial_twoboxes(solver=None, base_name=None): +def run_material_nl_platewithhole(solver=None, base_name=None): - from .multimaterial_twoboxes import setup + from .material_nl_platewithhole import setup doc = setup() if base_name is None: - base_name = "Multimaterial_Two-Boxes" + base_name = "Nonlinear_material_plate_with_hole" if solver is not None: base_name += "_" + solver run_analysis(doc, base_name) @@ -236,8 +236,8 @@ doc = run_boxanalysisfrequency() doc = run_ccx_cantileverfaceload() doc = run_ccx_cantilevernodeload() doc = run_ccx_cantileverprescribeddisplacement() +doc = run_material_multiple_twoboxes() doc = run_material_nl_platewithhole() -doc = run_multimaterial_twoboxes() doc = run_rcwall2d() doc = run_thermomech_flow1d() doc = run_thermomech_spine() diff --git a/src/Mod/Fem/femexamples/multimaterial_twoboxes.py b/src/Mod/Fem/femexamples/material_multiple_twoboxes.py similarity index 97% rename from src/Mod/Fem/femexamples/multimaterial_twoboxes.py rename to src/Mod/Fem/femexamples/material_multiple_twoboxes.py index 8f477af75e..ad1b821b37 100644 --- a/src/Mod/Fem/femexamples/multimaterial_twoboxes.py +++ b/src/Mod/Fem/femexamples/material_multiple_twoboxes.py @@ -139,7 +139,7 @@ def setup(doc=None, solver="ccxtools"): pressure_constraint.Reversed = False # mesh - from .meshes.mesh_multimaterial_twoboxes import create_nodes, create_elements + from .meshes.mesh_boxes_2_vertikal_tetra10 import create_nodes, create_elements fem_mesh = Fem.FemMesh() control = create_nodes(fem_mesh) if not control: @@ -157,7 +157,7 @@ def setup(doc=None, solver="ccxtools"): """ -from femexamples import multimaterial_twoboxes as twoboxes +from femexamples import material_multiple_twoboxes as twoboxes twoboxes.setup() """ diff --git a/src/Mod/Fem/femexamples/meshes/mesh_multimaterial_twoboxes.py b/src/Mod/Fem/femexamples/meshes/mesh_boxes_2_vertikal_tetra10.py similarity index 100% rename from src/Mod/Fem/femexamples/meshes/mesh_multimaterial_twoboxes.py rename to src/Mod/Fem/femexamples/meshes/mesh_boxes_2_vertikal_tetra10.py