diff --git a/MoReFEM.xcodeproj/project.pbxproj b/MoReFEM.xcodeproj/project.pbxproj index c6c7e7257a977c7dcc0f245c205b147800ee9b2c..fa446bd2c5feae6d78e0fb6436493523c1fc1a28 100644 --- a/MoReFEM.xcodeproj/project.pbxproj +++ b/MoReFEM.xcodeproj/project.pbxproj @@ -4070,6 +4070,8 @@ BE7A38881E8D3166009DFFC3 /* GreenLagrangeTensor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GreenLagrangeTensor.cpp; sourceTree = "<group>"; }; BE7A38891E8D3167009DFFC3 /* GreenLagrangeTensor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GreenLagrangeTensor.hpp; sourceTree = "<group>"; }; BE7A388A1E8D3167009DFFC3 /* GreenLagrangeTensor.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GreenLagrangeTensor.hxx; sourceTree = "<group>"; }; + BE7A8717215BEDB6000C3428 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; + BE7A8718215BEDB6000C3428 /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; }; BE7C1D0B1F4F2C8C000403E7 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; }; BE7C1D0D1F4F2E8B000403E7 /* demo_input_parameter_movemesh.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_input_parameter_movemesh.lua; sourceTree = "<group>"; }; BE7C942C1F5FE614003D2C52 /* InputParameterList.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InputParameterList.hpp; sourceTree = "<group>"; }; @@ -8419,6 +8421,15 @@ path = EnsightCaseReader; sourceTree = "<group>"; }; + BE7A8716215BEDB6000C3428 /* Valgrind */ = { + isa = PBXGroup; + children = ( + BE7A8717215BEDB6000C3428 /* CMakeLists.txt */, + BE7A8718215BEDB6000C3428 /* main.cpp */, + ); + path = Valgrind; + sourceTree = "<group>"; + }; BE7C942A1F5FE614003D2C52 /* TestFunctions */ = { isa = PBXGroup; children = ( @@ -10141,6 +10152,7 @@ BE2243E720A1ACD3006AD11E /* CMakeLists.txt */, BEC5CFB51F4DBF9B00A2863B /* Gather */, BEE734CF1F75432D001D01A9 /* SendReceive */, + BE7A8716215BEDB6000C3428 /* Valgrind */, ); path = Mpi; sourceTree = "<group>"; @@ -14273,7 +14285,7 @@ LD_NO_PIE = NO; LIBRARY_SEARCH_PATHS = "$(inherited)"; LLVM_LTO = NO; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.14; ONLY_ACTIVE_ARCH = YES; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -14361,7 +14373,7 @@ LD_NO_PIE = NO; LIBRARY_SEARCH_PATHS = "$(inherited)"; LLVM_LTO = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.14; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-ftemplate-backtrace-limit=0", diff --git a/Sources/Test/ThirdParty/Mpi/CMakeLists.txt b/Sources/Test/ThirdParty/Mpi/CMakeLists.txt index 0fb0f17d20b5728a343daedb9f7e8714b758ebae..b89f7f3e688905af841722a58cc2f8107766c8ff 100644 --- a/Sources/Test/ThirdParty/Mpi/CMakeLists.txt +++ b/Sources/Test/ThirdParty/Mpi/CMakeLists.txt @@ -1,2 +1,3 @@ include(${CMAKE_CURRENT_LIST_DIR}/Gather/CMakeLists.txt) -include(${CMAKE_CURRENT_LIST_DIR}/SendReceive/CMakeLists.txt) \ No newline at end of file +include(${CMAKE_CURRENT_LIST_DIR}/SendReceive/CMakeLists.txt) +include(${CMAKE_CURRENT_LIST_DIR}/Valgrind/CMakeLists.txt) \ No newline at end of file diff --git a/XCodeConfig/morefem_common.xcconfig b/XCodeConfig/morefem_common.xcconfig index 2d0b4b5086dda4194ff012cd99bd90e691cc3357..d0133e82cb1c6bafcbbf263c1761e5abc044b6a3 100644 --- a/XCodeConfig/morefem_common.xcconfig +++ b/XCodeConfig/morefem_common.xcconfig @@ -14,9 +14,9 @@ MOREFEM_SRC = ${MOREFEM_ROOT}/Sources THIRD_PARTY_LIBRARY_DIR = /Volumes/Data/opt -HEADER_SEARCH_PATHS_COMMON = ${THIRD_PARTY_LIBRARY_DIR}/Openmpi/include ${THIRD_PARTY_LIBRARY_DIR}/Petsc/include ${THIRD_PARTY_LIBRARY_DIR}/Lua/include ${THIRD_PARTY_LIBRARY_DIR}/Parmetis/include ${MOREFEM_SRC}/ThirdParty/Source/Seldon ${THIRD_PARTY_LIBRARY_DIR}/Boost/include ${MOREFEM_SRC}/ThirdParty/Source/Tclap/include ${THIRD_PARTY_LIBRARY_DIR}/QuantStack/include +HEADER_SEARCH_PATHS_COMMON = ${THIRD_PARTY_LIBRARY_DIR}/Openmpi/include ${THIRD_PARTY_LIBRARY_DIR}/Petsc/include ${THIRD_PARTY_LIBRARY_DIR}/Lua/include ${THIRD_PARTY_LIBRARY_DIR}/Parmetis/include ${MOREFEM_SRC}/ThirdParty/Source/Seldon ${MOREFEM_SRC}/ThirdParty/Source/Tclap/include ${THIRD_PARTY_LIBRARY_DIR}/QuantStack/include -LIBRARY_SEARCH_PATHS_COMMON = ${THIRD_PARTY_LIBRARY_DIR} ${THIRD_PARTY_LIBRARY_DIR}/Openmpi/lib ${THIRD_PARTY_LIBRARY_DIR}/Lua/lib ${THIRD_PARTY_LIBRARY_DIR}/Parmetis/lib ${THIRD_PARTY_LIBRARY_DIR}/Boost/lib +LIBRARY_SEARCH_PATHS_COMMON = ${THIRD_PARTY_LIBRARY_DIR} ${THIRD_PARTY_LIBRARY_DIR}/Openmpi/lib ${THIRD_PARTY_LIBRARY_DIR}/Lua/lib ${THIRD_PARTY_LIBRARY_DIR}/Parmetis/lib WARNING_CFLAGS = -Weverything -Wno-c++98-compat -Wno-padded -Wno-c++98-compat-pedantic -Wno-exit-time-destructors -Wno-global-constructors -Wno-documentation-unknown-command -Wno-documentation -Wno-undefined-func-template -Wno-c++1z-extensions diff --git a/XCodeConfig/morefem_debug.xcconfig b/XCodeConfig/morefem_debug.xcconfig index eb114752573b2d27ad5cbd2089c99ab98028d999..470bdaadab5dd69ac3ad96d00c16fa0ddd449dff 100644 --- a/XCodeConfig/morefem_debug.xcconfig +++ b/XCodeConfig/morefem_debug.xcconfig @@ -8,9 +8,9 @@ #include "morefem_common.xcconfig" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/debug/include +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/debug/include ${THIRD_PARTY_LIBRARY_DIR}/Boost/debug/include -LIBRARY_SEARCH_PATHS = $(LIBRARY_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/debug/lib +LIBRARY_SEARCH_PATHS = $(LIBRARY_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/debug/lib ${THIRD_PARTY_LIBRARY_DIR}/Boost/debug/lib GCC_OPTIMIZATION_LEVEL = 0 diff --git a/XCodeConfig/morefem_release.xcconfig b/XCodeConfig/morefem_release.xcconfig index 4e576323412318ea499c3ae94b87cd348cfc14cf..4836db1eb2c70b0d08cb73b1a5fedc0caa574344 100644 --- a/XCodeConfig/morefem_release.xcconfig +++ b/XCodeConfig/morefem_release.xcconfig @@ -8,9 +8,9 @@ #include "morefem_common.xcconfig" -HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/release/include +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/release/include ${THIRD_PARTY_LIBRARY_DIR}/Boost/release/include -LIBRARY_SEARCH_PATHS = $(LIBRARY_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/release/lib +LIBRARY_SEARCH_PATHS = $(LIBRARY_SEARCH_PATHS_COMMON) ${THIRD_PARTY_LIBRARY_DIR}/Petsc/release/lib ${THIRD_PARTY_LIBRARY_DIR}/Boost/release/lib GCC_OPTIMIZATION_LEVEL = 3 diff --git a/cmake/MoReFEMSettings.cmake b/cmake/MoReFEMSettings.cmake index 5988763bfd5903a55c79ad6d95fa1cfd1ab9d686..f310d95a0956ec3aceb2c1bc541d3ec3088082de 100644 --- a/cmake/MoReFEMSettings.cmake +++ b/cmake/MoReFEMSettings.cmake @@ -35,11 +35,15 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug") set(CMAKE_INTERPROCEDURAL_OPTIMIZATION FALSE)# Add LTO support in non debug mode. set(PETSC_SPECIFIC_INCL_DIR ${PETSC_DEBUG_INCL_DIR} ) set(PETSC_SPECIFIC_LIB_DIR ${PETSC_DEBUG_LIB_DIR} ) - add_definitions(-DSELDON_CHECK_BOUNDS -DSELDON_CHECK_DIMENSIONS -DDEBUG=1) + set(BOOST_INCL_DIR ${BOOST_DEBUG_INCL_DIR} ) + set(BOOST_LIB_DIR ${BOOST_DEBUG_LIB_DIR} ) + add_definitions(-DSELDON_CHECK_BOUNDS -DSELDON_CHECK_DIMENSIONS -DDEBUG=1) else() set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) set(PETSC_SPECIFIC_INCL_DIR ${PETSC_RELEASE_INCL_DIR} ) set(PETSC_SPECIFIC_LIB_DIR ${PETSC_RELEASE_LIB_DIR} ) + set(BOOST_INCL_DIR ${BOOST_RELEASE_INCL_DIR} ) + set(BOOST_LIB_DIR ${BOOST_RELEASE_LIB_DIR} ) endif() add_definitions(-DSELDON_WITH_LAPACK -DSELDON_WITH_BLAS -DSELDON_WITH_COMPILED_LIBRARY) diff --git a/cmake/PreCache/linux_gcc.cmake b/cmake/PreCache/linux_gcc.cmake index 4071873e920af8e27d9b339737ce8ac5105ea6ce..35c0938b1d9743aaa21c75a713ac1aec0115d50b 100644 --- a/cmake/PreCache/linux_gcc.cmake +++ b/cmake/PreCache/linux_gcc.cmake @@ -42,8 +42,12 @@ set(PARMETIS_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Parmetis/lib CACHE PA set(LUA_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/include CACHE PATH "Include directory of Lua library.") set(LUA_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/lib CACHE PATH "Lib directory of Lua library.") -set(BOOST_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/include CACHE PATH "Include directory of Boost library.") -set(BOOST_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/lib CACHE PATH "Lib directory of Boost library.") +set(BOOST_DEBUG_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/debug/include CACHE PATH "Include directory of Boost library.") +set(BOOST_DEBUG_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/debug/lib CACHE PATH "Lib directory of Boost library.") + +set(BOOST_RELEASE_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/release/include CACHE PATH "Include directory of Boost library.") +set(BOOST_RELEASE_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/release/lib CACHE PATH "Lib directory of Boost library.") + set(PHILLIPS_DIR False CACHE BOOL "If you want to couple Morefem with Phillips library. False in most of the cases! Beware: it is not put in MOREFEM_COMMON_DEP; if you need it you must add it in your add_executable command.") diff --git a/cmake/PreCache/macos_apple_clang.cmake b/cmake/PreCache/macos_apple_clang.cmake index 70fa9e324323fef14609802bc4a1c681d453dcb8..355909b8e1e5eefe9641770cda1e764792fe1f7a 100644 --- a/cmake/PreCache/macos_apple_clang.cmake +++ b/cmake/PreCache/macos_apple_clang.cmake @@ -42,8 +42,11 @@ set(PARMETIS_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Parmetis/lib CACHE PA set(LUA_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/include CACHE PATH "Include directory of Lua library.") set(LUA_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/lib CACHE PATH "Lib directory of Lua library.") -set(BOOST_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/include CACHE PATH "Include directory of Boost library.") -set(BOOST_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/lib CACHE PATH "Lib directory of Boost library.") +set(BOOST_DEBUG_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/debug/include CACHE PATH "Include directory of Boost library.") +set(BOOST_DEBUG_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/debug/lib CACHE PATH "Lib directory of Boost library.") + +set(BOOST_RELEASE_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/release/include CACHE PATH "Include directory of Boost library.") +set(BOOST_RELEASE_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/release/lib CACHE PATH "Lib directory of Boost library.") set(PHILLIPS_DIR False CACHE BOOL "If you want to couple Morefem with Phillips library. False in most of the cases! Beware: it is not put in MOREFEM_COMMON_DEP; if you need it you must add it in your add_executable command.")