From 799b4a867bca9ac9abbe336bcb8b05564a78f05e Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Wed, 4 Aug 2021 22:06:47 +0200 Subject: [PATCH] FEM: unit tests calculix and cmake, move a method and a file --- src/Mod/Fem/CMakeLists.txt | 2 +- src/Mod/Fem/femtest/app/test_solver_calculix.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index bad64aa37f..458162014d 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -322,7 +322,6 @@ SET(FemTestsCcx_SRCS femtest/data/calculix/box.FCStd femtest/data/calculix/ccx_buckling_flexuralbuckling.dat femtest/data/calculix/ccx_buckling_flexuralbuckling.inp - femtest/data/calculix/ccx_cantilever_faceload.inp femtest/data/calculix/ccx_cantilever_ele_hexa20.inp femtest/data/calculix/ccx_cantilever_ele_quad4.inp femtest/data/calculix/ccx_cantilever_ele_quad8.inp @@ -330,6 +329,7 @@ SET(FemTestsCcx_SRCS femtest/data/calculix/ccx_cantilever_ele_seg3.inp femtest/data/calculix/ccx_cantilever_ele_tria3.inp femtest/data/calculix/ccx_cantilever_ele_tria6.inp + femtest/data/calculix/ccx_cantilever_faceload.inp femtest/data/calculix/ccx_cantilever_nodeload.inp femtest/data/calculix/ccx_cantilever_prescribeddisplacement.inp femtest/data/calculix/constraint_centrif.inp diff --git a/src/Mod/Fem/femtest/app/test_solver_calculix.py b/src/Mod/Fem/femtest/app/test_solver_calculix.py index 0462c5cb88..d6cc656da6 100644 --- a/src/Mod/Fem/femtest/app/test_solver_calculix.py +++ b/src/Mod/Fem/femtest/app/test_solver_calculix.py @@ -103,14 +103,6 @@ class TestSolverCalculix(unittest.TestCase): setup(self.document, "calculix") self.input_file_writing_test(get_namefromdef("test_")) - # ******************************************************************************************** - def test_ccx_cantilever_faceload( - self - ): - from femexamples.ccx_cantilever_faceload import setup - setup(self.document, "calculix") - self.input_file_writing_test(get_namefromdef("test_")) - # ******************************************************************************************** def test_ccx_cantilever_ele_hexa20( self @@ -167,6 +159,14 @@ class TestSolverCalculix(unittest.TestCase): setup(self.document, "calculix") self.input_file_writing_test(get_namefromdef("test_")) + # ******************************************************************************************** + def test_ccx_cantilever_faceload( + self + ): + from femexamples.ccx_cantilever_faceload import setup + setup(self.document, "calculix") + self.input_file_writing_test(get_namefromdef("test_")) + # ******************************************************************************************** def test_ccx_cantilever_nodeload( self