diff --git a/packages/cohesive_element.cmake b/packages/cohesive_element.cmake index 5343d2b4b..4bc8b4260 100644 --- a/packages/cohesive_element.cmake +++ b/packages/cohesive_element.cmake @@ -1,128 +1,128 @@ #=============================================================================== # @file cohesive_element.cmake # # @author Mauro Corrado # @author Nicolas Richart # @author Marco Vocialta # # @date creation: Tue Oct 16 2012 # @date last modification: Tue Jan 12 2016 # # @brief package description for cohesive elements # # @section LICENSE # # Copyright (©) 2010-2012, 2014, 2015 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 . # #=============================================================================== package_declare(cohesive_element DESCRIPTION "Use cohesive_element package of Akantu" DEPENDS lapack) package_declare_sources(cohesive_element fe_engine/cohesive_element.cc fe_engine/cohesive_element.hh fe_engine/fe_engine_template_cohesive.cc fe_engine/shape_cohesive.hh fe_engine/shape_cohesive_inline_impl.cc mesh_utils/cohesive_element_inserter.cc mesh_utils/cohesive_element_inserter.hh - model/solid_mechanics/materials/material_cohesive/cohesive_internal_field.hh - model/solid_mechanics/materials/material_cohesive/cohesive_internal_field_tmpl.hh - model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_bilinear.cc - model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_bilinear.hh - model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_exponential.cc - model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_exponential.hh - model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.cc - model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.hh - model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_fatigue.cc - model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_fatigue.hh - model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_friction.cc - model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_friction.hh - model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_uncoupled.cc - model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_uncoupled.hh - model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_inline_impl.cc - model/solid_mechanics/materials/material_cohesive/material_cohesive.cc - model/solid_mechanics/materials/material_cohesive/material_cohesive.hh - model/solid_mechanics/materials/material_cohesive/material_cohesive_inline_impl.cc - model/solid_mechanics/materials/material_cohesive_includes.hh + model/solid_mechanics/solid_mechanics_model_cohesive/materials/cohesive_internal_field.hh + model/solid_mechanics/solid_mechanics_model_cohesive/materials/cohesive_internal_field_tmpl.hh + model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_bilinear.cc + model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_bilinear.hh + model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_exponential.cc + model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_exponential.hh + model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear.cc + model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear.hh + model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_fatigue.cc + model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_fatigue.hh + model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_friction.cc + model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_friction.hh + model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_uncoupled.cc + model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_uncoupled.hh + model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_inline_impl.cc + model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive.cc + model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive.hh + model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive_inline_impl.cc + model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive_includes.hh model/solid_mechanics/solid_mechanics_model_cohesive/fragment_manager.cc model/solid_mechanics/solid_mechanics_model_cohesive/fragment_manager.hh model/solid_mechanics/solid_mechanics_model_cohesive/material_selector_cohesive.cc model/solid_mechanics/solid_mechanics_model_cohesive/material_selector_cohesive.hh model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive.cc model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive.hh model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive_inline_impl.cc ) package_declare_elements(cohesive_element ELEMENT_TYPES _cohesive_2d_4 _cohesive_2d_6 _cohesive_1d_2 _cohesive_3d_6 _cohesive_3d_12 _cohesive_3d_8 _cohesive_3d_16 KIND cohesive GEOMETRICAL_TYPES _gt_cohesive_2d_4 _gt_cohesive_2d_6 _gt_cohesive_1d_2 _gt_cohesive_3d_6 _gt_cohesive_3d_12 _gt_cohesive_3d_8 _gt_cohesive_3d_16 FE_ENGINE_LISTS gradient_on_integration_points interpolate_on_integration_points compute_normals_on_integration_points inverse_map contains get_shapes_derivatives lagrange_base ) package_declare_material_infos(cohesive_element LIST AKANTU_COHESIVE_MATERIAL_LIST INCLUDE material_cohesive_includes.hh ) package_declare_documentation_files(cohesive_element manual-cohesive_elements.tex manual-cohesive_elements_insertion.tex manual-cohesive_laws.tex manual-appendix-materials-cohesive.tex figures/cohesive2d.pdf figures/cohesive_exponential.pdf figures/linear_cohesive_law.pdf figures/bilinear_cohesive_law.pdf ) package_declare_documentation(cohesive_element "This package activates the cohesive elements engine within Akantu." "It depends on:" "\\begin{itemize}" " \\item A fortran compiler." " \\item An implementation of BLAS/LAPACK." "\\end{itemize}" ) diff --git a/extra_packages/parallel-cohesive-element/package.cmake b/packages/parallel_cohesive_element.cmake similarity index 56% rename from extra_packages/parallel-cohesive-element/package.cmake rename to packages/parallel_cohesive_element.cmake index dd9d24a1e..219f53b6c 100644 --- a/extra_packages/parallel-cohesive-element/package.cmake +++ b/packages/parallel_cohesive_element.cmake @@ -1,34 +1,34 @@ #=============================================================================== # @file package.cmake # # @author Nicolas Richart # # # @brief package description for parallel cohesive elements # # @section LICENSE # # Copyright (©) 2010-2012, 2014 EPFL (Ecole Polytechnique Fédérale de Lausanne) # Laboratory (LSMS - Laboratoire de Simulation en Mécanique des Solides) # #=============================================================================== package_declare(parallel_cohesive_element DESCRIPTION "Use parallel cohesive_element package of Akantu" DEPENDS cohesive_element parallel) package_declare_sources(parallel_cohesive_element - cohesive_element_inserter_parallel.cc - cohesive_element_inserter_inline_impl.cc - solid_mechanics_model_cohesive_parallel.hh - solid_mechanics_model_cohesive_parallel.cc - solid_mechanics_model_cohesive_parallel_inline_impl.cc - facet_synchronizer.cc - facet_synchronizer.hh - facet_synchronizer_inline_impl.cc - facet_stress_synchronizer.cc - facet_stress_synchronizer.hh + mesh_utils/cohesive_element_inserter_parallel.cc + mesh_utils/cohesive_element_inserter_inline_impl.cc + model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive_parallel.hh + model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive_parallel.cc + model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive_parallel_inline_impl.cc + synchronizer/facet_synchronizer.cc + synchronizer/facet_synchronizer.hh + synchronizer/facet_synchronizer_inline_impl.cc + synchronizer/facet_stress_synchronizer.cc + synchronizer/facet_stress_synchronizer.hh ) package_declare_documentation(parallel_cohesive_element "This option activates the parallel cohesive elements' features of AKANTU.") diff --git a/extra_packages/parallel-cohesive-element/src/cohesive_element_inserter_inline_impl.cc b/src/mesh_utils/cohesive_element_inserter_inline_impl.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/src/cohesive_element_inserter_inline_impl.cc rename to src/mesh_utils/cohesive_element_inserter_inline_impl.cc diff --git a/extra_packages/parallel-cohesive-element/src/cohesive_element_inserter_parallel.cc b/src/mesh_utils/cohesive_element_inserter_parallel.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/src/cohesive_element_inserter_parallel.cc rename to src/mesh_utils/cohesive_element_inserter_parallel.cc diff --git a/src/model/solid_mechanics/materials/material_cohesive/cohesive_internal_field.hh b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/cohesive_internal_field.hh similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/cohesive_internal_field.hh rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/cohesive_internal_field.hh diff --git a/src/model/solid_mechanics/materials/material_cohesive/cohesive_internal_field_tmpl.hh b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/cohesive_internal_field_tmpl.hh similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/cohesive_internal_field_tmpl.hh rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/cohesive_internal_field_tmpl.hh diff --git a/src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_bilinear.cc b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_bilinear.cc similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_bilinear.cc rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_bilinear.cc diff --git a/src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_bilinear.hh b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_bilinear.hh similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_bilinear.hh rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_bilinear.hh diff --git a/src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_exponential.cc b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_exponential.cc similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_exponential.cc rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_exponential.cc diff --git a/src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_exponential.hh b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_exponential.hh similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_exponential.hh rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_exponential.hh diff --git a/src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.cc b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear.cc similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.cc rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear.cc diff --git a/src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.hh b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear.hh similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.hh rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear.hh diff --git a/src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_fatigue.cc b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_fatigue.cc similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_fatigue.cc rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_fatigue.cc diff --git a/src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_fatigue.hh b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_fatigue.hh similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_fatigue.hh rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_fatigue.hh diff --git a/src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_friction.cc b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_friction.cc similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_friction.cc rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_friction.cc diff --git a/src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_friction.hh b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_friction.hh similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_friction.hh rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_friction.hh diff --git a/src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_inline_impl.cc b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_inline_impl.cc similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_inline_impl.cc rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_inline_impl.cc diff --git a/src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_uncoupled.cc b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_uncoupled.cc similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_uncoupled.cc rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_uncoupled.cc diff --git a/src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_uncoupled.hh b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_uncoupled.hh similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_uncoupled.hh rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_uncoupled.hh diff --git a/src/model/solid_mechanics/materials/material_cohesive/material_cohesive.cc b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive.cc similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/material_cohesive.cc rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive.cc diff --git a/src/model/solid_mechanics/materials/material_cohesive/material_cohesive.hh b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive.hh similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/material_cohesive.hh rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive.hh diff --git a/src/model/solid_mechanics/materials/material_cohesive_includes.hh b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive_includes.hh similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive_includes.hh rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive_includes.hh diff --git a/src/model/solid_mechanics/materials/material_cohesive/material_cohesive_inline_impl.cc b/src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive_inline_impl.cc similarity index 100% rename from src/model/solid_mechanics/materials/material_cohesive/material_cohesive_inline_impl.cc rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/material_cohesive_inline_impl.cc diff --git a/extra_packages/parallel-cohesive-element/src/solid_mechanics_model_cohesive_parallel.cc b/src/model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive_parallel.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/src/solid_mechanics_model_cohesive_parallel.cc rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive_parallel.cc diff --git a/extra_packages/parallel-cohesive-element/src/solid_mechanics_model_cohesive_parallel.hh b/src/model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive_parallel.hh similarity index 100% rename from extra_packages/parallel-cohesive-element/src/solid_mechanics_model_cohesive_parallel.hh rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive_parallel.hh diff --git a/extra_packages/parallel-cohesive-element/src/solid_mechanics_model_cohesive_parallel_inline_impl.cc b/src/model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive_parallel_inline_impl.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/src/solid_mechanics_model_cohesive_parallel_inline_impl.cc rename to src/model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive_parallel_inline_impl.cc diff --git a/extra_packages/parallel-cohesive-element/src/facet_stress_synchronizer.cc b/src/synchronizer/facet_stress_synchronizer.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/src/facet_stress_synchronizer.cc rename to src/synchronizer/facet_stress_synchronizer.cc diff --git a/extra_packages/parallel-cohesive-element/src/facet_stress_synchronizer.hh b/src/synchronizer/facet_stress_synchronizer.hh similarity index 100% rename from extra_packages/parallel-cohesive-element/src/facet_stress_synchronizer.hh rename to src/synchronizer/facet_stress_synchronizer.hh diff --git a/extra_packages/parallel-cohesive-element/src/facet_synchronizer.cc b/src/synchronizer/facet_synchronizer.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/src/facet_synchronizer.cc rename to src/synchronizer/facet_synchronizer.cc diff --git a/extra_packages/parallel-cohesive-element/src/facet_synchronizer.hh b/src/synchronizer/facet_synchronizer.hh similarity index 100% rename from extra_packages/parallel-cohesive-element/src/facet_synchronizer.hh rename to src/synchronizer/facet_synchronizer.hh diff --git a/extra_packages/parallel-cohesive-element/src/facet_synchronizer_inline_impl.cc b/src/synchronizer/facet_synchronizer_inline_impl.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/src/facet_synchronizer_inline_impl.cc rename to src/synchronizer/facet_synchronizer_inline_impl.cc diff --git a/test/test_model/test_solid_mechanics_model/test_cohesive/CMakeLists.txt b/test/test_model/test_solid_mechanics_model/test_cohesive/CMakeLists.txt index 822108949..a9f4e3a72 100644 --- a/test/test_model/test_solid_mechanics_model/test_cohesive/CMakeLists.txt +++ b/test/test_model/test_solid_mechanics_model/test_cohesive/CMakeLists.txt @@ -1,42 +1,43 @@ #=============================================================================== # @file CMakeLists.txt # # @author Marco Vocialta # # @date creation: Fri Oct 22 2010 # @date last modification: Thu Jan 14 2016 # # @brief configuration for cohesive elements tests # # @section LICENSE # # Copyright (©) 2010-2012, 2014, 2015 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_akantu_test(test_cohesive_intrinsic "test_cohesive_intrinsic") add_akantu_test(test_cohesive_extrinsic "test_cohesive_extrinsic") add_akantu_test(test_cohesive_buildfragments "test_cohesive_buildfragments") add_akantu_test(test_cohesive_intrinsic_impl "test_cohesive_intrinsic_impl") add_akantu_test(test_cohesive_1d_element "test_cohesive_1d_element") add_akantu_test(test_cohesive_extrinsic_implicit "test_cohesive_extrinsic_implicit") add_akantu_test(test_cohesive_insertion "test_cohesive_insertion") add_akantu_test(test_cohesive_linear_friction "test_cohesive_linear_friction") +add_akantu_test(test_parallel_cohesive "parallel_cohesive_test") #=============================================================================== diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/CMakeLists.txt b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/CMakeLists.txt similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/CMakeLists.txt rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/CMakeLists.txt diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/CMakeLists.txt b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/CMakeLists.txt similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/CMakeLists.txt rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/CMakeLists.txt diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/material.dat b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/material.dat similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/material.dat rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/material.dat diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/test_cohesive_facet_stress_synchronizer.cc b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/test_cohesive_facet_stress_synchronizer.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/test_cohesive_facet_stress_synchronizer.cc rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/test_cohesive_facet_stress_synchronizer.cc diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/test_cohesive_facet_stress_synchronizer.sh b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/test_cohesive_facet_stress_synchronizer.sh similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/test_cohesive_facet_stress_synchronizer.sh rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/test_cohesive_facet_stress_synchronizer.sh diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/tetrahedron.geo b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/tetrahedron.geo similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/tetrahedron.geo rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_facet_stress_synchronizer/tetrahedron.geo diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_buildfragments/CMakeLists.txt b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_buildfragments/CMakeLists.txt similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_buildfragments/CMakeLists.txt rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_buildfragments/CMakeLists.txt diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_buildfragments/material.dat b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_buildfragments/material.dat similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_buildfragments/material.dat rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_buildfragments/material.dat diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_buildfragments/mesh.geo b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_buildfragments/mesh.geo similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_buildfragments/mesh.geo rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_buildfragments/mesh.geo diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_buildfragments/test_cohesive_parallel_buildfragments.cc b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_buildfragments/test_cohesive_parallel_buildfragments.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_buildfragments/test_cohesive_parallel_buildfragments.cc rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_buildfragments/test_cohesive_parallel_buildfragments.cc diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_buildfragments/test_cohesive_parallel_buildfragments.sh b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_buildfragments/test_cohesive_parallel_buildfragments.sh similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_buildfragments/test_cohesive_parallel_buildfragments.sh rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_buildfragments/test_cohesive_parallel_buildfragments.sh diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/CMakeLists.txt b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/CMakeLists.txt similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/CMakeLists.txt rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/CMakeLists.txt diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/material.dat b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/material.dat similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/material.dat rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/material.dat diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/mesh.geo b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/mesh.geo similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/mesh.geo rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/mesh.geo diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic.cc b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic.cc rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic.cc diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic.sh b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic.sh similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic.sh rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic.sh diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron.cc b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron.cc rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron.cc diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron.sh b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron.sh similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron.sh rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron.sh diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron_displacement.cc b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron_displacement.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron_displacement.cc rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron_displacement.cc diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron_displacement.sh b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron_displacement.sh similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron_displacement.sh rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/test_cohesive_parallel_extrinsic_tetrahedron_displacement.sh diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/tetrahedron.geo b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/tetrahedron.geo similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic/tetrahedron.geo rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic/tetrahedron.geo diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/CMakeLists.txt b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/CMakeLists.txt similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/CMakeLists.txt rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/CMakeLists.txt diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/material.dat b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/material.dat similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/material.dat rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/material.dat diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/square.msh b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/square.msh similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/square.msh rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/square.msh diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/test_cohesive_parallel_extrinsic_IG_TG.cc b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/test_cohesive_parallel_extrinsic_IG_TG.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/test_cohesive_parallel_extrinsic_IG_TG.cc rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/test_cohesive_parallel_extrinsic_IG_TG.cc diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/test_cohesive_parallel_extrinsic_IG_TG.sh b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/test_cohesive_parallel_extrinsic_IG_TG.sh similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/test_cohesive_parallel_extrinsic_IG_TG.sh rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_extrinsic_IG_TG/test_cohesive_parallel_extrinsic_IG_TG.sh diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/2d_basic_interface.msh b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/2d_basic_interface.msh similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/2d_basic_interface.msh rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/2d_basic_interface.msh diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/3d_spherical_inclusion.geo b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/3d_spherical_inclusion.geo similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/3d_spherical_inclusion.geo rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/3d_spherical_inclusion.geo diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/CMakeLists.txt b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/CMakeLists.txt similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/CMakeLists.txt rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/CMakeLists.txt diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/input_file.dat b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/input_file.dat similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/input_file.dat rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/input_file.dat diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/input_file_iii.dat b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/input_file_iii.dat similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/input_file_iii.dat rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/input_file_iii.dat diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_0_out_of_2.out b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_0_out_of_2.out similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_0_out_of_2.out rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_0_out_of_2.out diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_0_out_of_4.out b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_0_out_of_4.out similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_0_out_of_4.out rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_0_out_of_4.out diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_1_out_of_2.out b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_1_out_of_2.out similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_1_out_of_2.out rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_1_out_of_2.out diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_1_out_of_4.out b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_1_out_of_4.out similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_1_out_of_4.out rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_1_out_of_4.out diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_2_out_of_4.out b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_2_out_of_4.out similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_2_out_of_4.out rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_2_out_of_4.out diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_3_out_of_4.out b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_3_out_of_4.out similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_3_out_of_4.out rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/output_dir_verified/output_from_proc_3_out_of_4.out diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/test_cohesive_parallel_insertion_along_physical_surfaces.cc b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/test_cohesive_parallel_insertion_along_physical_surfaces.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/test_cohesive_parallel_insertion_along_physical_surfaces.cc rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/test_cohesive_parallel_insertion_along_physical_surfaces.cc diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/test_cohesive_parallel_insertion_along_physical_surfaces.sh b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/test_cohesive_parallel_insertion_along_physical_surfaces.sh similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/test_cohesive_parallel_insertion_along_physical_surfaces.sh rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/test_cohesive_parallel_insertion_along_physical_surfaces.sh diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/test_cohesive_parallel_intrinsic_implicit_insertion.cc b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/test_cohesive_parallel_intrinsic_implicit_insertion.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/test_cohesive_parallel_intrinsic_implicit_insertion.cc rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/test_cohesive_parallel_intrinsic_implicit_insertion.cc diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/verify_insertion.sh b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/verify_insertion.sh similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_insertion/verify_insertion.sh rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_insertion/verify_insertion.sh diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/CMakeLists.txt b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/CMakeLists.txt similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/CMakeLists.txt rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/CMakeLists.txt diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/material.dat b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/material.dat similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/material.dat rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/material.dat diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/material_tetrahedron.dat b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/material_tetrahedron.dat similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/material_tetrahedron.dat rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/material_tetrahedron.dat diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/mesh.geo b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/mesh.geo similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/mesh.geo rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/mesh.geo diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic.cc b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic.cc rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic.cc diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic.sh b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic.sh similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic.sh rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic.sh diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic_tetrahedron.cc b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic_tetrahedron.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic_tetrahedron.cc rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic_tetrahedron.cc diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic_tetrahedron.sh b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic_tetrahedron.sh similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic_tetrahedron.sh rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/test_cohesive_parallel_intrinsic_tetrahedron.sh diff --git a/extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/tetrahedron.geo b/test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/tetrahedron.geo similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_parallel_cohesive/test_cohesive_parallel_intrinsic/tetrahedron.geo rename to test/test_model/test_solid_mechanics_model/test_cohesive/test_parallel_cohesive/test_cohesive_parallel_intrinsic/tetrahedron.geo diff --git a/test/test_synchronizer/CMakeLists.txt b/test/test_synchronizer/CMakeLists.txt index 14921673d..9ea73c7b5 100644 --- a/test/test_synchronizer/CMakeLists.txt +++ b/test/test_synchronizer/CMakeLists.txt @@ -1,84 +1,94 @@ #=============================================================================== # @file CMakeLists.txt # # @author Nicolas Richart # # @date creation: Fri Sep 03 2010 # @date last modification: Wed Jan 20 2016 # # @brief configuration for synchronizer tests # # @section LICENSE # # Copyright (©) 2010-2012, 2014, 2015 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_mesh(test_synchronizer_communication_mesh cube.geo 3 2) register_test(test_synchronizer_communication SOURCES test_synchronizer_communication.cc DEPENDS test_synchronizer_communication_mesh PACKAGE parallel PARALLEL ) register_test(test_node_synchronizer SOURCES test_node_synchronizer.cc DEPENDS test_synchronizer_communication_mesh PACKAGE parallel PARALLEL ) register_test(test_dof_synchronizer SOURCES test_dof_synchronizer.cc test_data_accessor.hh FILES_TO_COPY bar.msh PACKAGE parallel PARALLEL ) # if(DEFINED AKANTU_DAMAGE_NON_LOCAL) # add_executable(test_grid_synchronizer_check_neighbors test_grid_synchronizer_check_neighbors.cc test_grid_tools.hh) # target_link_libraries(test_grid_synchronizer_check_neighbors akantu) # if(AKANTU_EXTRA_CXX_FLAGS) # set_target_properties(test_grid_synchronizer_check_neighbors PROPERTIES COMPILE_FLAGS ${AKANTU_EXTRA_CXX_FLAGS}) # endif() # endif() # register_test(test_grid_synchronizer # SOURCES test_grid_synchronizer.cc test_data_accessor.hh # DEPENDS test_synchronizer_communication_mesh test_grid_synchronizer_check_neighbors # EXTRA_FILES test_grid_synchronizer_check_neighbors.cc test_grid_tools.hh # PACKAGE damage_non_local # ) # register_test(test_dof_synchronizer_communication # SOURCES test_dof_synchronizer_communication.cc test_dof_data_accessor.hh # DEPENDS test_synchronizer_communication_mesh # PACKAGE parallel # ) register_test(test_data_distribution SOURCES test_data_distribution.cc FILES_TO_COPY data_split.msh PACKAGE parallel PARALLEL ) + +add_mesh(test_facet_synchronizer_mesh + facet.geo 3 2) + +register_test(test_facet_synchronizer + SOURCES test_facet_synchronizer.cc test_data_accessor.hh + DEPENDS test_facet_synchronizer_mesh + PACKAGE parallel_cohesive_element + PARALLEL_LEVEL 3 + ) diff --git a/extra_packages/parallel-cohesive-element/test/facet.geo b/test/test_synchronizer/facet.geo similarity index 100% rename from extra_packages/parallel-cohesive-element/test/facet.geo rename to test/test_synchronizer/facet.geo diff --git a/extra_packages/parallel-cohesive-element/test/test_facet_synchronizer.cc b/test/test_synchronizer/test_facet_synchronizer.cc similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_facet_synchronizer.cc rename to test/test_synchronizer/test_facet_synchronizer.cc diff --git a/extra_packages/parallel-cohesive-element/test/test_facet_synchronizer.sh b/test/test_synchronizer/test_facet_synchronizer.sh similarity index 100% rename from extra_packages/parallel-cohesive-element/test/test_facet_synchronizer.sh rename to test/test_synchronizer/test_facet_synchronizer.sh