From 558ea8e8001e0f182b0ccb106f76c46dccaefbce Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Mon, 13 Jul 2020 16:19:26 +0200 Subject: [PATCH] FEM: elmer unit tests, better names in the regard of unit schema --- src/Mod/Fem/CMakeLists.txt | 8 ++++---- src/Mod/Fem/femtest/app/test_solver_elmer.py | 8 ++++---- .../data/elmer/{box_static_mm.sif => box_static_0_mm.sif} | 0 ...er_faceload_mm.sif => ccxcantilever_faceload_0_mm.sif} | 0 ...er_nodeload_mm.sif => ccxcantilever_nodeload_0_mm.sif} | 0 ....sif => ccxcantilever_prescribeddisplacement_0_mm.sif} | 0 6 files changed, 8 insertions(+), 8 deletions(-) rename src/Mod/Fem/femtest/data/elmer/{box_static_mm.sif => box_static_0_mm.sif} (100%) rename src/Mod/Fem/femtest/data/elmer/{ccxcantilever_faceload_mm.sif => ccxcantilever_faceload_0_mm.sif} (100%) rename src/Mod/Fem/femtest/data/elmer/{ccxcantilever_nodeload_mm.sif => ccxcantilever_nodeload_0_mm.sif} (100%) rename src/Mod/Fem/femtest/data/elmer/{ccxcantilever_prescribeddisplacement_mm.sif => ccxcantilever_prescribeddisplacement_0_mm.sif} (100%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index c6f48b4943..e6f824b72a 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -263,11 +263,11 @@ SET(FemTestsCcx_SRCS SET(FemTestsElmer_SRCS femtest/data/elmer/__init__.py - femtest/data/elmer/box_static_mm.sif - femtest/data/elmer/ccxcantilever_faceload_mm.sif + femtest/data/elmer/box_static_0_mm.sif + femtest/data/elmer/ccxcantilever_faceload_0_mm.sif femtest/data/elmer/ccxcantilever_faceload_1_si.sif - femtest/data/elmer/ccxcantilever_nodeload_mm.sif - femtest/data/elmer/ccxcantilever_prescribeddisplacement_mm.sif + femtest/data/elmer/ccxcantilever_nodeload_0_mm.sif + femtest/data/elmer/ccxcantilever_prescribeddisplacement_0_mm.sif femtest/data/elmer/group_mesh.geo femtest/data/elmer/ELMERSOLVER_STARTINFO ) diff --git a/src/Mod/Fem/femtest/app/test_solver_elmer.py b/src/Mod/Fem/femtest/app/test_solver_elmer.py index c2081db2ae..bf63e3fd37 100644 --- a/src/Mod/Fem/femtest/app/test_solver_elmer.py +++ b/src/Mod/Fem/femtest/app/test_solver_elmer.py @@ -105,7 +105,7 @@ class TestSolverElmer(unittest.TestCase): param.SetInt("UserSchema", new_unit_schema) # ******************************************************************************************** - def test_box_static_mm( + def test_box_static_0_mm( self ): fcc_print("") @@ -161,7 +161,7 @@ class TestSolverElmer(unittest.TestCase): self.assertFalse(ret, "GMSH geo write file test failed.\n{}".format(ret)) # ******************************************************************************************** - def test_ccxcantilever_faceload_mm( + def test_ccxcantilever_faceload_0_mm( self ): fcc_print("") @@ -181,7 +181,7 @@ class TestSolverElmer(unittest.TestCase): self.input_file_writing_test(get_namefromdef("test_")) # ******************************************************************************************** - def test_ccxcantilever_nodeload_mm( + def test_ccxcantilever_nodeload_0_mm( self ): fcc_print("") @@ -191,7 +191,7 @@ class TestSolverElmer(unittest.TestCase): self.input_file_writing_test(get_namefromdef("test_")) # ******************************************************************************************** - def test_ccxcantilever_prescribeddisplacement_mm( + def test_ccxcantilever_prescribeddisplacement_0_mm( self ): fcc_print("") diff --git a/src/Mod/Fem/femtest/data/elmer/box_static_mm.sif b/src/Mod/Fem/femtest/data/elmer/box_static_0_mm.sif similarity index 100% rename from src/Mod/Fem/femtest/data/elmer/box_static_mm.sif rename to src/Mod/Fem/femtest/data/elmer/box_static_0_mm.sif diff --git a/src/Mod/Fem/femtest/data/elmer/ccxcantilever_faceload_mm.sif b/src/Mod/Fem/femtest/data/elmer/ccxcantilever_faceload_0_mm.sif similarity index 100% rename from src/Mod/Fem/femtest/data/elmer/ccxcantilever_faceload_mm.sif rename to src/Mod/Fem/femtest/data/elmer/ccxcantilever_faceload_0_mm.sif diff --git a/src/Mod/Fem/femtest/data/elmer/ccxcantilever_nodeload_mm.sif b/src/Mod/Fem/femtest/data/elmer/ccxcantilever_nodeload_0_mm.sif similarity index 100% rename from src/Mod/Fem/femtest/data/elmer/ccxcantilever_nodeload_mm.sif rename to src/Mod/Fem/femtest/data/elmer/ccxcantilever_nodeload_0_mm.sif diff --git a/src/Mod/Fem/femtest/data/elmer/ccxcantilever_prescribeddisplacement_mm.sif b/src/Mod/Fem/femtest/data/elmer/ccxcantilever_prescribeddisplacement_0_mm.sif similarity index 100% rename from src/Mod/Fem/femtest/data/elmer/ccxcantilever_prescribeddisplacement_mm.sif rename to src/Mod/Fem/femtest/data/elmer/ccxcantilever_prescribeddisplacement_0_mm.sif