From 6e40c19f73a34734916a55bde3d552e2c0d97b39 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 10 Jul 2020 08:41:13 +0200 Subject: [PATCH] FEM: examples, rename material multiple two boxes --- src/Mod/Fem/CMakeLists.txt | 4 ++-- ...e_twoboxes.py => material_multiple_tensionrod_twoboxes.py} | 2 +- src/Mod/Fem/femtest/app/test_solver_calculix.py | 4 ++-- ...multiple.inp => material_multiple_tensionrod_twoboxes.inp} | 0 src/Mod/Fem/femtest/test_commands.sh | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) rename src/Mod/Fem/femexamples/{material_multiple_twoboxes.py => material_multiple_tensionrod_twoboxes.py} (98%) rename src/Mod/Fem/femtest/data/calculix/{material_multiple.inp => material_multiple_tensionrod_twoboxes.inp} (100%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 62e8717efe..7b46430ace 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -56,7 +56,7 @@ SET(FemExamples_SRCS femexamples/manager.py femexamples/material_multiple_bendingbeam_fiveboxes.py femexamples/material_multiple_bendingbeam_fivefaces.py - femexamples/material_multiple_twoboxes.py + femexamples/material_multiple_tensionrod_twoboxes.py femexamples/material_nl_platewithhole.py femexamples/rc_wall_2d.py femexamples/thermomech_bimetall.py @@ -245,7 +245,7 @@ SET(FemTestsCcx_SRCS femtest/data/calculix/constraint_tie.inp femtest/data/calculix/material_multiple_bendingbeam_fiveboxes.inp femtest/data/calculix/material_multiple_bendingbeam_fivefaces.inp - femtest/data/calculix/material_multiple.inp + femtest/data/calculix/material_multiple_tensionrod_twoboxes.inp femtest/data/calculix/material_nonlinear.inp femtest/data/calculix/thermomech_bimetall.inp femtest/data/calculix/thermomech_flow1D.inp diff --git a/src/Mod/Fem/femexamples/material_multiple_twoboxes.py b/src/Mod/Fem/femexamples/material_multiple_tensionrod_twoboxes.py similarity index 98% rename from src/Mod/Fem/femexamples/material_multiple_twoboxes.py rename to src/Mod/Fem/femexamples/material_multiple_tensionrod_twoboxes.py index e16eedd923..8c135ea54e 100644 --- a/src/Mod/Fem/femexamples/material_multiple_twoboxes.py +++ b/src/Mod/Fem/femexamples/material_multiple_tensionrod_twoboxes.py @@ -24,7 +24,7 @@ # to run the example use: """ -from femexamples.material_multiple_twoboxes import setup +from femexamples.material_multiple_tensionrod_twoboxes import setup setup() """ diff --git a/src/Mod/Fem/femtest/app/test_solver_calculix.py b/src/Mod/Fem/femtest/app/test_solver_calculix.py index ad37d01fd0..384a522d99 100644 --- a/src/Mod/Fem/femtest/app/test_solver_calculix.py +++ b/src/Mod/Fem/femtest/app/test_solver_calculix.py @@ -183,10 +183,10 @@ class TestSolverCalculix(unittest.TestCase): self.input_file_writing_test(get_namefromdef("test_")) # ******************************************************************************************** - def test_material_multiple( + def test_material_multiple_tensionrod_twoboxes( self ): - from femexamples.material_multiple_twoboxes import setup + from femexamples.material_multiple_tensionrod_twoboxes import setup setup(self.document, "calculix") self.input_file_writing_test(get_namefromdef("test_")) diff --git a/src/Mod/Fem/femtest/data/calculix/material_multiple.inp b/src/Mod/Fem/femtest/data/calculix/material_multiple_tensionrod_twoboxes.inp similarity index 100% rename from src/Mod/Fem/femtest/data/calculix/material_multiple.inp rename to src/Mod/Fem/femtest/data/calculix/material_multiple_tensionrod_twoboxes.inp diff --git a/src/Mod/Fem/femtest/test_commands.sh b/src/Mod/Fem/femtest/test_commands.sh index edb87c1442..4b75775cb0 100644 --- a/src/Mod/Fem/femtest/test_commands.sh +++ b/src/Mod/Fem/femtest/test_commands.sh @@ -85,7 +85,7 @@ make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalc make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalculix.test_constraint_tie make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalculix.test_material_multiple_bendingbeam_fiveboxes make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalculix.test_material_multiple_bendingbeam_fivefaces -make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalculix.test_material_multiple +make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalculix.test_material_multiple_tensionrod_twoboxes make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalculix.test_material_nonlinear make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalculix.test_thermomech_bimetall make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solver_calculix.TestSolverCalculix.test_thermomech_flow1D @@ -340,7 +340,7 @@ unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( - 'femtest.app.test_solver_calculix.TestSolverCalculix.test_material_multiple' + 'femtest.app.test_solver_calculix.TestSolverCalculix.test_material_multiple_tensionrod_twoboxes' )) import unittest