diff --git a/CMakeLists.txt b/CMakeLists.txt index 6412b9ed53354b5cebd3093dceda9e49a9d2e360..bd322e2060e001a6fc262325797648041b97fd42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,7 +115,8 @@ set(CMAKE_INSTALL_RPATH "${MOREFEM_INSTALL_DIR}/lib") # which point to directories outside the build tree to the install RPATH set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True) - + enable_testing() + ###################################################### # Walk through Sources directory to find all sources to build. ###################################################### diff --git a/Sources/Test/Operators/TestFunctions/VariationalFormulation.cpp b/Sources/Test/Operators/TestFunctions/VariationalFormulation.cpp index 9b17f35ea1a9d603d61ffceb3ed671874628cabd..eb1e660231efc905368012caf3a1d21220bb3fc1 100644 --- a/Sources/Test/Operators/TestFunctions/VariationalFormulation.cpp +++ b/Sources/Test/Operators/TestFunctions/VariationalFormulation.cpp @@ -46,8 +46,8 @@ namespace MoReFEM const auto& P1_potential_1_P2_potential_2_numbering_subset = god_of_dof.GetNumberingSubset(EnumUnderlyingType(NumberingSubsetIndex::P1_potential_1_P2_potential_2)); - auto& potential_1_potential_2_system_matrix = - GetNonCstSystemMatrix(potential_1_potential_2_numbering_subset, potential_1_potential_2_numbering_subset); +// auto& potential_1_potential_2_system_matrix = +// GetNonCstSystemMatrix(potential_1_potential_2_numbering_subset, potential_1_potential_2_numbering_subset); auto& potential_1_system_matrix = GetNonCstSystemMatrix(potential_1_numbering_subset, potential_1_numbering_subset); auto& potential_1_test_system_matrix = @@ -55,10 +55,10 @@ namespace MoReFEM potential_1_numbering_subset); // auto& potential_2_system_matrix = // GetNonCstSystemMatrix(potential_2_numbering_subset, potential_2_numbering_subset); - auto& potential_3_system_matrix = - GetNonCstSystemMatrix(potential_3_numbering_subset, potential_3_numbering_subset); - auto& potential_1_potential_3_system_matrix = - GetNonCstSystemMatrix(potential_1_numbering_subset, potential_3_numbering_subset); +// auto& potential_3_system_matrix = +// GetNonCstSystemMatrix(potential_3_numbering_subset, potential_3_numbering_subset); +// auto& potential_1_potential_3_system_matrix = +// GetNonCstSystemMatrix(potential_1_numbering_subset, potential_3_numbering_subset); auto& displacement_potential_1_system_matrix = GetNonCstSystemMatrix(displacement_potential_1_numbering_subset, displacement_potential_1_numbering_subset); auto& potential_1_potential_2_potential_4_system_matrix = @@ -135,8 +135,6 @@ namespace MoReFEM "source_operator_potential_1", __FILE__, __LINE__)); - - { GlobalVectorWithCoefficient vector(monolithic_system_rhs, 1.); source_operator_potential_1_potential_1_->Assemble(std::make_tuple(std::ref(vector)), 0.); diff --git a/Sources/Test/Operators/VariationalInstances/CMakeLists.txt b/Sources/Test/Operators/VariationalInstances/CMakeLists.txt index 45b9f3c4c365ec0e3937ccdc0259fad062261542..a6855d64f8c7f7546d31f56ccec63fe8301ec30b 100644 --- a/Sources/Test/Operators/VariationalInstances/CMakeLists.txt +++ b/Sources/Test/Operators/VariationalInstances/CMakeLists.txt @@ -1,3 +1,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/Pk2/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/NonlinearMembrane/CMakeLists.txt) -include(${CMAKE_CURRENT_LIST_DIR}/Mass/CMakeLists.txt) \ No newline at end of file +include(${CMAKE_CURRENT_LIST_DIR}/Mass/CMakeLists.txt) +include(${CMAKE_CURRENT_LIST_DIR}/GradGrad/CMakeLists.txt) \ No newline at end of file diff --git a/Sources/Test/Operators/VariationalInstances/GradGrad/CMakeLists.txt b/Sources/Test/Operators/VariationalInstances/GradGrad/CMakeLists.txt index c59aff89fe9689a6aa8f418becb06d10a7860b77..81035d6a5a1f089a42bf5495da07419b0413d2b4 100644 --- a/Sources/Test/Operators/VariationalInstances/GradGrad/CMakeLists.txt +++ b/Sources/Test/Operators/VariationalInstances/GradGrad/CMakeLists.txt @@ -31,6 +31,10 @@ target_link_libraries(MoReFEMTestOperatorGradGrad2D MoReFEMTestOperatorGradGrad_ add_executable(MoReFEMTestOperatorGradGrad1D ${CMAKE_CURRENT_LIST_DIR}/main_1D.cpp) target_link_libraries(MoReFEMTestOperatorGradGrad1D MoReFEMTestOperatorGradGrad_lib) +add_test(TestOperatorGradGrad3D MoReFEMTestOperatorGradGrad3D) +add_test(TestOperatorGradGrad2D MoReFEMTestOperatorGradGrad2D) +add_test(TestOperatorGradGrad1D MoReFEMTestOperatorGradGrad1D) + morefem_install(MoReFEMTestOperatorGradGrad1D MoReFEMTestOperatorGradGrad2D MoReFEMTestOperatorGradGrad3D MoReFEMTestOperatorGradGrad_lib) diff --git a/Sources/Test/Operators/VariationalInstances/Mass/CMakeLists.txt b/Sources/Test/Operators/VariationalInstances/Mass/CMakeLists.txt index d5b4da52733003f71614d3d6a802f787d017e601..eadc6cd75a58079f44223b1cb4b0a9040a13e7fd 100644 --- a/Sources/Test/Operators/VariationalInstances/Mass/CMakeLists.txt +++ b/Sources/Test/Operators/VariationalInstances/Mass/CMakeLists.txt @@ -31,6 +31,10 @@ target_link_libraries(MoReFEMTestOperatorMass2D MoReFEMTestOperatorMass_lib) add_executable(MoReFEMTestOperatorMass1D ${CMAKE_CURRENT_LIST_DIR}/main_1D.cpp) target_link_libraries(MoReFEMTestOperatorMass1D MoReFEMTestOperatorMass_lib) +add_test(TestOperatorMass3D MoReFEMTestOperatorMass3D) +add_test(TestOperatorMass2D MoReFEMTestOperatorMass2D) +add_test(TestOperatorMass1D MoReFEMTestOperatorMass1D) + morefem_install(MoReFEMTestOperatorMass1D MoReFEMTestOperatorMass2D MoReFEMTestOperatorMass3D MoReFEMTestOperatorMass_lib) diff --git a/Sources/Test/Operators/VariationalInstances/NonlinearMembrane/CMakeLists.txt b/Sources/Test/Operators/VariationalInstances/NonlinearMembrane/CMakeLists.txt index 2fc81ea39ffa8e7bab4a2f847b68dfb19b13ccd9..f3a9cad62bacb2d14d4065fb379fbabd6aff421f 100644 --- a/Sources/Test/Operators/VariationalInstances/NonlinearMembrane/CMakeLists.txt +++ b/Sources/Test/Operators/VariationalInstances/NonlinearMembrane/CMakeLists.txt @@ -1,6 +1,6 @@ -add_library(TestNonLinearMembrane_lib ${LIBRARY_TYPE} "") +add_library(MoReFEMTestNonLinearMembrane_lib ${LIBRARY_TYPE} "") -target_sources(TestNonLinearMembrane_lib +target_sources(MoReFEMTestNonLinearMembrane_lib PRIVATE "${CMAKE_CURRENT_LIST_DIR}/Model.cpp" "${CMAKE_CURRENT_LIST_DIR}/TestP1P1.cpp" @@ -14,15 +14,17 @@ target_sources(TestNonLinearMembrane_lib "${CMAKE_CURRENT_LIST_DIR}/ExpectedResults.hpp" ) -target_link_libraries(TestNonLinearMembrane_lib +target_link_libraries(MoReFEMTestNonLinearMembrane_lib ${MOREFEM_MODEL} ${ALL_LOAD_FLAG} MoReFEM_test_tools) -add_executable(TestNonLinearMembrane ${CMAKE_CURRENT_LIST_DIR}/main.cpp) -target_link_libraries(TestNonLinearMembrane - TestNonLinearMembrane_lib) +add_executable(MoReFEMTestNonLinearMembrane ${CMAKE_CURRENT_LIST_DIR}/main.cpp) +target_link_libraries(MoReFEMTestNonLinearMembrane + MoReFEMTestNonLinearMembrane_lib) -morefem_install(TestNonLinearMembrane TestNonLinearMembrane_lib) +add_test(TestNonLinearMembrane MoReFEMTestNonLinearMembrane) + +morefem_install(MoReFEMTestNonLinearMembrane MoReFEMTestNonLinearMembrane_lib) diff --git a/Sources/Test/Operators/VariationalInstances/Pk2/CMakeLists.txt b/Sources/Test/Operators/VariationalInstances/Pk2/CMakeLists.txt index 4c00dfd5d52e03a8b34b4b6f7deb7e968564828d..9766600906093faa310ddd92f752f8acb34654ce 100644 --- a/Sources/Test/Operators/VariationalInstances/Pk2/CMakeLists.txt +++ b/Sources/Test/Operators/VariationalInstances/Pk2/CMakeLists.txt @@ -1,4 +1,4 @@ -add_executable(MoReFEMTestOperatorPk2 +add_executable(MoReFEMTestHyperelasticOperator ${CMAKE_CURRENT_LIST_DIR}/main_3D.cpp ${CMAKE_CURRENT_LIST_DIR}/InputParameterList.hpp @@ -14,5 +14,7 @@ add_executable(MoReFEMTestOperatorPk2 ${CMAKE_CURRENT_LIST_DIR}/ExpectedResults.hpp ) -target_link_libraries(MoReFEMTestOperatorPk2 +target_link_libraries(MoReFEMTestHyperelasticOperator MoReFEM_test_tools) + +add_test(TestHyperelasticOperator MoReFEMTestHyperelasticOperator) diff --git a/Sources/Test/Utilities/InputParameterList/CMakeLists.txt b/Sources/Test/Utilities/InputParameterList/CMakeLists.txt index 922583b7c21f2e7094ad568c497a71cec48ac945..dc97d1109e645e424e6debe21bd2b8deb838c84f 100644 --- a/Sources/Test/Utilities/InputParameterList/CMakeLists.txt +++ b/Sources/Test/Utilities/InputParameterList/CMakeLists.txt @@ -7,5 +7,8 @@ target_link_libraries(MoReFEMTestInputParameterList ${ALL_LOAD_BEGIN_FLAG} ${MOREFEM_MODEL} ${ALL_LOAD_END_FLAG}) + + +#add_test(TestInputParameterList MoReFEMTestInputParameterList) morefem_install(MoReFEMTestInputParameterList) \ No newline at end of file diff --git a/Sources/Test/Utilities/LuaOptionFile/CMakeLists.txt b/Sources/Test/Utilities/LuaOptionFile/CMakeLists.txt index dfc37fe53f4c02ce1dbaf3094fbdb204f679a1a0..de332c111975992b7cda4e423f7cd178143a4983 100644 --- a/Sources/Test/Utilities/LuaOptionFile/CMakeLists.txt +++ b/Sources/Test/Utilities/LuaOptionFile/CMakeLists.txt @@ -5,4 +5,6 @@ add_executable(MoReFEMTestLuaOptionFile target_link_libraries(MoReFEMTestLuaOptionFile ${MOREFEM_UTILITIES}) +add_test(TestLuaOptionFile MoReFEMTestLuaOptionFile) + morefem_install(MoReFEMTestLuaOptionFile) diff --git a/Sources/Test/Utilities/TupleHasType/CMakeLists.txt b/Sources/Test/Utilities/TupleHasType/CMakeLists.txt index 8c240d406ea080eacc5db08b851ace6a9e3a914a..7e980e1ff4b8641482bd925c04857221b2a1dad7 100644 --- a/Sources/Test/Utilities/TupleHasType/CMakeLists.txt +++ b/Sources/Test/Utilities/TupleHasType/CMakeLists.txt @@ -3,5 +3,7 @@ add_executable(MoReFEMTestTuple ) # No target link: tested features are header-only. + +add_test(TestUtilitiesTuple MoReFEMTestTuple) morefem_install(MoReFEMTestTuple) diff --git a/Sources/Test/Utilities/TypeName/CMakeLists.txt b/Sources/Test/Utilities/TypeName/CMakeLists.txt index 298ddc6cc79a5aa82a518bfa0e2fe7a6d565666e..5e91a6ff38fff0819b48962b4ba75d42841dead2 100644 --- a/Sources/Test/Utilities/TypeName/CMakeLists.txt +++ b/Sources/Test/Utilities/TypeName/CMakeLists.txt @@ -5,4 +5,6 @@ add_executable(MoReFEMTestGetTypeName target_link_libraries(MoReFEMTestGetTypeName ${MOREFEM_UTILITIES}) +add_test(TestGetTypeName MoReFEMTestGetTypeName) + morefem_install(MoReFEMTestGetTypeName) \ No newline at end of file