diff --git a/CMake/CMakeCABMacros.cmake b/CMake/CMakeCABMacros.cmake
index 32e8c1e0fba34debf5dddbce3e19788aa9c24d44..23fc4bce393082a4dfaabbcaf1b280515d683e5e 100644
--- a/CMake/CMakeCABMacros.cmake
+++ b/CMake/CMakeCABMacros.cmake
@@ -1,15 +1,8 @@
-###############################################################
-# Aktivieren von IF(ARG)...ELSE()...ENDIF() in CMake
-###############################################################
-SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS 1)
###############################################################################################################
## Flags ruecksetzen
###############################################################################################################
SET(CAB_ADDTIONAL_COMPILER_FLAGS)
-#because of the fact that CMake does not support COMPILER_FLAGS_<CONFIG> right know we cannot use these options
-#SET(CAB_ADDTIONAL_COMPILER_FLAGS_DEBUG)
-#SET(CAB_ADDTIONAL_COMPILER_FLAGS_RELEASE)
SET(CAB_ADDITIONAL_LINK_FLAGS)
SET(CAB_ADDITIONAL_LINK_FLAGS_DEBUG)
@@ -36,27 +29,8 @@ IF(NOT CAB_MACHINE)
ENDIF()
-###############################################################
-# WITH_SUBFOLDERS_FOR_SG erstellen, wenn noch nicht vorhanden
-# ist diese auf true wird bei SOURCE_GROUP in VS unterordner erzeugt
-# dies funzt erst ab CMake-2.5 vernuenftig
-###############################################################
-IF(NOT WITH_SUBFOLDERS_FOR_SG)
- SET(WITH_SUBFOLDERS_FOR_SG FALSE)
-ENDIF()
-
-
-############################################################################
-############################################################################
-## M A C R O S ##
-## M A C R O S ##
-## M A C R O S ##
-############################################################################
-############################################################################
-# externe (ACHTUNG: die darin enthaltenen benoetigen teils noch macros die
-# hier im Anschluss folgen
-INCLUDE("${VF_CMAKE_DIR}/CMakeSetCompilerFlags.cmake")
-INCLUDE("${VF_CMAKE_DIR}/CMakeCompilerMacros.cmake")
+INCLUDE(${VF_CMAKE_DIR}/CMakeSetCompilerFlags.cmake)
+INCLUDE(${VF_CMAKE_DIR}/CMakeCompilerMacros.cmake)
################################################################
### ADD_TARGET_PROPERTIES ###
@@ -91,218 +65,6 @@ MACRO(ADD_TARGET_PROPERTIES target property)
ENDMACRO(ADD_TARGET_PROPERTIES target property)
-################################################################
-### CHECK_FOR_VARIABLE ###
-### checks for a variable (also env-variables)
-### if not found -> error-message!!!
-### always: cache-entry update
-################################################################
-MACRO(CHECK_FOR_VARIABLE var)
- #check ob evtl enviromentvariable gesetzt
- IF(NOT DEFINED ${var}) #true if ${var} NOT: empty, 0, N, NO, OFF, FALSE, NOTFOUND, or <variable>-NOTFOUND
- SET(${var} $ENV{${var}})
- ENDIF()
-
- IF(NOT DEFINED ${var})
- SET(${var} "${var}-NOTFOUND" CACHE STRING "${ARGN}" FORCE)
- ENDIF(NOT DEFINED ${var})
-
- IF(${var} MATCHES ".*-NOTFOUND")
- MESSAGE(FATAL_ERROR "CHECK_FOR_VARIABLE - error - set ${var}")
- ENDIF()
-
- SET(${var} ${${var}} CACHE STRING "${ARGN}" FORCE)
-ENDMACRO(CHECK_FOR_VARIABLE var)
-
-
-###############################################################
-### CAB_SOURCE_GROUP( sourceGroupName ) ###
-### creates a source group for the given folder and files. ###
-###############################################################
-MACRO(CAB_SOURCE_GROUP sourceGroupName)
- SET(tempSourceGroupName ${sourceGroupName})
- IF(WITH_SUBFOLDERS_FOR_SG)
- STRING(REGEX REPLACE "/" "\\\\" tempSourceGroupName ${tempSourceGroupName})
- ENDIF()
- SOURCE_GROUP(${tempSourceGroupName} FILES ${ARGN})
-ENDMACRO(CAB_SOURCE_GROUP)
-
-#################################################################################
-### COLLECT_PACKAGE_DATA( currentDir sourceGroupName outFiles) ###
-### collects header and cpp file of current dir and add them to "outfiles" ###
-### all files will be put to the SOURCE_GROUP-folder "sourceGroupName" ###
-### and this one will be with subfolders if WITH_SUBFOLDERS_FOR_SG==YES ###
-#################################################################################
-MACRO(COLLECT_PACKAGE_DATA currentDir sourceGroupName outFiles)
- FILE( GLOB _HEADER_FILES ${currentDir}/*.h )
- FILE( GLOB _CPP_FILES ${currentDir}/*.cpp )
- FILE( GLOB _CXX_FILES ${currentDir}/*.cxx )
- FILE( GLOB _HPP_FILES ${currentDir}/*.hpp )
- FILE( GLOB _C_FILES ${currentDir}/*.c )
-
- IF(CAB_PACKAGE_DEFINTIONS)
- SET_SOURCE_FILES_PROPERTIES( ${CPP_FILES} PROPERTIES COMPILE_FLAGS ${CAB_PACKAGE_DEFINTIONS} )
- ENDIF(CAB_PACKAGE_DEFINTIONS)
-
- CAB_SOURCE_GROUP( ${sourceGroupName} ${_HEADER_FILES} ${_CPP_FILES} ${_CXX_FILES} ${_HPP_FILES} ${_C_FILES} )
-
- #SET( ${outFiles} ${${outFiles}} ${_HEADER_FILES} ${_CPP_FILES} ${_CXX_FILES} ${_HPP_FILES} ${_C_FILES} )
- LIST(APPEND ${outFiles} ${_HEADER_FILES} ${_CPP_FILES} ${_CXX_FILES} ${_HPP_FILES} ${_C_FILES} )
-ENDMACRO(COLLECT_PACKAGE_DATA currentDir sourceGroupName sourceGroupWithSubfolders outFiles)
-
-
-##################################################################################################################
-### COLLECT_PACKAGE_DATA_WITH_OPTION( currentDir outFiles [outOption] [outSourceGroupName]) ###
-### collects header and cpp file of current dir and add them to "outfiles" ###
-### all files will be put to the SOURCE_GROUP-folder "sourceGroupName" ###
-### and this one will be with subfolders if WITH_SUBFOLDERS_FOR_SG==YES ###
-##################################################################################################################
-MACRO(COLLECT_PACKAGE_DATA_WITH_OPTION currentDir outFiles)
- STRING(REGEX REPLACE "(.*)/source/(.*)" "\\2" SOURCE_GROUP_NAME "${currentDir}")
- STRING(REGEX REPLACE "/" "_" OPTION_LABEL "${SOURCE_GROUP_NAME}")
- STRING(REGEX REPLACE ":" "" OPTION_LABEL "${OPTION_LABEL}")
- STRING(TOUPPER ${OPTION_LABEL} OPTION_LABEL)
-
- SET(OPTION_LABEL "BUILD_${OPTION_LABEL}")
- OPTION(${OPTION_LABEL} "${currentDir}" ON)
-
- IF( ${OPTION_LABEL} )
- COLLECT_PACKAGE_DATA( ${currentDir} ${SOURCE_GROUP_NAME} ${outFiles})
- ENDIF(${OPTION_LABEL})
-
- IF(${ARGC} GREATER 2)
- SET( ${ARGV2} ${OPTION_LABEL} )
- ENDIF()
-
- IF(${ARGC} GREATER 3)
- SET( ${ARGV3} ${SOURCE_GROUP_NAME} )
- ENDIF()
-
-ENDMACRO(COLLECT_PACKAGE_DATA_WITH_OPTION currentDir outFiles)
-
-
-#################################################################
-### GET_DIRECTORY_FROM_ENV( var env_var [CACHE] [STRING]) ###
-### if enn_var exists the value with corrected slashes will ###
-### be stored in var. ###
-### if optional CACHE is activated the var will be stored as ###
-### cache variable. optional you can use a status bar string ###
-#################################################################
-MACRO(GET_DIRECTORY_FROM_ENV var env_var)
- SET(${var} $ENV{${env_var}})
- IF(${var})
- STRING(REGEX REPLACE "\\\\" "/" ${var} ${${var}}) # "\" --> "/"
- IF(${ARGC} EQUAL 3 AND ${ARGV2} MATCHES "CACHE")
- SET(${var} ${${var}} CACHE PATH "" FORCE)
- ENDIF(${ARGC} EQUAL 3 AND ${ARGV2} MATCHES "CACHE")
- IF(${ARGC} EQUAL 4 AND ${ARGV2} MATCHES "CACHE")
- SET(${var} ${${var}} CACHE PATH "${ARGV3}" FORCE)
- ENDIF(${ARGC} EQUAL 4 AND ${ARGV2} MATCHES "CACHE")
- ENDIF(${var})
-ENDMACRO(GET_DIRECTORY_FROM_ENV var env_var)
-
-#################################################################
-### GET_DIRECTORY_FROM_VAR( var [CACHE] [STRING]) ###
-### if optional CACHE is activated the var will be stored as ###
-### cache variable. optional you can use a status bar string ###
-#################################################################
-MACRO(GET_DIRECTORY_FROM_VAR var )
- IF(${var})
- STRING(REGEX REPLACE "\\\\" "/" ${var} ${${var}}) # "\" --> "/"
- IF(${ARGC} EQUAL 2 AND ${ARGV1} MATCHES "CACHE")
- SET(${var} ${${var}} CACHE PATH "" FORCE)
- ENDIF(${ARGC} EQUAL 2 AND ${ARGV1} MATCHES "CACHE")
- IF(${ARGC} EQUAL 3 AND ${ARGV1} MATCHES "CACHE")
- SET(${var} ${${var}} CACHE PATH "${ARGV2}" FORCE)
- ENDIF(${ARGC} EQUAL 3 AND ${ARGV1} MATCHES "CACHE")
- ENDIF(${var})
-ENDMACRO(GET_DIRECTORY_FROM_VAR var env_var)
-
-
-#################################################################
-### FINAL MACROS TO GENERATE PROJECT FILES ###
-### project_name: name of the project ###
-### build_type: BINARY | SHARED | STATIC ###
-### optinal: prefix
-#################################################################
-MACRO(CREATE_CAB_PROJECT project_name build_type)
-
- MESSAGE(STATUS "configuring ${project_name} (type=${build_type})...")
-
-
- #################################################################
- ### OS DEFINES ###
- #################################################################
- IF(WIN32)
- LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__WIN__)
- ELSEIF(APPLE)
- LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__APPLE__)
- ELSEIF(UNIX)
- LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
- ENDIF()
-
- #################################################################
- ### ADDITIONAL_MAKE_CLEAN_FILES ###
- #################################################################
- SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${GENERATED_FILES}")
-
- #################################################################
- ### EXCECUTABLE ###
- #################################################################
- IF(${build_type} MATCHES BINARY)
- ADD_EXECUTABLE(${project_name} ${ALL_SOURCES} )
- ELSEIF(${build_type} MATCHES SHARED)
- ADD_LIBRARY(${project_name} SHARED ${ALL_SOURCES} )
- ELSEIF(${build_type} MATCHES STATIC)
- ADD_LIBRARY(${project_name} STATIC ${ALL_SOURCES} )
- ELSE()
- MESSAGE(FATAL_ERROR "build_type=${build_type} doesn't match BINARY, SHARED or STATIC")
- ENDIF()
-
- #################################################################
- ### ADDITIONAL LINK LIBRARIES ###
- #################################################################
- IF(CAB_ADDITIONAL_LINK_LIBRARIES)
- TARGET_LINK_LIBRARIES(${project_name} ${CAB_ADDITIONAL_LINK_LIBRARIES})
- ENDIF()
-
- #################################################################
- ### COMPILER Flags ###
- #################################################################
- ADD_COMPILER_FLAGS_TO_PROJECT(${CAB_COMPILER} ${project_name} "CXX" ${build_type})
- MESSAGE(STATUS "compiler flags for compiler ${CAB_COMPILER} on machine ${CAB_MACHINE} for project ${project_name} (${build_type}) have been configured")
-
- IF(CAB_ADDTIONAL_COMPILER_FLAGS)
- ADD_TARGET_PROPERTIES(${project_name} COMPILE_FLAGS ${CAB_ADDTIONAL_COMPILER_FLAGS})
- ENDIF()
- IF(CAB_ADDTIONAL_COMPILER_FLAGS_DEBUG)
- MESSAGE(FATAL_ERROR "COMPILE_FLAGS_DEBUG_<CONFIG> not supported by cmake yet :-(")
- ADD_TARGET_PROPERTIES(${project_name} COMPILE_FLAGS_DEBUG ${CAB_ADDTIONAL_COMPILER_FLAGS_DEBUG})
- ENDIF()
- IF(CAB_ADDTIONAL_COMPILER_FLAGS_RELEASE)
- MESSAGE(FATAL_ERROR "COMPILE_FLAGS_<CONFIG> not supported by cmake yet :-(")
- ADD_TARGET_PROPERTIES(${project_name} COMPILE_FLAGS_RELEASE ${CAB_ADDTIONAL_COMPILER_FLAGS_RELEASE})
- ENDIF()
-
- #################################################################
- ### ADDITIONAL LINK PROPERTIES ###
- #################################################################
- IF(CAB_ADDITIONAL_LINK_FLAGS)
- ADD_TARGET_PROPERTIES(${project_name} LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS})
- ENDIF()
- IF(CAB_ADDITIONAL_LINK_FLAGS_DEBUG)
- ADD_TARGET_PROPERTIES(${project_name} LINK_FLAGS_DEBUG ${CAB_ADDITIONAL_LINK_FLAGS_DEBUG})
- ENDIF()
- IF(CAB_ADDITIONAL_LINK_FLAGS_RELEASE)
- ADD_TARGET_PROPERTIES(${project_name} LINK_FLAGS_RELEASE ${CAB_ADDITIONAL_LINK_FLAGS_RELEASE})
- ENDIF()
-
- SET(project_name ${project_name} CACHE STRING "name of binary")
-
- MESSAGE(STATUS "configuring ${project_name} (type=${build_type})... done")
-
-ENDMACRO(CREATE_CAB_PROJECT project_name build_type)
-
#################################################################
# ALLGEMEINGUELTIGER STUFF
# CAB_COMPILER setzen und machinespecific configfile laden
diff --git a/CMake/CMakeCompilerMacros.cmake b/CMake/CMakeCompilerMacros.cmake
index a9aa0558898abf1e56900426f524ebf660ad4f0f..8244aa29f3da4c5164a56eba40f6f2f175c341b5 100644
--- a/CMake/CMakeCompilerMacros.cmake
+++ b/CMake/CMakeCompilerMacros.cmake
@@ -1,7 +1,3 @@
-###############################################################
-# Aktivieren von ELSIF in CMake
-###############################################################
-SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS 1)
###############################################################
# IS_64BIT_SYSTEM (check put if OS is 64 bit compatible)
@@ -92,7 +88,6 @@ MACRO(SET_CAB_COMPILER)
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(CAB_COMPILER_NAME "gcc")
- SET(USE_GCC ON)
ENDIF()
SET(CAB_COMPILER "${CAB_COMPILER_NAME}${CAB_COMPILER_VERSION_MAJOR}${CAB_COMPILER_VERSION_MINOR}")
diff --git a/CMake/CMakeSetCompilerFlags.cmake b/CMake/CMakeSetCompilerFlags.cmake
index 7197caaa64838edbcfbd421af334dd29fe4362ba..1426aa0dbe27011310c3e88bce531a55d8ff4e8b 100644
--- a/CMake/CMakeSetCompilerFlags.cmake
+++ b/CMake/CMakeSetCompilerFlags.cmake
@@ -8,12 +8,7 @@ MACRO(SET_COMPILER_SPECIFIC_FLAGS compiler_type build_type)
IF(NOT CMAKE_CXX_COMPILER)
MESSAGE(FATAL_ERROR "before SET_CAB_COMPILER-Macro PROJECT-Macro has to be called")
ENDIF()
-
- OPTION(USE_OPENMP "activate open" ON)
-
- IF(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
- SET(USE_OPENMP OFF)
- ENDIF()
+
###############################################################################################################
## Flags ruecksetzen
@@ -39,6 +34,7 @@ MACRO(SET_COMPILER_SPECIFIC_FLAGS compiler_type build_type)
## standard compiler flags
###############################################################################################################
ELSEIF( EXISTS "${VF_CMAKE_DIR}/compilerflags/${CAB_COMPILER}.cmake" )
+ message("Load compiler file: " ${CAB_COMPILER}.cmake)
INCLUDE( ${VF_CMAKE_DIR}/compilerflags/${CAB_COMPILER}.cmake)
###############################################################################################################
## unknown compiler
@@ -74,11 +70,11 @@ MACRO(SET_COMPILER_SPECIFIC_FLAGS compiler_type build_type)
###############################################################################################################
# set flags
###############################################################################################################
-IF(USE_64BIT_COMPILER_OPTIONS)
- SET_COMPILER_SPECIFIC_FLAGS_INTERN( ${build_type} 1)
-else()
- SET_COMPILER_SPECIFIC_FLAGS_INTERN( ${build_type} 0)
-endif()
+ IF(USE_64BIT_COMPILER_OPTIONS)
+ SET_COMPILER_SPECIFIC_FLAGS_INTERN( ${build_type} 1)
+ else()
+ SET_COMPILER_SPECIFIC_FLAGS_INTERN( ${build_type} 0)
+ endif()
ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS compiler_type build_type)
diff --git a/CMake/compilerflags/clang.cmake b/CMake/compilerflags/clang.cmake
index af6fd3b16255a64dd12bd3c5fd27a40e2f12c2f5..cdee7f13b0a9479801035121ef784b125ad481b4 100644
--- a/CMake/compilerflags/clang.cmake
+++ b/CMake/compilerflags/clang.cmake
@@ -20,14 +20,6 @@ MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-m64" )
ENDIF()
- #############################################################################################################
- # OpenMP support
- #############################################################################################################
- IF(USE_OPENMP)
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fopenmp")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-fopenmp")
- ENDIF()
-
#############################################################################################################
# mt support
#############################################################################################################
diff --git a/CMake/compilerflags/gccGeneric.cmake b/CMake/compilerflags/gccGeneric.cmake
index d658afe73f2a7c1991018553b4488ed028e9d787..67c4843b84fe0f65dc6f1bb4d523b43dff9eb550 100644
--- a/CMake/compilerflags/gccGeneric.cmake
+++ b/CMake/compilerflags/gccGeneric.cmake
@@ -23,14 +23,6 @@ MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-m64" )
ENDIF()
- #############################################################################################################
- # OpenMP support
- #############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fopenmp")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-fopenmp")
- ENDIF()
-
#############################################################################################################
# mt support
#############################################################################################################
diff --git a/cpu.cmake b/cpu.cmake
index 8a18f999b0d7db4d90aa12c99b394d4d0c20f097..215a491e2985d2c56232295dff67193e2627ebe0 100644
--- a/cpu.cmake
+++ b/cpu.cmake
@@ -24,21 +24,16 @@ PROJECT(VirtualFluids)
#SET(CMAKE_BUILD_TYPE DEBUG)
#ENDIF()
-SET(USE_ZOLTAN OFF CACHE BOOL "include Zoltan library support")
SET(USE_METIS ON CACHE BOOL "include METIS library support")
SET(USE_MPI ON CACHE BOOL "include MPI library support")
SET(USE_VTK OFF CACHE BOOL "include VTK library support")
SET(USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support")
SET(USE_BOOST OFF CACHE BOOL "include Boost support")
#SET(USE_PYTHON OFF CACHE BOOL "include Python scripting support")
-#SET(USE_FETOL OFF CACHE BOOL "include FETOL library support")
-SET(USE_INTEL OFF CACHE BOOL "include Intel compiler support")
+
SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
-#CAB
-include("CMake/CMakeCABMacros.cmake") #TODO: Currently we have to include the CABMacros also here, so that the USE_* are defined in the config files for the cpu version
-
#MPI
IF((NOT ${CMAKE_CXX_COMPILER} MATCHES mpicxx) AND (NOT ${CMAKE_CXX_COMPILER} MATCHES mpiicpc))# OR NOT ${CMAKE_CXX_COMPILER} MATCHES cc OR NOT ${CMAKE_CXX_COMPILER} MATCHES mpiCC)
FIND_PACKAGE(MPI REQUIRED)
@@ -64,14 +59,6 @@ IF(${USE_BOOST})
FIND_PACKAGE(Boost ${BOOST_VERSION})
ENDIF()
-##################################################################################
-# Java
-##############################################################################
-### FindJNI.cmake
-# IF(${USE_FETOL})
-# find_package(JNI REQUIRED)
-# ENDIF()
-
#VTK
IF(${USE_VTK})
#find_package(VTK 6.1 NO_MODULE)
@@ -93,9 +80,6 @@ LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DNOMINMAX)
#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -noshlib)
#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DSINGLEPRECISION)
-IF(${USE_ZOLTAN})
- LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_ZOLTAN)
-ENDIF()
IF(${USE_METIS})
LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_METIS)
ENDIF()
@@ -117,17 +101,16 @@ IF(${USE_HLRN_LUSTRE})
LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DHLRN_LUSTRE)
ENDIF()
-IF(${USE_INTEL})
+IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
SET(CAB_ADDITIONAL_LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS} -parallel)
ENDIF()
-message ("GCC IS : " ${USE_GCC})
-
-IF(${USE_GCC})
+IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
SET(CAB_ADDITIONAL_LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS} -lgomp)
ENDIF()
+
# IF(${USE_PYTHON})
# FIND_PACKAGE(PythonLibs)
# INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
@@ -136,7 +119,7 @@ ENDIF()
# add_subdirectory(python)
# ENDIF()
-# IF(${USE_INTEL})
+# IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DMPICH_IGNORE_CXX_SEEK)
# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DMPICH_SKIP_MPICXX)
# ENDIF()
diff --git a/src/cpu/DemCoupling/DemCoupling.cmake b/src/cpu/DemCoupling/DemCoupling.cmake
index beff09755e5f17a8bc159cff183a5915dc5ac5a3..927c08b6dadae76d2ed023253503f8e7bd804601 100644
--- a/src/cpu/DemCoupling/DemCoupling.cmake
+++ b/src/cpu/DemCoupling/DemCoupling.cmake
@@ -21,7 +21,7 @@ SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRAR
SET(LINK_LIBRARY optimized ${CORE_RELEASE_LIBRARY} debug ${CORE_DEBUG_LIBRARY})
SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
-IF(${USE_GCC})
+IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} "stdc++fs")
ENDIF()
diff --git a/src/cpu/VirtualFluidsCore/CMakeLists.txt b/src/cpu/VirtualFluidsCore/CMakeLists.txt
index fbe516b816de68464a7c2cf616c6fd7d94c64fcc..79c86121fa2565d6a53bb1b38e911edb9a2d0a0f 100644
--- a/src/cpu/VirtualFluidsCore/CMakeLists.txt
+++ b/src/cpu/VirtualFluidsCore/CMakeLists.txt
@@ -1,20 +1,14 @@
-IF(${USE_GCC})
+IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} rt)
SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} gomp)
ENDIF()
-IF(${USE_INTEL})
+IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} irc)
SET(CAB_ADDITIONAL_LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS} parallel)
ENDIF()
-IF(${USE_ZOLTAN})
- INCLUDE_DIRECTORIES(${ZOLTAN_INCLUDEDIR})
- SET(LINK_LIBRARY optimized ${ZOLTAN_RELEASE_LIBRARY} debug ${ZOLTAN_DEBUG_LIBRARY})
- SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
-ENDIF()
-
IF(${USE_METIS})
SET(LINK_LIBRARY optimized ${METIS_RELEASE_LIBRARY} debug ${METIS_DEBUG_LIBRARY})
SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
@@ -38,19 +32,6 @@ IF(${USE_PYTHON})
SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
ENDIF()
-IF(${USE_FETOL})
- SET(LINK_LIBRARY optimized ${BOND_RELEASE_LIBRARY} debug ${BOND_DEBUG_LIBRARY})
- SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
-
- SET(LINK_LIBRARY optimized ${JAVA_JVM_LIBRARY} debug ${JAVA_JVM_LIBRARY})
- SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
-
- SET(LINK_LIBRARY optimized ${YAML_RELEASE_LIBRARY} debug ${YAML_DEBUG_LIBRARY})
- SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
-
- SET(LINK_LIBRARY optimized ${FETOL_RELEASE_LIBRARY} debug ${FETOL_DEBUG_LIBRARY})
- SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
-ENDIF()
IF(${USE_DEM_COUPLING})
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../DemCoupling/DemCoupling.cmake)
@@ -84,10 +65,3 @@ target_include_directories(${library_name} PRIVATE ${ZOLTAN_INCLUDEDIR})
IF(${USE_VTK})
target_include_directories(${library_name} PRIVATE ${VTK_INCLUDE_DIRS})
ENDIF()
-IF(${USE_FETOL})
- # INCLUDE_DIRECTORIES(${SOURCE_DIR}/VirtualFluidsCore/FETOL) TODO: Did not exists?
- target_include_directories(${library_name} PRIVATE ${YAML_INCLUDEDIR})
- target_include_directories(${library_name} PRIVATE ${BOND_INCLUDEDIR})
- target_include_directories(${library_name} PRIVATE ${FETOL_INCLUDEDIR})
-ENDIF()
-
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h
index 49a8da4ac360b2bda8c8071f43d2b8d537e42522..1958b39d812695033ec395964236b1c7f9ce2e84 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h
@@ -55,6 +55,7 @@ public:
virtual ~CumulantK17LBMKernel(void);
virtual void calculate(int step);
virtual SPtr<LBMKernel> clone();
+ virtual double getCalculationTime() { return .0; }
protected:
inline void forwardInverseChimeraWithK(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2, LBMReal Kinverse, LBMReal K);