From ef773801c6d30908f6b797e5626f1800cba0a02c Mon Sep 17 00:00:00 2001 From: Lenz <stephan-hoexter@gmx.de> Date: Thu, 5 Dec 2019 15:12:02 +0100 Subject: [PATCH] fixes CMake Bug with double accuracy --- CMakeLists.txt | 4 ++++ MachineFiles/DESKTOP-U072UFM | 14 ++++++++++++++ targets/apps/LBM/TGV_3D/TGV_3D.cpp | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 MachineFiles/DESKTOP-U072UFM diff --git a/CMakeLists.txt b/CMakeLists.txt index 53b7eab63..3d35d7436 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,6 +85,10 @@ option(VF.BUILD_NUMERIC_TESTS "Build numeric tests" OFF) option(VF.BUILD_DOUBLE_ACCURACY "Use double accuracy" OFF ) +IF( VF.BUILD_DOUBLE_ACCURACY ) + SET( VF_DOUBLE_ACCURACY 1 ) +ENDIF() + ############################################################# enable_language(CUDA) diff --git a/MachineFiles/DESKTOP-U072UFM b/MachineFiles/DESKTOP-U072UFM new file mode 100644 index 000000000..7fe89b566 --- /dev/null +++ b/MachineFiles/DESKTOP-U072UFM @@ -0,0 +1,14 @@ +#Don't change: +SET(METIS_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/metis/metis-5.1.0 CACHE PATH "METIS ROOT") +SET(GMOCK_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/googletest CACHE PATH "GMOCK ROOT") +SET(JSONCPP_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/jsoncpp CACHE PATH "JSONCPP ROOT") +SET(FFTW_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/fftw/fftw-3.3.7 CACHE PATH "JSONCPP ROOT") + + +#SET(BOOST_ROOT "C:/lib/boost_1_65_1" CACHE PATH "BOOST_ROOT") +#SET(BOOST_LIBRARYDIR "C:/lib/boost_1_65_1/stageMSVC64/lib" CACHE PATH "BOOST_LIBRARYDIR") + +SET(BOOST_ROOT "C:/lib/boost_1_71_0" CACHE PATH "BOOST_ROOT") +SET(BOOST_LIBRARYDIR "C:/lib/boost_1_71_0/stageMSVC64/lib" CACHE PATH "BOOST_LIBRARYDIR") + +SET(VTK_DIR "C:/lib/VTK-8.2.0./build" CACHE PATH "VTK directory override" FORCE) diff --git a/targets/apps/LBM/TGV_3D/TGV_3D.cpp b/targets/apps/LBM/TGV_3D/TGV_3D.cpp index 4b138f72d..558d11349 100644 --- a/targets/apps/LBM/TGV_3D/TGV_3D.cpp +++ b/targets/apps/LBM/TGV_3D/TGV_3D.cpp @@ -245,7 +245,7 @@ void multipleLevel(const std::string& configPath) if( useWale ) para->setUseWale( true ); - //para->setUseInitNeq( true ); + para->setUseInitNeq( true ); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -- GitLab