diff --git a/test/test_model/test_solid_mechanics_model/test_contact/CMakeLists.txt b/test/test_model/test_solid_mechanics_model/test_contact/CMakeLists.txt index 3b2afd9a4..3f1161019 100644 --- a/test/test_model/test_solid_mechanics_model/test_contact/CMakeLists.txt +++ b/test/test_model/test_solid_mechanics_model/test_contact/CMakeLists.txt @@ -1,34 +1,34 @@ #=============================================================================== # @file CMakeLists.txt # @author David Kammer # @date Fri Dec 03 11:09: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 # #=============================================================================== #=============================================================================== add_subdirectory("test_neighbor_structure") add_subdirectory("test_contact_search") add_subdirectory("test_contact_2d") -add_subdirectory("test_contact_rigid_no_friction") +add_subdirectory("test_contact_rigid") diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/CMakeLists.txt b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/CMakeLists.txt similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/CMakeLists.txt rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/CMakeLists.txt diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/cubes.geo b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/cubes.geo similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/cubes.geo rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/cubes.geo diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/force_2d.geo b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/force_2d.geo similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/force_2d.geo rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/force_2d.geo diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/force_3d.geo b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/force_3d.geo similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/force_3d.geo rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/force_3d.geo diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/hertz_2d.geo b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/hertz_2d.geo similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/hertz_2d.geo rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/hertz_2d.geo diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/hertz_3d.geo b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/hertz_3d.geo similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/hertz_3d.geo rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/hertz_3d.geo diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/hertz_3d_full.geo b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/hertz_3d_full.geo similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/hertz_3d_full.geo rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/hertz_3d_full.geo diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/material.dat b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/material.dat similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/material.dat rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/material.dat diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/sliding_cube_2d.geo b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/sliding_cube_2d.geo similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/sliding_cube_2d.geo rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/sliding_cube_2d.geo diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/squares.geo b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/squares.geo similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/squares.geo rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/squares.geo diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_force_2d.cc b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_force_2d.cc similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_force_2d.cc rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_force_2d.cc diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_force_3d.cc b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_force_3d.cc similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_force_3d.cc rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_force_3d.cc diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_hertz_2d.cc b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_hertz_2d.cc similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_hertz_2d.cc rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_hertz_2d.cc diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_hertz_3d.cc b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_hertz_3d.cc similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_hertz_3d.cc rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_hertz_3d.cc diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_hertz_3d_full.cc b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_hertz_3d_full.cc similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_hertz_3d_full.cc rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_hertz_3d_full.cc diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_tetrahedron_4.cc b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_tetrahedron_4.cc similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_tetrahedron_4.cc rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_tetrahedron_4.cc diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_triangle_3.cc b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_triangle_3.cc similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_no_friction_triangle_3.cc rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_no_friction_triangle_3.cc diff --git a/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_sliding_cube_2d.cc b/test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_sliding_cube_2d.cc similarity index 100% rename from test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid_no_friction/test_contact_rigid_sliding_cube_2d.cc rename to test/test_model/test_solid_mechanics_model/test_contact/test_contact_rigid/test_contact_rigid_sliding_cube_2d.cc