diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 73a885d67..e7deeb90c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,54 +1,49 @@ #=============================================================================== # @file CMakeLists.txt # @author Nicolas Richart # @author Guillaume Anciaux # @date Fri Jun 11 09:46:59 2010 # # @section LICENSE # # Copyright (©) 2010-2011 EPFL (Ecole Polytechnique fédérale de Lausanne) # Laboratory (LSMS - Laboratoire de Simulation en Mécanique des Solides) # # Akantu is free software: you can redistribute it and/or modify it under the # terms of the GNU Lesser General Public License as published by the Free # Software Foundation, either version 3 of the License, or (at your option) any # later version. # # Akantu is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more # details. # # You should have received a copy of the GNU Lesser General Public License # along with Akantu. If not, see . # # @section DESCRIPTION # #=============================================================================== INCLUDE(${AKANTU_CMAKE_DIR}/AkantuTestAndExamples.cmake) #=============================================================================== # List of tests #=============================================================================== add_akantu_test(test_vector "Test akantu vector") add_akantu_test(test_static_memory "Test static memory") add_akantu_test(test_fem "Test finite element functionalties") -add_akantu_test(test_mesh_io "Test mesh io object") -add_akantu_test(test_facet_extraction "Test mesh utils facet extraction") +add_akantu_test(test_mesh_utils "Test mesh utils") add_akantu_test(test_model "Test model objects") add_akantu_test(test_solver "Test solver function") if(AKANTU_BUILD_CONTACT) #add_akantu_test(test_contact_neighbor_structure "Test contact neighbor structure") add_akantu_test(test_surface_extraction "Test mesh utils surface extraction") endif(AKANTU_BUILD_CONTACT) -if(AKANTU_SCOTCH_ON) - add_akantu_test(test_mesh_partitionate "Test mesh partition creation") -endif(AKANTU_SCOTCH_ON) - if(AKANTU_MPI_ON) add_akantu_test(test_synchronizer "Test synchronizers") endif(AKANTU_MPI_ON) diff --git a/test/bar.geo b/test/bar.geo deleted file mode 100644 index 1c0161ae3..000000000 --- a/test/bar.geo +++ /dev/null @@ -1,42 +0,0 @@ -// CUBE ON CUBE (2 BODIES) 3D: - -// REMARKS: -// Physical Surfaces are defined so that load_mesh_msh can load -// directly the surface element structure. When creating Plane Surface, -// the surface normal has to point to the inside of the body. Otherwise the -// solvecontact3d algorithm won't work. The Physical Surface number -// corresponds to the face number. The face numbering has to start with 1! -// Physical Volume defines the material of each body. This can be read -// by the load_mesh_msh function in adlib. - -// Mesh size -h = 0.05; // Top cube -hy = 0.5; // Top cube - -// Dimensions of top cube -Lx = 10; -Ly = 1; - - -// ------------------------------------------ -// Geometry -// ------------------------------------------ - -// Base Cube -Point(101) = { 0.0, 0.0, 0.0, h}; // Bottom Face -Point(102) = { Lx, 0.0, 0.0, h}; // Bottom Face -Point(103) = { Lx, Ly, 0.0, h}; // Bottom Face -Point(104) = { 0.0, Ly, 0.0, h}; // Bottom Face - -// Base Cube -Line(101) = {101,102}; // Bottom Face -Line(102) = {102,103}; // Bottom Face -Line(103) = {103,104}; // Bottom Face -Line(104) = {104,101}; // Bottom Face - -// Base Cube -Line Loop(101) = {101:104}; - -Plane Surface(101) = {101}; - -Physical Surface(1) = {101}; diff --git a/test/test_facet_extraction/square.geo b/test/test_facet_extraction/square.geo deleted file mode 100644 index 33d1d3cc2..000000000 --- a/test/test_facet_extraction/square.geo +++ /dev/null @@ -1,11 +0,0 @@ -Point(1) = {0.0, 0.0, 0.0, .5}; -Point(2) = {1.0, 0.0, 0.0, .5}; -Point(3) = {0.0, 1.0, 0.0, .5}; -Point(4) = {1.0, 1.0, 0.0, .5}; - -Line(1) = {1, 2}; -Line(2) = {2, 4}; -Line(3) = {4, 3}; -Line(4) = {3, 1}; -Line Loop(1) = {1, 2, 3, 4}; -Plane Surface(1) = {1}; diff --git a/test/test_facet_extraction/CMakeLists.txt b/test/test_mesh_utils/test_facet_extraction/CMakeLists.txt similarity index 100% rename from test/test_facet_extraction/CMakeLists.txt rename to test/test_mesh_utils/test_facet_extraction/CMakeLists.txt diff --git a/test/test_facet_extraction/cube.geo b/test/test_mesh_utils/test_facet_extraction/cube.geo similarity index 100% rename from test/test_facet_extraction/cube.geo rename to test/test_mesh_utils/test_facet_extraction/cube.geo diff --git a/test/square.geo b/test/test_mesh_utils/test_facet_extraction/square.geo similarity index 100% rename from test/square.geo rename to test/test_mesh_utils/test_facet_extraction/square.geo diff --git a/test/test_facet_extraction/test_facet_extraction_tetrahedron_4.cc b/test/test_mesh_utils/test_facet_extraction/test_facet_extraction_tetrahedron_4.cc similarity index 100% rename from test/test_facet_extraction/test_facet_extraction_tetrahedron_4.cc rename to test/test_mesh_utils/test_facet_extraction/test_facet_extraction_tetrahedron_4.cc diff --git a/test/test_facet_extraction/test_facet_extraction_triangle_3.cc b/test/test_mesh_utils/test_facet_extraction/test_facet_extraction_triangle_3.cc similarity index 100% rename from test/test_facet_extraction/test_facet_extraction_triangle_3.cc rename to test/test_mesh_utils/test_facet_extraction/test_facet_extraction_triangle_3.cc diff --git a/test/test_mesh_io/CMakeLists.txt b/test/test_mesh_utils/test_mesh_io/CMakeLists.txt similarity index 100% rename from test/test_mesh_io/CMakeLists.txt rename to test/test_mesh_utils/test_mesh_io/CMakeLists.txt diff --git a/test/test_mesh_io/cube.geo b/test/test_mesh_utils/test_mesh_io/cube.geo similarity index 100% rename from test/test_mesh_io/cube.geo rename to test/test_mesh_utils/test_mesh_io/cube.geo diff --git a/test/test_mesh_io/test_mesh_io_msh.cc b/test/test_mesh_utils/test_mesh_io/test_mesh_io_msh.cc similarity index 100% rename from test/test_mesh_io/test_mesh_io_msh.cc rename to test/test_mesh_utils/test_mesh_io/test_mesh_io_msh.cc diff --git a/test/test_mesh_partitionate/CMakeLists.txt b/test/test_mesh_utils/test_mesh_partitionate/CMakeLists.txt similarity index 100% rename from test/test_mesh_partitionate/CMakeLists.txt rename to test/test_mesh_utils/test_mesh_partitionate/CMakeLists.txt diff --git a/test/test_mesh_partitionate/test_mesh_partitionate_scotch.cc b/test/test_mesh_utils/test_mesh_partitionate/test_mesh_partitionate_scotch.cc similarity index 100% rename from test/test_mesh_partitionate/test_mesh_partitionate_scotch.cc rename to test/test_mesh_utils/test_mesh_partitionate/test_mesh_partitionate_scotch.cc diff --git a/test/test_mesh_partitionate/triangle.geo b/test/test_mesh_utils/test_mesh_partitionate/triangle.geo similarity index 100% rename from test/test_mesh_partitionate/triangle.geo rename to test/test_mesh_utils/test_mesh_partitionate/triangle.geo diff --git a/test/triangle.geo b/test/triangle.geo deleted file mode 100644 index 2b7d6b4a0..000000000 --- a/test/triangle.geo +++ /dev/null @@ -1,31 +0,0 @@ -// Mesh size -h = 0.1; - -// Dimensions of top square -Lx = 1; -Ly = 1; - - -// ------------------------------------------ -// Geometry -// ------------------------------------------ - -// Base Cube -Point(101) = { 0.0, 0.0, 0.0, h}; // Bottom Face -Point(102) = { Lx, 0.0, 0.0, h}; // Bottom Face -Point(103) = { Lx, Ly, 0.0, h}; // Bottom Face -Point(104) = { 0.0, Ly, 0.0, h}; // Bottom Face - -// Base Cube -Line(101) = {101,102}; // Bottom Face -Line(102) = {102,103}; // Bottom Face -Line(103) = {103,104}; // Bottom Face -Line(104) = {104,101}; // Bottom Face - -// Base Cube -Line Loop(101) = {101:104}; - -// Base Cube -Plane Surface(101) = {101}; - -Physical Surface(6) = {101}; diff --git a/test/triangle.msh b/test/triangle.msh deleted file mode 100644 index 18edfd50e..000000000 --- a/test/triangle.msh +++ /dev/null @@ -1,316 +0,0 @@ -$MeshFormat -2.1 0 8 -$EndMeshFormat -$Nodes -115 -1 0 0 0 -2 1 0 0 -3 1 1 0 -4 0 1 0 -5 0.1111111111108444 0 0 -6 0.2222222222216888 0 0 -7 0.3333333333326072 0 0 -8 0.4444444444435502 0 0 -9 0.5555555555546474 0 0 -10 0.6666666666658989 0 0 -11 0.7777777777771888 0 0 -12 0.8888888888885945 0 0 -13 1 0.1111111111108444 0 -14 1 0.2222222222216888 0 -15 1 0.3333333333326072 0 -16 1 0.4444444444435502 0 -17 1 0.5555555555546474 0 -18 1 0.6666666666658989 0 -19 1 0.7777777777771888 0 -20 1 0.8888888888885945 0 -21 0.888888888889043 1 0 -22 0.7777777777780861 1 0 -23 0.6666666666673606 1 0 -24 0.555555555556712 1 0 -25 0.4444444444457551 1 0 -26 0.3333333333344899 1 0 -27 0.2222222222231475 1 0 -28 0.1111111111115738 1 0 -29 0 0.888888888889043 0 -30 0 0.7777777777780861 0 -31 0 0.6666666666673606 0 -32 0 0.555555555556712 0 -33 0 0.4444444444457551 0 -34 0 0.3333333333344899 0 -35 0 0.2222222222231475 0 -36 0 0.1111111111115738 0 -37 0.5978556264152467 0.49115407826348 0 -38 0.1764603649160983 0.6533067429808995 0 -39 0.7322647579956444 0.8104243715065748 0 -40 0.7461190697321682 0.1929429039560404 0 -41 0.09127520522086634 0.8447218841949198 0 -42 0.1592434623988597 0.08357056831225597 0 -43 0.932620026912474 0.8516566076008336 0 -44 0.5538552359967278 0.2395159125825012 0 -45 0.5137670884981619 0.7742376604618669 0 -46 0.818131191098899 0.4749882420507863 0 -47 0.2142681343529381 0.4621381458635411 0 -48 0.4108901606354623 0.3743640904118659 0 -49 0.3955125322828381 0.1555023817586433 0 -50 0.3748127430545352 0.6064355758349366 0 -51 0.747972626339022 0.3174544725147305 0 -52 0.8886799295103069 0.6663029246662875 0 -53 0.119931442855992 0.5315453007510679 0 -54 0.1066083897241116 0.3945451644394211 0 -55 0.2867384290168708 0.1003569609004789 0 -56 0.09705607050559384 0.2688771132488937 0 -57 0.7782638523667984 0.08764110082263921 0 -58 0.8896708509317109 0.760401319059382 0 -59 0.1734993499077968 0.9109368874766604 0 -60 0.08082606010205957 0.6547581796912495 0 -61 0.08757036270935642 0.1535427789213744 0 -62 0.8874175005606928 0.1766680055044478 0 -63 0.835019287758676 0.8810414780882351 0 -64 0.9154635697338186 0.2965126361214718 0 -65 0.1876792306412401 0.191748037544533 0 -66 0.1117816490327184 0.7449591502906574 0 -67 0.5473037596979706 0.6616930597395217 0 -68 0.4060073398256883 0.8129154152077792 0 -69 0.570414002971518 0.3511614251694932 0 -70 0.4433586596319997 0.6891631919280652 0 -71 0.5542341987090806 0.1387470534565737 0 -72 0.3250025747308055 0.7328406093151559 0 -73 0.7263746091907557 0.505519195733496 0 -74 0.4001233326466232 0.4901203779655258 0 -75 0.4892991142289225 0.5649019759354333 0 -76 0.4120531092551457 0.2620502558533597 0 -77 0.6728067682571638 0.3792568919215422 0 -78 0.4907535427528506 0.4328058368593 0 -79 0.5011858983646229 0.9007141689848936 0 -80 0.4891009804998133 0.3096976033766952 0 -81 0.4724794686574424 0.0918048033614592 0 -82 0.4822067675008448 0.1970398165912144 0 -83 0.2980188004510336 0.2263538942262235 0 -84 0.6566015592167671 0.6103110904663469 0 -85 0.3062434879135549 0.4176922484930643 0 -86 0.84779995407731 0.3756852149133095 0 -87 0.2244647742236286 0.5645350027285538 0 -88 0.9119378876256082 0.487462686094354 0 -89 0.3220969799789191 0.3214960027548235 0 -90 0.306049798336198 0.5310651474171264 0 -91 0.2188530133667702 0.3261215152243572 0 -92 0.7620121146932269 0.4088531634443038 0 -93 0.2001029779855939 0.7694829200304373 0 -94 0.9350402822873475 0.3874876629810585 0 -95 0.2716031526805164 0.6427844232627292 0 -96 0.9256988298938801 0.5909740967293179 0 -97 0.3865016415466618 0.06953282920411627 0 -98 0.8276315676477676 0.2706905087430281 0 -99 0.6562015826691466 0.1097240675684818 0 -100 0.826122306562508 0.573159656744589 0 -101 0.7733147335351873 0.6916450242534147 0 -102 0.2872463521080065 0.8589786629254738 0 -103 0.6430862120964038 0.2469718181670519 0 -104 0.0715849872438121 0.06964489166904082 0 -105 0.0751771332480474 0.9289095321121247 0 -106 0.9333764846794773 0.9269560462763735 0 -107 0.7055356515046353 0.913168773899395 0 -108 0.6143185392691164 0.843373177152856 0 -109 0.3670414413979979 0.9302993134230498 0 -110 0.6408108477900479 0.7325118234638853 0 -111 0.57541587122327 0.581931708672365 0 -112 0.744055374109703 0.5924201475265963 0 -113 0.8075674075553047 0.7858780482269017 0 -114 0.6086524622724895 0.931451224007429 0 -115 0.8887246699322123 0.06257003623965524 0 -$EndNodes -$Elements -192 -1 2 3 6 101 0 19 20 43 -2 2 3 6 101 0 5 6 42 -3 2 3 6 101 0 29 30 41 -4 2 3 6 101 0 53 32 33 -5 2 3 6 101 0 33 34 54 -6 2 3 6 101 0 19 43 58 -7 2 3 6 101 0 61 56 35 -8 2 3 6 101 0 40 57 62 -9 2 3 6 101 0 63 58 43 -10 2 3 6 101 0 64 14 15 -11 2 3 6 101 0 42 55 65 -12 2 3 6 101 0 66 60 38 -13 2 3 6 101 0 59 27 28 -14 2 3 6 101 0 61 35 36 -15 2 3 6 101 0 53 33 54 -16 2 3 6 101 0 53 54 47 -17 2 3 6 101 0 61 42 65 -18 2 3 6 101 0 61 65 56 -19 2 3 6 101 0 13 14 62 -20 2 3 6 101 0 62 14 64 -21 2 3 6 101 0 21 22 63 -22 2 3 6 101 0 60 31 32 -23 2 3 6 101 0 32 53 60 -24 2 3 6 101 0 60 53 38 -25 2 3 6 101 0 34 35 56 -26 2 3 6 101 0 56 54 34 -27 2 3 6 101 0 10 11 57 -28 2 3 6 101 0 18 19 58 -29 2 3 6 101 0 58 52 18 -30 2 3 6 101 0 31 60 30 -31 2 3 6 101 0 66 41 30 -32 2 3 6 101 0 60 66 30 -33 2 3 6 101 0 6 7 55 -34 2 3 6 101 0 6 55 42 -35 2 3 6 101 0 70 67 45 -36 2 3 6 101 0 45 68 70 -37 2 3 6 101 0 50 74 75 -38 2 3 6 101 0 37 69 77 -39 2 3 6 101 0 77 73 37 -40 2 3 6 101 0 78 69 37 -41 2 3 6 101 0 78 74 48 -42 2 3 6 101 0 44 69 80 -43 2 3 6 101 0 48 76 80 -44 2 3 6 101 0 81 8 9 -45 2 3 6 101 0 9 71 81 -46 2 3 6 101 0 82 71 44 -47 2 3 6 101 0 82 76 49 -48 2 3 6 101 0 49 76 83 -49 2 3 6 101 0 83 55 49 -50 2 3 6 101 0 37 73 84 -51 2 3 6 101 0 48 74 85 -52 2 3 6 101 0 87 53 47 -53 2 3 6 101 0 38 53 87 -54 2 3 6 101 0 46 86 88 -55 2 3 6 101 0 89 76 48 -56 2 3 6 101 0 90 74 50 -57 2 3 6 101 0 90 87 47 -58 2 3 6 101 0 54 56 91 -59 2 3 6 101 0 46 73 92 -60 2 3 6 101 0 51 86 92 -61 2 3 6 101 0 92 86 46 -62 2 3 6 101 0 94 15 16 -63 2 3 6 101 0 94 86 64 -64 2 3 6 101 0 64 15 94 -65 2 3 6 101 0 50 72 95 -66 2 3 6 101 0 38 87 95 -67 2 3 6 101 0 17 18 96 -68 2 3 6 101 0 96 18 52 -69 2 3 6 101 0 7 8 97 -70 2 3 6 101 0 49 55 97 -71 2 3 6 101 0 97 55 7 -72 2 3 6 101 0 40 62 98 -73 2 3 6 101 0 98 62 64 -74 2 3 6 101 0 98 51 40 -75 2 3 6 101 0 9 10 99 -76 2 3 6 101 0 99 71 9 -77 2 3 6 101 0 52 58 101 -78 2 3 6 101 0 44 71 103 -79 2 3 6 101 0 104 1 5 -80 2 3 6 101 0 104 61 36 -81 2 3 6 101 0 36 1 104 -82 2 3 6 101 0 105 4 29 -83 2 3 6 101 0 105 59 28 -84 2 3 6 101 0 28 4 105 -85 2 3 6 101 0 106 3 21 -86 2 3 6 101 0 106 43 20 -87 2 3 6 101 0 20 3 106 -88 2 3 6 101 0 97 8 81 -89 2 3 6 101 0 49 97 81 -90 2 3 6 101 0 55 83 65 -91 2 3 6 101 0 106 21 63 -92 2 3 6 101 0 43 106 63 -93 2 3 6 101 0 86 51 98 -94 2 3 6 101 0 86 98 64 -95 2 3 6 101 0 105 29 41 -96 2 3 6 101 0 59 105 41 -97 2 3 6 101 0 104 5 42 -98 2 3 6 101 0 61 104 42 -99 2 3 6 101 0 70 50 75 -100 2 3 6 101 0 70 75 67 -101 2 3 6 101 0 72 50 70 -102 2 3 6 101 0 68 72 70 -103 2 3 6 101 0 78 48 80 -104 2 3 6 101 0 78 80 69 -105 2 3 6 101 0 82 49 81 -106 2 3 6 101 0 71 82 81 -107 2 3 6 101 0 77 51 92 -108 2 3 6 101 0 77 92 73 -109 2 3 6 101 0 78 37 75 -110 2 3 6 101 0 74 78 75 -111 2 3 6 101 0 90 47 85 -112 2 3 6 101 0 74 90 85 -113 2 3 6 101 0 76 89 83 -114 2 3 6 101 0 82 44 80 -115 2 3 6 101 0 76 82 80 -116 2 3 6 101 0 89 48 85 -117 2 3 6 101 0 94 16 88 -118 2 3 6 101 0 86 94 88 -119 2 3 6 101 0 96 52 100 -120 2 3 6 101 0 90 50 95 -121 2 3 6 101 0 90 95 87 -122 2 3 6 101 0 93 59 41 -123 2 3 6 101 0 41 66 93 -124 2 3 6 101 0 59 93 102 -125 2 3 6 101 0 79 24 25 -126 2 3 6 101 0 79 68 45 -127 2 3 6 101 0 88 16 17 -128 2 3 6 101 0 96 88 17 -129 2 3 6 101 0 46 88 100 -130 2 3 6 101 0 96 100 88 -131 2 3 6 101 0 93 66 38 -132 2 3 6 101 0 93 38 95 -133 2 3 6 101 0 93 95 72 -134 2 3 6 101 0 103 40 51 -135 2 3 6 101 0 103 69 44 -136 2 3 6 101 0 69 103 77 -137 2 3 6 101 0 103 51 77 -138 2 3 6 101 0 100 73 46 -139 2 3 6 101 0 27 59 102 -140 2 3 6 101 0 79 45 108 -141 2 3 6 101 0 79 25 109 -142 2 3 6 101 0 109 68 79 -143 2 3 6 101 0 110 45 67 -144 2 3 6 101 0 111 75 37 -145 2 3 6 101 0 111 84 67 -146 2 3 6 101 0 67 75 111 -147 2 3 6 101 0 37 84 111 -148 2 3 6 101 0 108 45 110 -149 2 3 6 101 0 109 25 26 -150 2 3 6 101 0 72 68 102 -151 2 3 6 101 0 93 72 102 -152 2 3 6 101 0 110 67 84 -153 2 3 6 101 0 110 101 39 -154 2 3 6 101 0 100 52 101 -155 2 3 6 101 0 84 101 110 -156 2 3 6 101 0 40 99 57 -157 2 3 6 101 0 103 99 40 -158 2 3 6 101 0 57 99 10 -159 2 3 6 101 0 103 71 99 -160 2 3 6 101 0 91 56 65 -161 2 3 6 101 0 83 91 65 -162 2 3 6 101 0 89 91 83 -163 2 3 6 101 0 107 22 23 -164 2 3 6 101 0 63 22 107 -165 2 3 6 101 0 39 63 107 -166 2 3 6 101 0 47 54 91 -167 2 3 6 101 0 47 91 85 -168 2 3 6 101 0 91 89 85 -169 2 3 6 101 0 84 73 112 -170 2 3 6 101 0 100 101 112 -171 2 3 6 101 0 112 73 100 -172 2 3 6 101 0 112 101 84 -173 2 3 6 101 0 108 110 39 -174 2 3 6 101 0 39 107 108 -175 2 3 6 101 0 102 68 109 -176 2 3 6 101 0 26 27 102 -177 2 3 6 101 0 26 102 109 -178 2 3 6 101 0 113 63 39 -179 2 3 6 101 0 113 101 58 -180 2 3 6 101 0 58 63 113 -181 2 3 6 101 0 39 101 113 -182 2 3 6 101 0 114 23 24 -183 2 3 6 101 0 114 79 108 -184 2 3 6 101 0 24 79 114 -185 2 3 6 101 0 107 23 114 -186 2 3 6 101 0 107 114 108 -187 2 3 6 101 0 115 2 13 -188 2 3 6 101 0 12 2 115 -189 2 3 6 101 0 11 12 115 -190 2 3 6 101 0 62 57 115 -191 2 3 6 101 0 115 13 62 -192 2 3 6 101 0 11 115 57 -$EndElements