diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6d12cb41b55e78b762a841965507f098f1be9f16
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,22 @@
+image: ubuntu
+
+stages:
+ - build
+
+build:
+ stage: build
+
+ before_script:
+ - export CAB_MACHINE=ELLADAN
+ - export DEBIAN_FRONTEND=noninteractive
+ - apt-get update
+ - apt-get install build-essential -y
+ - apt-get install cmake -y
+ - apt-get install ninja-build -y
+ - apt-get install openmpi-bin -y
+ - apt-get install libomp-dev -y
+ - apt-get install nvidia-cuda-dev nvidia-cuda-toolkit -y
+
+ script:
+ - cmake -S . -B build -DBUILD_VF_CPU:BOOL=ON
+ - cmake --build build --target VirtualFluidsCore
\ No newline at end of file
diff --git a/3rdParty/MarchingCubes/CMakePackage.txt b/3rdParty/MarchingCubes/CMakePackage.txt
index bea0c0b7df77f75944c36260ff48bb9353fc8394..64f5dcd2028cfd7904187d7bac7131554e02b20c 100644
--- a/3rdParty/MarchingCubes/CMakePackage.txt
+++ b/3rdParty/MarchingCubes/CMakePackage.txt
@@ -2,5 +2,5 @@ GET_FILENAME_COMPONENT( CURRENT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
COLLECT_PACKAGE_DATA_WITH_OPTION(${CURRENT_DIR} ALL_SOURCES outOption outSourceGroupName)
IF(${outOption})
- LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DMC_CUBES )
+ list(APPEND VF_COMPILER_DEFINITION MC_CUBES)
ENDIF()
diff --git a/CMake/3rd/cuda.cmake b/CMake/3rd/cuda.cmake
index f39e4c417134511e4dd8f37cc3a081479d037147..570f4b0c6ff970d3fe603181ac332d6214b1b87e 100644
--- a/CMake/3rd/cuda.cmake
+++ b/CMake/3rd/cuda.cmake
@@ -10,7 +10,7 @@ function(linkCUDA)
)
vf_get_library_name(library_name)
- target_include_directories(${library_name} PRIVATE ${CUDA_INCLUDE_DIRS} ${CUDA_CUT_INCLUDE_DIR})
+ target_include_directories(${library_name} PRIVATE ${CUDA_CUT_INCLUDE_DIR})
# set the following properties only for specific targets
# set_property(TARGET ${targetName} PROPERTY CUDA_SEPARABLE_COMPILATION ON)
diff --git a/CMake/CMakeCABMacros.cmake b/CMake/CMakeCABMacros.cmake
deleted file mode 100644
index 32e8c1e0fba34debf5dddbce3e19788aa9c24d44..0000000000000000000000000000000000000000
--- a/CMake/CMakeCABMacros.cmake
+++ /dev/null
@@ -1,320 +0,0 @@
-###############################################################
-# 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)
-SET(CAB_ADDITIONAL_LINK_FLAGS_RELEASE)
-
-SET(CAB_ADDITIONAL_LINK_LIBRARIES)
-
-
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DSOURCE_ROOT=${VF_ROOT_DIR} )
-
-###############################################################
-# hostename ermitteln -> CAB_MACHINE
-###############################################################
-IF(NOT CAB_MACHINE)
- SET(CAB_MACHINE $ENV{CAB_MACHINE})
-
- IF( CAB_MACHINE )
- STRING(TOUPPER "${CAB_MACHINE}" CAB_MACHINE)
- ELSE()
- EXECUTE_PROCESS( COMMAND hostname OUTPUT_VARIABLE CAB_MACHINE)
- STRING(REGEX REPLACE "[ ]*([A-Za-z0-9]+).*[\\\\n]*" "\\1" CAB_MACHINE "${CAB_MACHINE}" )
- STRING(TOUPPER "${CAB_MACHINE}" CAB_MACHINE)
- ENDIF()
-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")
-
-################################################################
-### ADD_TARGET_PROPERTIES ###
-################################################################
-MACRO(ADD_TARGET_PROPERTIES target property)
-
- SET(property_values ${ARGN})
-
- # vorhandene properties holen
- GET_TARGET_PROPERTY(TEMP_VAR ${target} ${property})
- IF(TEMP_VAR)
- LIST(APPEND property_values ${TEMP_VAR})
- ENDIF()
-
- #STRING(REGEX REPLACE ";" " " property_values ${property_values})
- # doppelte Eintraege loeschen
- SEPARATE_ARGUMENTS(property_values)
- LIST(REMOVE_DUPLICATES property_values)
-
- #aus Liste wieder einen String basteln (geht nich tmit regex replace...)
- SET(new_property_values)
- FOREACH(p ${property_values})
- SET(new_property_values "${p} ${new_property_values}")
- ENDFOREACH()
-
- #property setzen
- SET_TARGET_PROPERTIES(${target} PROPERTIES ${property} ${new_property_values})
-
- #GET_TARGET_PROPERTY(TEMP_VAR ${target} ${property})
- #MESSAGE("danach ${target} ${property} ${TEMP_VAR}")
-
-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
-###############################################################
-SET_CAB_COMPILER()
-CHECK_FOR_VARIABLE(CAB_MACHINE "machine name, e.g. ALTIX, ARWEN")
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DCAB_MACHINE_${CAB_MACHINE})
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DCAB_MACHINE=${CAB_MACHINE})
-SET(CMAKE_CONFIG_FILE "${VF_CMAKE_DIR}/cmake_config_files/${CAB_MACHINE}.config.cmake")
-
-IF(NOT EXISTS ${CMAKE_CONFIG_FILE})
- MESSAGE(FATAL_ERROR "${CMAKE_CONFIG_FILE} does not exists... maybe false CAB_MACHINE = ${CAB_MACHINE}")
-ELSE()
- INCLUDE(${CMAKE_CONFIG_FILE})
-ENDIF()
diff --git a/CMake/CMakeCompilerMacros.cmake b/CMake/CMakeCompilerMacros.cmake
deleted file mode 100644
index a9aa0558898abf1e56900426f524ebf660ad4f0f..0000000000000000000000000000000000000000
--- a/CMake/CMakeCompilerMacros.cmake
+++ /dev/null
@@ -1,384 +0,0 @@
-###############################################################
-# Aktivieren von ELSIF in CMake
-###############################################################
-SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS 1)
-
-###############################################################
-# IS_64BIT_SYSTEM (check put if OS is 64 bit compatible)
-###############################################################
-MACRO(IS_64BIT_SYSTEM is64BitOutVar)
-
- SET(${is64BitOutVar} FALSE)
-
- IF(APPLE)
- EXEC_PROGRAM( arch
- ARGS -x86_64 echo "64bit"
- OUTPUT_VARIABLE CAB_SYSTEM_INFO_1 )
- IF(${CAB_SYSTEM_INFO_1} MATCHES "64bit")
- SET(${is64BitOutVar} TRUE)
- ENDIF()
-
- ELSEIF(UNIX)
-
- EXEC_PROGRAM( uname
- ARGS -m
- OUTPUT_VARIABLE CAB_SYSTEM_INFO_1 )
-
- STRING(REGEX MATCH "x86_64" CAB_SYSTEM_INFO_1 ${CAB_SYSTEM_INFO_1})
-
-
- EXEC_PROGRAM( getconf
- ARGS -a | grep -i LONG_BIT
- OUTPUT_VARIABLE CAB_SYSTEM_INFO_2 )
-
- STRING(REGEX MATCH "64" CAB_SYSTEM_INFO_2 ${CAB_SYSTEM_INFO_2})
-
- IF(CAB_SYSTEM_INFO_1 STREQUAL "x86_64" AND CAB_SYSTEM_INFO_2 STREQUAL "64")
- SET(${is64BitOutVar} TRUE)
- ENDIF()
-
- ELSEIF(WIN32)
-
- MESSAGE(STATUS "IS_64BIT_SYSTEM: determining system type (32/64bit)...(this may take a few moments)")
- EXEC_PROGRAM( SystemInfo OUTPUT_VARIABLE CAB_SYSTEM_INFO_1 )
-
- STRING(REGEX MATCH "x64-based PC" CAB_SYSTEM_INFO_1 ${CAB_SYSTEM_INFO_1})
-
- IF(CAB_SYSTEM_INFO_1 MATCHES "x64-based PC")
- SET(${is64BitOutVar} TRUE)
- MESSAGE(STATUS "IS_64BIT_SYSTEM: determining system type (32/64bit)... done (-> 64 Bit)")
- ELSE()
- MESSAGE(STATUS "IS_64BIT_SYSTEM: determining system type (32/64bit)... done (-> 32 Bit)")
- ENDIF()
-
- ELSE()
- MESSAGE(FATAL_ERROR "IS_64BIT_SYSTEM: unknown OS")
- ENDIF()
-
-ENDMACRO(IS_64BIT_SYSTEM is64BitOutVar)
-
-
-###############################################################
-### SET_CAB_COMPILER ###
-### Macro sets CAB_COMPILER variable if not set ###
-### for msvc: CMake Variables are used ###
-### for intel,gcc: --version call is evaluated ###
-###############################################################
-MACRO(SET_CAB_COMPILER)
- IF(NOT CMAKE_CXX_COMPILER)
- MESSAGE(FATAL_ERROR "before SET_CAB_COMPILER-Macro PROJECT-Macro has to be called")
- ELSE()
- IF(NOT CAB_COMPILER)
- IF(MSVC)
- IF(CMAKE_CL_64)
- SET( CAB_COMPILER "msvc19_64" )
- ELSE()
- SET( CAB_COMPILER "msvc19_32" )
- ENDIF()
- #ELSEIF(APPLE)
- ELSEIF("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
- SET( CAB_COMPILER "clang" )
- ELSE()
- EXEC_PROGRAM( ${CMAKE_CXX_COMPILER}
- ARGS --version
- OUTPUT_VARIABLE CAB_COMPILER_INFO )
-
- STRING(REGEX REPLACE ".* \\((.*)\\) ([0-9]*)\\.([0-9]*)[\\. ]([0-9]*).*" "\\1" CAB_COMPILER_NAME ${CAB_COMPILER_INFO})
- STRING(REGEX REPLACE "[^ ]*[^0-9]*([0-9]*)\\.([0-9]*)[\\. ]([0-9]*)[^0-9]*.*" "\\1" CAB_COMPILER_VERSION_MAJOR ${CAB_COMPILER_INFO})
- STRING(REGEX REPLACE "[^ ]*[^0-9]*([0-9]*)\\.([0-9]*)[\\. ]([0-9]*)[^0-9]*.*" "\\2" CAB_COMPILER_VERSION_MINOR ${CAB_COMPILER_INFO})
- STRING(REGEX REPLACE "[^ ]*[^0-9]*([0-9]*)\\.([0-9]*)[\\. ]([0-9]*)[^0-9]*.*" "\\3" CAB_COMPILER_VERSION_PATCH ${CAB_COMPILER_INFO})
-
- STRING(TOLOWER ${CAB_COMPILER_NAME} CAB_COMPILER_NAME)
-
- 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}")
- ENDIF()
- ENDIF()
-
- SET(CAB_COMPILER ${CAB_COMPILER} CACHE STRING "compiler")
- ENDIF()
-
-ENDMACRO(SET_CAB_COMPILER)
-
-################################################################
-### 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 ${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(NOT ${var})
- MESSAGE(FATAL_ERROR "CHECK_FOR_VARIABLE - error - set ${var}")
- ENDIF()
-
-SET(${var} ${${var}} CACHE STRING "${ARGN}" FORCE)
-ENDMACRO(CHECK_FOR_VARIABLE var)
-
-
-#################################################################
-### ADD_CXX_FLAGS(flags) ###
-### flags will be added to CMAKE_CXX_FLAGS ###
-#################################################################
-MACRO(ADD_CXX_FLAGS)
- FOREACH(arg ${ARGN})
- SET(TMP ${arg}) #elsewise the Seperate command doesn't work)
- SEPARATE_ARGUMENTS(TMP)
- FOREACH(option ${TMP})
- STRING(REGEX REPLACE " ${option}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- STRING(REGEX REPLACE "${option}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${option}" CACHE STRING "common C++ build flags" FORCE)
- ENDFOREACH(option ${TMP})
- ENDFOREACH(arg ${ARGN})
-ENDMACRO(ADD_CXX_FLAGS)
-
-#################################################################
-### ADD_CXX_FLAGS_IF(option flags) ###
-### flags will be added to CMAKE_CXX_FLAGS if option exists ###
-#################################################################
-MACRO(ADD_CXX_FLAGS_IF condition)
- IF(${condition})
- ADD_CXX_FLAGS(${ARGN})
- ENDIF(${condition})
-ENDMACRO(ADD_CXX_FLAGS_IF)
-
-#################################################################
-### REMOVE_CXX_FLAGS(flags) ###
-### flags will be removed from CMAKE_CXX_FLAGS ###
-#################################################################
-MACRO(REMOVE_CXX_FLAGS)
- FOREACH(arg ${ARGN})
- SET(TMP ${arg}) #elsewise the Seperate command doesn't work)
- SEPARATE_ARGUMENTS(TMP)
- FOREACH(option ${TMP})
- STRING(REGEX REPLACE " ${option}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- STRING(REGEX REPLACE "${option}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- ENDFOREACH(option ${TMP})
- ENDFOREACH(arg ${ARGN})
-ENDMACRO(REMOVE_CXX_FLAGS)
-
-#####################################################################
-### REMOVE_CXX_FLAGS(option flags) ###
-### flags will be removed from CMAKE_CXX_FLAGS if option exists ###
-#####################################################################
-MACRO(REMOVE_CXX_FLAGS_IF condition)
- IF(${condition})
- REMOVE_CXX_FLAGS(${ARGN})
- ENDIF(${condition})
-ENDMACRO(REMOVE_CXX_FLAGS_IF)
-
-#################################################################
-### ADD_CXX_BUILDTYPE_FLAGS(buildtype flags) ###
-### flags will be added to CMAKE_CXX_BUILDTYPE_FLAGS ###
-#################################################################
-MACRO(ADD_CXX_BUILDTYPE_FLAGS buildtype)
- IF(CMAKE_CXX_FLAGS_${buildtype})
- FOREACH(arg ${ARGN})
- SET(TMP ${arg}) #elsewise the Seperate command doesn't work)
- SEPARATE_ARGUMENTS(TMP)
- FOREACH(option ${TMP})
- STRING(REGEX REPLACE " ${option}" "" CMAKE_CXX_FLAGS_${buildtype} "${CMAKE_CXX_FLAGS_${buildtype}}")
- STRING(REGEX REPLACE "${option}" "" CMAKE_CXX_FLAGS_${buildtype} "${CMAKE_CXX_FLAGS_${buildtype}}")
- SET(CMAKE_CXX_FLAGS_${buildtype} "${CMAKE_CXX_FLAGS_${buildtype}} ${option}" CACHE STRING "common C++ build flags for ${buildtype}" FORCE)
- ENDFOREACH(option ${TMP})
- ENDFOREACH(arg ${ARGN})
- ENDIF(CMAKE_CXX_FLAGS_${buildtype})
-ENDMACRO(ADD_CXX_BUILDTYPE_FLAGS)
-
-#########################################################################
-### ADD_CXX_BUILDTYPE_FLAGS(buildtype option flags) ###
-### flags will be added to CMAKE_CXX_BUILDTYPE_FLAGS if option exists ###
-#########################################################################
-MACRO(ADD_CXX_BUILDTYPE_FLAGS_IF buildtype condition)
- IF(${condition})
- ADD_CXX_BUILDTYPE_FLAGS(${buildtype} ${ARGN})
- ENDIF(${condition})
-ENDMACRO(ADD_CXX_BUILDTYPE_FLAGS_IF)
-
-#################################################################
-### REMOVE_CXX_BUILDTYPE_FLAGS(buildtype flags) ###
-### flags will be removed from CMAKE_CXX_FLAGS ###
-#################################################################
-MACRO(REMOVE_CXX_BUILDTYPE_FLAGS buildtype)
- IF(CMAKE_CXX_FLAGS_${buildtype})
- FOREACH(arg ${ARGN})
- SET(TMP ${arg}) #elsewise the Seperate command doesn't work)
- SEPARATE_ARGUMENTS(TMP)
- FOREACH(option ${TMP})
- STRING(REGEX REPLACE " ${option}" "" CMAKE_CXX_FLAGS_${buildtype} "${CMAKE_CXX_FLAGS_${buildtype}}")
- STRING(REGEX REPLACE "${option}" "" CMAKE_CXX_FLAGS_${buildtype} "${CMAKE_CXX_FLAGS_${buildtype}}")
- SET(CMAKE_CXX_FLAGS_${buildtype} "${CMAKE_CXX_FLAGS_${buildtype}}"
- CACHE STRING "C++ build flags for ${buildtype} configuration" FORCE)
- ENDFOREACH(option ${TMP})
- ENDFOREACH(arg ${ARGN})
- ENDIF(CMAKE_CXX_FLAGS_${buildtype})
-ENDMACRO(REMOVE_CXX_BUILDTYPE_FLAGS)
-
-#####################################################################
-### REMOVE_CXX_BUILDTYPE_FLAGS_IF(buildtype option flags) ###
-### flags will be removed from CMAKE_CXX_FLAGS if option exists ###
-#####################################################################
-MACRO(REMOVE_CXX_BUILDTYPE_FLAGS_IF condition)
- IF(${condition})
- REMOVE_CXX_BUILDTYPE_FLAGS(${buildtype} ${ARGN})
- ENDIF(${condition})
-ENDMACRO(REMOVE_CXX_BUILDTYPE_FLAGS_IF)
-
-#####################################################################
-### SET_CXX_COMPILER( compiler) ###
-### flags will be removed from CMAKE_CXX_FLAGS if option exists ###
-#####################################################################
-#MACRO(SET_CXX_COMPILER compiler)
-# INCLUDE (CMakeForceCompiler)
-# SET(CMAKE_SYSTEM_NAME Generic)
-# CMAKE_FORCE_CXX_COMPILER (${compiler} "set by user")
-# SET(CMAKE_CXX_COMPILER ${compiler} CACHE STRING "C++ compiler" FORCE)
-#ENDMACRO(SET_CXX_COMPILER)
-
-#################################################################
-### ADD_C_FLAGS(flags) ###
-### flags will be added to CMAKE_C_FLAGS ###
-#################################################################
-MACRO(ADD_C_FLAGS)
- FOREACH(arg ${ARGN})
- SET(TMP ${arg}) #elsewise the Seperate command doesn't work)
- SEPARATE_ARGUMENTS(TMP)
- FOREACH(option ${TMP})
- STRING(REGEX REPLACE " ${option}" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
- STRING(REGEX REPLACE "${option}" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${option}" CACHE STRING "common C++ build flags" FORCE)
- ENDFOREACH(option ${TMP})
- ENDFOREACH(arg ${ARGN})
-ENDMACRO(ADD_C_FLAGS)
-
-#################################################################
-### ADD_C_FLAGS(option flags) ###
-### flags will be added to CMAKE_C_FLAGS if option exists ###
-#################################################################
-MACRO(ADD_C_FLAGS_IF condition)
- IF(${condition})
- ADD_C_FLAGS(${ARGN})
- ENDIF(${condition})
-ENDMACRO(ADD_C_FLAGS_IF)
-
-#################################################################
-### REMOVE_C_FLAGS(flags) ###
-### flags will be removed from CMAKE_C_FLAGS ###
-#################################################################
-MACRO(REMOVE_C_FLAGS)
- FOREACH(arg ${ARGN})
- SET(TMP ${arg}) #elsewise the Seperate command doesn't work)
- SEPARATE_ARGUMENTS(TMP)
- FOREACH(option ${TMP})
- STRING(REGEX REPLACE " ${option}" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
- STRING(REGEX REPLACE "${option}" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
- ENDFOREACH(option ${TMP})
- ENDFOREACH(arg ${ARGN})
-ENDMACRO(REMOVE_C_FLAGS)
-
-#####################################################################
-### REMOVE_C_FLAGS(option flags) ###
-### flags will be removed from CMAKE_C_FLAGS if option exists ###
-#####################################################################
-MACRO(REMOVE_C_FLAGS_IF condition)
- IF(${condition})
- REMOVE_C_FLAGS(${ARGN})
- ENDIF(${condition})
-ENDMACRO(REMOVE_C_FLAGS_IF)
-
-#################################################################
-### ADD_C_BUILDTYPE_FLAGS(buildtype flags) ###
-### flags will be added to CMAKE_C_BUILDTYPE_FLAGS ###
-#################################################################
-MACRO(ADD_C_BUILDTYPE_FLAGS buildtype)
- IF(CMAKE_C_FLAGS_${buildtype})
- FOREACH(arg ${ARGN})
- SET(TMP ${arg}) #elsewise the Seperate command doesn't work)
- SEPARATE_ARGUMENTS(TMP)
- FOREACH(option ${TMP})
- STRING(REGEX REPLACE " ${option}" "" CMAKE_C_FLAGS_${buildtype} "${CMAKE_C_FLAGS_${buildtype}}")
- STRING(REGEX REPLACE "${option}" "" CMAKE_C_FLAGS_${buildtype} "${CMAKE_C_FLAGS_${buildtype}}")
- SET(CMAKE_C_FLAGS_${buildtype} "${CMAKE_C_FLAGS_${buildtype}} ${option}" CACHE STRING "common C++ build flags for ${buildtype}" FORCE)
- ENDFOREACH(option ${TMP})
- ENDFOREACH(arg ${ARGN})
- ENDIF(CMAKE_C_FLAGS_${buildtype})
-ENDMACRO(ADD_C_BUILDTYPE_FLAGS)
-
-#########################################################################
-### ADD_C_BUILDTYPE_FLAGS(buildtype option flags) ###
-### flags will be added to CMAKE_C_BUILDTYPE_FLAGS if option exists ###
-#########################################################################
-MACRO(ADD_C_BUILDTYPE_FLAGS_IF buildtype condition)
- IF(${condition})
- ADD_C_BUILDTYPE_FLAGS(${buildtype} ${ARGN})
- ENDIF(${condition})
-ENDMACRO(ADD_C_BUILDTYPE_FLAGS_IF)
-
-#################################################################
-### REMOVE_C_BUILDTYPE_FLAGS(buildtype flags) ###
-### flags will be removed from CMAKE_C_FLAGS ###
-#################################################################
-MACRO(REMOVE_C_BUILDTYPE_FLAGS buildtype)
- IF(CMAKE_C_FLAGS_${buildtype})
- FOREACH(arg ${ARGN})
- SET(TMP ${arg}) #elsewise the Seperate command doesn't work)
- SEPARATE_ARGUMENTS(TMP)
- FOREACH(option ${TMP})
- STRING(REGEX REPLACE " ${option}" "" CMAKE_C_FLAGS_${buildtype} "${CMAKE_C_FLAGS_${buildtype}}")
- STRING(REGEX REPLACE "${option}" "" CMAKE_C_FLAGS_${buildtype} "${CMAKE_C_FLAGS_${buildtype}}")
- SET(CMAKE_C_FLAGS_${buildtype} "${CMAKE_C_FLAGS_${buildtype}}"
- CACHE STRING "C++ build flags for ${buildtype} configuration" FORCE)
- ENDFOREACH(option ${TMP})
- ENDFOREACH(arg ${ARGN})
- ENDIF(CMAKE_C_FLAGS_${buildtype})
-ENDMACRO(REMOVE_C_BUILDTYPE_FLAGS)
-
-#####################################################################
-### REMOVE_C_BUILDTYPE_FLAGS_IF(buildtype option flags) ###
-### flags will be removed from CMAKE_C_FLAGS if option exists ###
-#####################################################################
-MACRO(REMOVE_C_BUILDTYPE_FLAGS_IF condition)
- IF(${condition})
- REMOVE_C_BUILDTYPE_FLAGS(${buildtype} ${ARGN})
- ENDIF(${condition})
-ENDMACRO(REMOVE_C_BUILDTYPE_FLAGS_IF)
-
-#####################################################################
-### SET_C_COMPILER( compiler) ###
-### flags will be removed from CMAKE_C_FLAGS if option exists ###
-#####################################################################
-MACRO(SET_C_COMPILER compiler)
- INCLUDE (CMakeForceCompiler)
- SET(CMAKE_SYSTEM_NAME Generic)
- CMAKE_FORCE_C_COMPILER (${compiler} "set by user")
- SET(CMAKE_C_COMPILER ${compiler} CACHE STRING "C compiler" FORCE)
-ENDMACRO(SET_C_COMPILER)
-
-#################################################################
-### ADD_EXE_LINKER_FLAGS(flags) ###
-### flags will be added to CMAKE_EXE_LINKER_FLAGS ###
-#################################################################
-MACRO(ADD_EXE_LINKER_FLAGS)
- FOREACH(arg ${ARGN})
- SET(TMP ${arg}) #elsewise the Seperate command doesn't work)
- SEPARATE_ARGUMENTS(TMP)
- FOREACH(option ${TMP})
- STRING(REGEX REPLACE " ${option}" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
- STRING(REGEX REPLACE "${option}" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${option}" CACHE STRING "common C++ build flags" FORCE)
- ENDFOREACH(option ${TMP})
- ENDFOREACH(arg ${ARGN})
-ENDMACRO(ADD_EXE_LINKER_FLAGS)
-
diff --git a/CMake/CMakeMacros_old/Cocoa/Link.cmake b/CMake/CMakeMacros_old/Cocoa/Link.cmake
deleted file mode 100644
index de9f2cd8939fbe676a773344a284399ed4ace0ad..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/Cocoa/Link.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-macro(linkCocoa targetName)
- find_library(COCOA_LIB Cocoa)
- target_link_libraries(${targetName} ${COCOA_LIB})
-endmacro(linkCocoa)
diff --git a/CMake/CMakeMacros_old/Environment/environment.cmake b/CMake/CMakeMacros_old/Environment/environment.cmake
deleted file mode 100644
index 2c33e5cc2cf7315107582f9fbb07bfd407bf610c..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/Environment/environment.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-unset(BUILD_computerName)
-site_name(BUILD_computerName)
-MESSAGE(STATUS "computer name: " ${BUILD_computerName})
-
-include(${CMAKE_SOURCE_DIR}/MachineFiles/${BUILD_computerName})
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/GMock/FindGMock.cmake b/CMake/CMakeMacros_old/GMock/FindGMock.cmake
deleted file mode 100644
index 4ae3b599cb3d212cc5e43a18a9efdfcd56a5ccbe..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/GMock/FindGMock.cmake
+++ /dev/null
@@ -1,137 +0,0 @@
-# Locate the Google C++ Mocking Framework.
-# (This file is almost an identical copy of the original FindGTest.cmake file,
-# feel free to use it as it is or modify it for your own needs.)
-#
-#
-# Defines the following variables:
-#
-# GMOCK_FOUND - Found the Google Testing framework
-# GMOCK_INCLUDE_DIRS - Include directories
-#
-# Also defines the library variables below as normal
-# variables. These contain debug/optimized keywords when
-# a debugging library is found.
-#
-# GMOCK_BOTH_LIBRARIES - Both libgmock & libgmock-main
-# GMOCK_LIBRARIES - libgmock
-# GMOCK_MAIN_LIBRARIES - libgmock-main
-#
-# Accepts the following variables as input:
-#
-# GMOCK_HOME - (as a CMake or environment variable)
-# The root directory of the gmock install prefix
-#
-# GMOCK_MSVC_SEARCH - If compiling with MSVC, this variable can be set to
-# "MD" or "MT" to enable searching a gmock build tree
-# (defaults: "MD")
-#
-#-----------------------
-# Example Usage:
-#
-# find_package(GMock REQUIRED)
-# include_directories(${GMOCK_INCLUDE_DIRS})
-#
-# add_executable(foo foo.cc)
-# target_link_libraries(foo ${GMOCK_BOTH_LIBRARIES})
-#
-#=============================================================================
-# This file is released under the MIT licence:
-#
-# Copyright (c) 2011 Matej Svec
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-#=============================================================================
-
-
-function(_gmock_append_debugs _endvar _library)
- if(${_library} AND ${_library}_DEBUG)
- set(_output optimized ${${_library}} debug ${${_library}_DEBUG})
- else()
- set(_output ${${_library}})
- endif()
- set(${_endvar} ${_output} PARENT_SCOPE)
-endfunction()
-
-function(_gmock_find_library _name)
- find_library(${_name}
- NAMES ${ARGN}
- HINTS
- $ENV{GMOCK_HOME}
- ${GMOCK_LIBRARIES_PATH}
- )
- mark_as_advanced(${_name})
-endfunction()
-
-
-if(NOT DEFINED GMOCK_MSVC_SEARCH)
- set(GMOCK_MSVC_SEARCH MD)
-endif()
-
-set(_gmock_libpath_suffixes lib)
-if(MSVC)
- if(GMOCK_MSVC_SEARCH STREQUAL "MD")
- list(APPEND _gmock_libpath_suffixes
- msvc/googlemock/Debug
- msvc/googlemock/Release)
- elseif(GMOCK_MSVC_SEARCH STREQUAL "MT")
- list(APPEND _gmock_libpath_suffixes
- msvc/googlemock/Debug
- msvc/googlemock/Release)
- endif()
-elseif(APPLE)
- list(APPEND _gmock_libpath_suffixes
- clang/googlemock)
-endif()
-
-find_path(GMOCK_INCLUDE_DIR gmock/gmock.h
- HINTS
- ${GMOCK_ROOT}/googlemock/include
-)
-
-find_path(GMOCK_GTEST_INCLUDE_DIR gtest/gtest.h
- HINTS
- ${GMOCK_ROOT}/googletest/include
-)
-
-mark_as_advanced(GMOCK_GTEST_INCLUDE_DIR)
-mark_as_advanced(GMOCK_INCLUDE_DIR)
-
-if(MSVC AND GMOCK_MSVC_SEARCH STREQUAL "MD")
- # The provided /MD project files for Google Mock add -md suffixes to the
- # library names.
- _gmock_find_library(GMOCK_LIBRARY gmock-md gmock)
- _gmock_find_library(GMOCK_LIBRARY_DEBUG gmock-mdd gmockd)
- _gmock_find_library(GMOCK_MAIN_LIBRARY gmock_main-md gmock_main)
- _gmock_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_main-mdd gmock_maind)
-else()
- _gmock_find_library(GMOCK_LIBRARY gmock)
- _gmock_find_library(GMOCK_LIBRARY_DEBUG gmockd)
- _gmock_find_library(GMOCK_MAIN_LIBRARY gmock_main)
- _gmock_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_maind)
-endif()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMock DEFAULT_MSG GMOCK_LIBRARY GMOCK_INCLUDE_DIR GMOCK_MAIN_LIBRARY)
-
-if(GMOCK_FOUND)
- set(GMOCK_INCLUDE_DIRS ${GMOCK_INCLUDE_DIR})
- _gmock_append_debugs(GMOCK_LIBRARIES GMOCK_LIBRARY)
- _gmock_append_debugs(GMOCK_MAIN_LIBRARIES GMOCK_MAIN_LIBRARY)
- set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES})
-endif()
diff --git a/CMake/CMakeMacros_old/GMock/Link.cmake b/CMake/CMakeMacros_old/GMock/Link.cmake
deleted file mode 100644
index 14b3300e5d4399ee9ae03e01b71ce5b0da736a93..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/GMock/Link.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-macro(linkGMock targetName)
- if(BUILD_SHARED_LIBS)
- add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY)
- endif()
-
-
- target_include_directories(${targetName} PRIVATE ${GMOCK_ROOT}/googlemock/include)
- target_include_directories(${targetName} PRIVATE ${GMOCK_ROOT}/googletest/include)
-
- target_link_libraries(${targetName} gmock gmock_main)
-endmacro(linkGMock)
diff --git a/CMake/CMakeMacros_old/JsonCpp/FindJsonCpp.cmake b/CMake/CMakeMacros_old/JsonCpp/FindJsonCpp.cmake
deleted file mode 100644
index a5ab3088f9698b6856d56ab0583f1ff36c313d04..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/JsonCpp/FindJsonCpp.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-
-find_path(JSONCPP_INCLUDE_DIRS json/json.h
- HINTS ${JSONCPP_ROOT} ENV JSONCPP_ROOT
- PATH_SUFFIXES include
- DOC "Directory where the JSONCPP header files are located"
-)
-
-
-
-find_library(JSONCPP_LIBRARIES
- NAMES jsoncpp.lib
- HINTS ${JSONCPP_LIBRARIES_PATH}
- DOC "Directory where the JSONCPP library is located"
-)
-
-
-# Standard package handling
-include(FindPackageHandleStandardArgs)
-if(CMAKE_VERSION VERSION_GREATER 2.8.2)
- find_package_handle_standard_args(JSONCPP
- REQUIRED_VARS JSONCPP_INCLUDE_DIRS JSONCPP_LIBRARIES)
-else()
- find_package_handle_standard_args(JSONCPP
- REQUIRED_VARS JSONCPP_INCLUDE_DIRS JSONCPP_LIBRARIES)
-endif()
-
-
-mark_as_advanced(JSONCPP_INCLUDE_DIRS JSONCPP_LIBRARIES)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/JsonCpp/Link.cmake b/CMake/CMakeMacros_old/JsonCpp/Link.cmake
deleted file mode 100644
index 3295ab1e7d13f1610c6443703e925eb4907b9b6b..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/JsonCpp/Link.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-macro(linkJsonCpp targetName)
-
- target_include_directories(${targetName} PUBLIC ${JSONCPP_ROOT}/include)
- target_link_libraries(${targetName} jsoncpp)
-
-endmacro(linkJsonCpp)
diff --git a/CMake/CMakeMacros_old/MacOSXBundle/Info.plist b/CMake/CMakeMacros_old/MacOSXBundle/Info.plist
deleted file mode 100644
index 51f91e9edb97da29dc3188f939391a81d13c9dab..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/MacOSXBundle/Info.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleExecutable</key>
- <string>${targetName}</string>
- <key>CFBundleName</key>
- <string>${targetName}</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
-</dict>
-</plist>
diff --git a/CMake/CMakeMacros_old/MacOSXBundle/MacOSXBundle.cmake b/CMake/CMakeMacros_old/MacOSXBundle/MacOSXBundle.cmake
deleted file mode 100644
index 981b8697ad97ffef40642650cdd7d9d3c9da35f1..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/MacOSXBundle/MacOSXBundle.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-macro(bundleTargetForMacOSX targetName)
-
- set_target_properties(${targetName} PROPERTIES MACOSX_BUNDLE ON)
- set_target_properties(${targetName} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/MacOSXBundle/Info.plist)
-
-endmacro(bundleTargetForMacOSX)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/MathLink/Link.cmake b/CMake/CMakeMacros_old/MathLink/Link.cmake
deleted file mode 100644
index ca929fe98b1311866266b3ebca5f965e8e7d9a65..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/MathLink/Link.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-
-macro(linkMathLink targetName)
-
- include_directories(${MATHLINK_ROOT})
- target_link_libraries(${targetName} ${MATHLINK_ROOT}\\wstp64i4.lib)
-
-endmacro(linkMathLink)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/Metis/FindMetis.cmake b/CMake/CMakeMacros_old/Metis/FindMetis.cmake
deleted file mode 100644
index b6c539da2d29316b94a45062d861fa45a03725b7..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/Metis/FindMetis.cmake
+++ /dev/null
@@ -1,102 +0,0 @@
-# - Try to find METIS
-# Once done this will define
-#
-# METIS_FOUND - system has METIS
-# METIS_INCLUDE_DIRS - include directories for METIS
-# METIS_LIBRARIES - libraries for METIS
-#
-# Variables used by this module. They can change the default behaviour and
-# need to be set before calling find_package:
-#
-# METIS_DIR - Prefix directory of the METIS installation
-# METIS_INCLUDE_DIR - Include directory of the METIS installation
-# (set only if different from ${METIS_DIR}/include)
-# METIS_LIB_DIR - Library directory of the METIS installation
-# (set only if different from ${METIS_DIR}/lib)
-# METIS_TEST_RUNS - Skip tests building and running a test
-# executable linked against METIS libraries
-# METIS_LIB_SUFFIX - Also search for non-standard library names with the
-# given suffix appended
-#
-# NOTE: This file was modified from a ParMETIS detection script
-
-#=============================================================================
-# Copyright (C) 2015 Jack Poulson. All rights reserved.
-#
-# Copyright (C) 2010-2012 Garth N. Wells, Anders Logg, Johannes Ring
-# and Florian Rathgeber. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-if(NOT METIS_INCLUDE_DIR)
- find_path(METIS_INCLUDE_DIR metis.h
- HINTS ${METIS_ROOT} ENV METIS_ROOT
- PATH_SUFFIXES include
- DOC "Directory where the METIS header files are located"
- )
-endif()
-
-if(NOT METIS_LIBRARY)
- find_library(METIS_LIBRARY
- NAMES metis metis${METIS_LIB_SUFFIX}
- HINTS ${METIS_LIBRARIES_PATH}
- DOC "Directory where the METIS library is located"
- )
-endif()
-
-# Get METIS version
-if(NOT METIS_VERSION_STRING AND METIS_INCLUDE_DIR AND EXISTS "${METIS_INCLUDE_DIR}/metis.h")
- set(version_pattern "^#define[\t ]+METIS_(MAJOR|MINOR)_VERSION[\t ]+([0-9\\.]+)$")
- file(STRINGS "${METIS_INCLUDE_DIR}/metis.h" metis_version REGEX ${version_pattern})
-
- foreach(match ${metis_version})
- if(METIS_VERSION_STRING)
- set(METIS_VERSION_STRING "${METIS_VERSION_STRING}.")
- endif()
- string(REGEX REPLACE ${version_pattern} "${METIS_VERSION_STRING}\\2" METIS_VERSION_STRING ${match})
- set(METIS_VERSION_${CMAKE_MATCH_1} ${CMAKE_MATCH_2})
- endforeach()
- unset(metis_version)
- unset(version_pattern)
-endif()
-
-# Standard package handling
-include(FindPackageHandleStandardArgs)
-if(CMAKE_VERSION VERSION_GREATER 2.8.2)
- find_package_handle_standard_args(METIS
- REQUIRED_VARS METIS_LIBRARY METIS_INCLUDE_DIR
- VERSION_VAR METIS_VERSION_STRING)
-else()
- find_package_handle_standard_args(METIS
- REQUIRED_VARS METIS_LIBRARY METIS_INCLUDE_DIR)
-endif()
-
-if(METIS_FOUND)
- set(METIS_LIBRARIES ${METIS_LIBRARY})
- set(METIS_INCLUDE_DIRS ${METIS_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(METIS_INCLUDE_DIR METIS_LIBRARY)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/Metis/Link.cmake b/CMake/CMakeMacros_old/Metis/Link.cmake
deleted file mode 100644
index fefa255699dd03672fa6e52a0cb6969664e5160f..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/Metis/Link.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-macro(linkMetis targetName)
-
- include_directories(${METIS_ROOT}/include)
- target_link_libraries(${targetName} metis)
-
-endmacro(linkMetis)
diff --git a/CMake/CMakeMacros_old/Qt/Link.cmake b/CMake/CMakeMacros_old/Qt/Link.cmake
deleted file mode 100644
index d7104456382b6f19a1a2210525fc0dafc0a03eb7..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/Qt/Link.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-macro(linkQt targetName)
-
- find_package(Qt5Core)
- find_package(Qt5Widgets)
- find_package(Qt5Gui)
- find_package(Qt5PrintSupport)
- find_package(Qt5Charts)
-
- include_directories(${QT5Widgets_INCLUDES})
- include_directories(${QT5Core_INCLUDES})
- include_directories(${QT5Gui_INCLUDES})
- include_directories(${QT5PrintSupport_INCLUDES})
-
- add_definitions(${Qt5Widgets_DEFINITIONS})
- add_definitions(${Qt5Core_DEFINITIONS})
- add_definitions(${Qt5Gui_DEFINITIONS})
- add_definitions(${Qt5PrintSupport_DEFINITIONS})
-
- target_link_libraries(${targetName} Qt5::Widgets)
- target_link_libraries(${targetName} Qt5::Core)
- target_link_libraries(${targetName} Qt5::PrintSupport)
- target_link_libraries(${targetName} Qt5::Charts)
-
-endmacro(linkQt)
diff --git a/CMake/CMakeMacros_old/README.md b/CMake/CMakeMacros_old/README.md
deleted file mode 100644
index 6d5da0578cec2da781912debff5f5c02a2f5db40..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# CMake Macros
-
-The cmake macros provide the functionalities for creating targets (executables and libraries), finding files and linking against common libraries.
-
-This repository provides only the macros, which can be integrated in your cmake project as (e.g.) git subtree or just downloaded and copied into the project folder. An usage of this macros with a lot of examples can be found here: [CMake Template on Github](https://github.com/ClubOfDigitalEngineering/CMakeTemplate "CMake Template on Github").
-
-To make it work:
-- copy the file 'Machinefiles/Isildur'
-- rename it to your pc-name (e.g. 'Foos Computer')
-- set the paths to the existing libaries
-
-### The CMake Macros provide macros to link:
-- Boost
-- Cocoa
-- Cuda
-- GoogleMock
-- JsonCpp
-- MPI
-- Metis
-- OpenMP
-- Qt
-- VTK
diff --git a/CMake/CMakeMacros_old/VTK/Link.cmake b/CMake/CMakeMacros_old/VTK/Link.cmake
deleted file mode 100644
index c1fb103c395a72b7f7a557e8e053f8f28e98401c..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/VTK/Link.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-macro(linkVTK targetName)
- find_package(VTK REQUIRED)
-
- include(${VTK_USE_FILE})
- include_directories(${VTK_INCLUDE_DIRS})
-
- target_link_libraries(${targetName} ${VTK_LIBRARIES})
-endmacro(linkVTK)
diff --git a/CMake/CMakeMacros_old/fftw/FindFftw.cmake b/CMake/CMakeMacros_old/fftw/FindFftw.cmake
deleted file mode 100644
index ce84cc9c4ceee0abed886cc127ffb17f2227d939..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/fftw/FindFftw.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-
-find_path(FFTW_INCLUDE_DIRS fftw3.h
- HINTS ${FFTW_ROOT} ENV FFTW_ROOT
- PATH_SUFFIXES include
- DOC "Directory where the FFTW header files are located"
-)
-
-
-
-find_library(FFTW_LIBRARIES
- NAMES libfftw3-3.lib libfftw3f-3.lib libfftw3l-3.lib
- HINTS ${FFTW_LIBRARIES_PATH}
- DOC "Directory where the FFTW library is located"
-)
-
-
-# Standard package handling
-include(FindPackageHandleStandardArgs)
-if(CMAKE_VERSION VERSION_GREATER 2.8.2)
- find_package_handle_standard_args(FFTW
- REQUIRED_VARS FFTW_INCLUDE_DIRS FFTW_LIBRARIES)
-else()
- find_package_handle_standard_args(FFTW
- REQUIRED_VARS FFTW_INCLUDE_DIRS FFTW_LIBRARIES)
-endif()
-
-
-mark_as_advanced(FFTW_INCLUDE_DIRS FFTW_LIBRARIES)
-
diff --git a/CMake/CMakeMacros_old/fftw/Link.cmake b/CMake/CMakeMacros_old/fftw/Link.cmake
deleted file mode 100644
index 773c45bdf88eab9c090149bce38a211e14235804..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/fftw/Link.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-
-macro(linkFftw targetName)
-
- include_directories(${FFTW_ROOT}/api)
- target_link_libraries(${targetName} fftw3)
-
-endmacro(linkFftw)
diff --git a/CMake/CMakeMacros_old/general/BuildTarget.cmake b/CMake/CMakeMacros_old/general/BuildTarget.cmake
deleted file mode 100644
index a0ca7bd19b0328b91139d8892780d8cebc165c5a..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/general/BuildTarget.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-macro(buildExe targetName sourceFiles linkDirs libsToLink includeDirs)
- setLinkDirectories("${linkDirs}")
-
- message(STATUS "build target: " ${targetName})
- add_executable(${targetName} "${sourceFiles}")
-
- linkLibraries(${targetName} "${libsToLink}")
- setIncludeDirectories(${targetName} "${includeDirs}")
-
-endmacro(buildExe)
-
-macro(buildLib targetName sourceFiles linkDirs libsToLink includeDirs)
- setLinkDirectories("${linkDirs}")
-
- message(STATUS "build target: " ${targetName})
- add_library(${targetName} ${LIB_TYPE} ${sourceFiles})
-
- linkLibraries(${targetName} "${libsToLink}")
- setIncludeDirectories(${targetName} "${includeDirs}")
-
-endmacro(buildLib)
-
-
-macro(setLinkDirectories linkDirs)
- foreach(dir ${linkDirs})
- link_directories(${dir})
- endforeach()
-endmacro(setLinkDirectories)
-
-macro(linkLibraries targetName libsToLink)
- foreach(lib ${libsToLink})
- target_link_libraries(${targetName} ${lib})
- endforeach()
-endmacro(linkLibraries)
-
-macro(setIncludeDirectories targetName includeDirs)
- foreach(dir ${includeDirs})
- target_include_directories(${targetName} PRIVATE ${dir})
- endforeach()
-endmacro(setIncludeDirectories)
-
-include (GenerateExportHeader)
-macro(generateExportHeader libName path)
- if(${BUILD_SHARED_LIBS})
- GENERATE_EXPORT_HEADER (${libName}
- BASE_NAME ${libName}
- EXPORT_MACRO_NAME ${libName}_EXPORT
- EXPORT_FILE_NAME ${path}/${libName}_EXPORT.h
- STATIC_DEFINE ${libName}_BUILT_AS_STATIC
- )
- endif()
-endmacro(generateExportHeader)
-
-macro(groupTarget targetName folderName)
- set_property( TARGET ${targetName} PROPERTY FOLDER ${folderName} )
-endmacro(groupTarget)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/general/BuildTargetUtilities.cmake b/CMake/CMakeMacros_old/general/BuildTargetUtilities.cmake
deleted file mode 100644
index 1a30805c4eb487686ced003a7e6cf616e0950d9b..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/general/BuildTargetUtilities.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-macro(sharedLibs)
- if(${BUILD_SHARED_LIBS})
- set(LIB_TYPE SHARED)
- else()
- set(LIB_TYPE STATIC)
-
- set(CompilerFlags
- CMAKE_CXX_FLAGS
- CMAKE_CXX_FLAGS_DEBUG
- CMAKE_CXX_FLAGS_RELEASE
- CMAKE_C_FLAGS
- CMAKE_C_FLAGS_DEBUG
- CMAKE_C_FLAGS_RELEASE
- )
- foreach(CompilerFlag ${CompilerFlags})
- string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
- endforeach()
-
- set(CompilerFlagsCuda
- CMAKE_CUDA_FLAGS
- CMAKE_CUDA_FLAGS_DEBUG
- CMAKE_CUDA_FLAGS_MINSIZEREL
- CMAKE_CUDA_FLAGS_RELEASE
- CMAKE_CUDA_FLAGS_RELWITHDEBINFO
- )
- foreach(CompilerFlag ${CompilerFlagsCuda})
- string(REPLACE "-MD" "-MT" ${CompilerFlag} "${${CompilerFlag}}")
- endforeach()
- endif()
-endmacro(sharedLibs)
-
-
-
-########################################################################
-# AllTest Option #
-########################################################################
-
-macro(activateAllTestOption)
- set(isAllTestSuite ON)
-endmacro(activateAllTestOption)
-
-
-macro(deactivateAllTestOption)
- set(isAllTestSuite OFF)
-endmacro(deactivateAllTestOption)
-
-
-########################################################################
-# target name #
-########################################################################
-
-macro(setTargetNameToFolderName path)
- get_filename_component(targetName "${path}" NAME)
-endmacro(setTargetNameToFolderName)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/general/EndingsToCollect.cmake b/CMake/CMakeMacros_old/general/EndingsToCollect.cmake
deleted file mode 100644
index f4ca6725f1eab64314ff01df1f247f13a0dcefe0..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/general/EndingsToCollect.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-macro(addFileEndingToCollect file_ending)
- #input: file_ending --> appends it to the list of files to collect
-
- list (FIND FILES_TO_COLLECT ${file_ending} index)
- if (${index} EQUAL -1)
- set(FILES_TO_COLLECT ${FILES_TO_COLLECT} ${file_ending})
- endif()
-
- #output: files_to_collect
-endmacro(addFileEndingToCollect)
-
-
-
-macro(resetFileEndingsToCollect)
- unset(FILES_TO_COLLECT)
-endmacro(resetFileEndingsToCollect)
-
-
-
-
-macro(addCAndCPPFileTypes)
- addFileEndingToCollect("*.h")
- addFileEndingToCollect("*.c")
- addFileEndingToCollect("*.cpp")
- addFileEndingToCollect("*.cxx")
- addFileEndingToCollect("*.hpp")
- addFileEndingToCollect("*.cu")
- addFileEndingToCollect("*.cuh")
-endmacro(addCAndCPPFileTypes)
-
-
-macro(addObjCAndObjCPPFileTypesToCollect)
- addFileEndingToCollect("*.m")
- addFileEndingToCollect("*.mm")
- addFileEndingToCollect("*.h")
-endmacro(addObjCAndObjCPPFileTypesToCollect)
diff --git a/CMake/CMakeMacros_old/general/FileUtilities.cmake b/CMake/CMakeMacros_old/general/FileUtilities.cmake
deleted file mode 100644
index 4e9b35370ba22103e87df2a709d9721275270e37..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/general/FileUtilities.cmake
+++ /dev/null
@@ -1,109 +0,0 @@
-macro(includeRecursiveAllFilesFrom targetName path)
- set(collectTestFiles ON)
- set(collectProductionFiles ON)
-
- includeRecursiveFilesFrom(${targetName} ${path})
-endmacro(includeRecursiveAllFilesFrom)
-
-
-
-macro(includeRecursiveProductionFilesFrom targetName path)
- set(collectTestFiles OFF)
- set(collectProductionFiles ON)
-
- includeRecursiveFilesFrom(${targetName} ${path})
-endmacro(includeRecursiveProductionFilesFrom)
-
-
-
-macro(includeRecursiveTestFilesFrom targetName path)
- set(collectTestFiles ON)
- set(collectProductionFiles OFF)
-
- includeRecursiveFilesFrom(${targetName} ${path})
-endmacro(includeRecursiveTestFilesFrom)
-
-
-
-
-macro(includeRecursiveFilesFrom targetName path)
- file(GLOB_RECURSE includeSourcePaths ${path}/package.include)
-
- foreach(package ${includeSourcePaths})
- get_filename_component(package_dir ${package} DIRECTORY)
- collectFilesFrom(${package_dir} "${FILES_TO_COLLECT}")
- setSourceGroupForFilesIn(${package_dir} ${targetName})
- endforeach()
-endmacro(includeRecursiveFilesFrom)
-
-
-
-macro(collectFilesFrom path file_endings)
- #input: path from files to collect
- unset(COLLECTED_FILES_IN_PATH)
- unset(ALL_FILES_IN_PATH)
-
- foreach(_ending ${file_endings})
- FILE(GLOB filesWithEnding ${path}/${_ending})
- set(ALL_FILES_IN_PATH ${ALL_FILES_IN_PATH} ${filesWithEnding})
- endforeach()
-
- foreach(_file ${ALL_FILES_IN_PATH})
- get_filename_component(fileName ${_file} NAME)
- if(collectTestFiles)
- if(${fileName} MATCHES "Test" OR ${fileName} MATCHES "Mock")
- set(COLLECTED_FILES_IN_PATH ${COLLECTED_FILES_IN_PATH} ${_file})
- endif()
- endif()
- if(collectProductionFiles)
- if(NOT ${fileName} MATCHES "Test" AND NOT ${fileName} MATCHES "Mock")
- set(COLLECTED_FILES_IN_PATH ${COLLECTED_FILES_IN_PATH} ${_file})
- endif()
- endif()
- endforeach()
- set(MY_SRCS ${MY_SRCS} ${COLLECTED_FILES_IN_PATH})
-
- #output: MY_SRCS
-endmacro(collectFilesFrom)
-
-
-
-
-macro(setSourceGroupForFilesIn package_dir targetName)
-#input: target_name PACKAGE_SRCS
- buildSourceGroup(${targetName} ${package_dir})
-
- if(isAllTestSuite)
- source_group(${targetName}\\${SOURCE_GROUP} FILES ${COLLECTED_FILES_IN_PATH})
- else()
- source_group(${SOURCE_GROUP} FILES ${COLLECTED_FILES_IN_PATH})
- endif()
-#output: -
-endmacro(setSourceGroupForFilesIn)
-
-
-
-
-macro(buildSourceGroup targetName path)
-#input: targetName (e.g. lib name, exe name)
-
- unset(SOURCE_GROUP)
- string(REPLACE "/" ";" folderListFromPath ${path})
- set(findTargetName 0)
-
- foreach(folder ${folderListFromPath})
- if(findTargetName)
- set(SOURCE_GROUP ${SOURCE_GROUP}\\${folder})
- endif()
-
- if(${folder} STREQUAL ${targetName})
- SET(findTargetName 1)
- endif()
- endforeach()
-
- if(NOT SOURCE_GROUP)
- set(SOURCE_GROUP "general")
- endif()
-
-#output: SOURCE_GROUP
-endmacro(buildSourceGroup)
\ No newline at end of file
diff --git a/CMake/CMakeMacros_old/general/FindCompiler.cmake b/CMake/CMakeMacros_old/general/FindCompiler.cmake
deleted file mode 100644
index a878b377a03c99a676d842d60595d079439000f8..0000000000000000000000000000000000000000
--- a/CMake/CMakeMacros_old/general/FindCompiler.cmake
+++ /dev/null
@@ -1,92 +0,0 @@
-#############################################################
-### COMPILER DETECTION ###
-#############################################################
-# Check for intel compiler
-if( CMAKE_CXX_COMPILER MATCHES "icpc" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "icpc" )
- option ( VF_CXX_COMPILER_IS_INTEL "Use Intel compiler" ON )
- # Intel(R) Compiler has its own library archiver,
- # if you build libraries and do not use xiar,
- # the Intel compiler will complain about invalid
- # archives at the link phase.
- # The Intel(R) archiver is "xiar" usually
- # located in the same folder as the compiler,
- FIND_PROGRAM(XIAR xiar)
- IF(XIAR)
- SET(CMAKE_AR "${XIAR}")
- ENDIF(XIAR)
- MARK_AS_ADVANCED(XIAR)
-
- # Intel(R) Compiler also comes with its own linker
- # which provides a number of additional benefits when
- # linking code compiled with the Intel(R) compiler.
- # Again, usually in the same place as icc itself,
- FIND_PROGRAM(XILD xild)
- IF(XILD)
- SET(CMAKE_LINKER "${XILD}")
- ENDIF(XILD)
- MARK_AS_ADVANCED(XILD)
-else()
- option ( VF_CXX_COMPILER_IS_INTEL "Use Intel compiler" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_INTEL )
-
-# Check for Gnu compiler
-if ( CMAKE_COMPILER_IS_GNUCXX AND NOT VF_CXX_COMPILER_IS_INTEL )
- option ( VF_CXX_COMPILER_IS_GNU "Use gnu compiler" ON )
-else()
- option ( VF_CXX_COMPILER_IS_GNU "Use gnu compiler" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_GNU )
-
-# Check for Visual Studio
-if(MSVC)
- option (VF_CXX_COMPILER_IS_MSVC "Use Visual Studio compiler" ON)
-else()
- option (VF_CXX_COMPILER_IS_MSVC "Use Visual Studio compiler" OFF)
-endif()
-mark_as_advanced(VF_CXX_COMPILER_IS_MSVC)
-
-# Check for IBM compiler
-if( CMAKE_CXX_COMPILER MATCHES "xlc" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "xlc" )
- option ( VF_CXX_COMPILER_IS_IBM "Use IBM compiler" ON )
-else()
- option ( VF_CXX_COMPILER_IS_IBM "Use IBM compiler" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_IBM )
-
-# Check for NEC SX compiler
-if( CMAKE_CXX_COMPILER MATCHES "sxc" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "sxc" OR CMAKE_CXX_COMPILER MATCHES "sxmpic" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "sxmpic" )
- option ( VF_CXX_COMPILER_IS_NEC "Use NEC compiler" ON )
-else()
- option ( VF_CXX_COMPILER_IS_NEC "Use NEC compiler" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_NEC )
-
-# Check for Clang compiler
-if( CMAKE_CXX_COMPILER MATCHES "clang" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
- option ( VF_CXX_COMPILER_IS_CLANG "Use clang compiler" ON )
-else()
- option ( VF_CXX_COMPILER_IS_CLANG "Use clang compiler" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_CLANG )
-
-if( CMAKE_CXX_COMPILER_ID MATCHES Cray )
- option ( VF_CXX_COMPILER_IS_CRAY "Use Cray compiler" ON )
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.4)
- message( FATAL_ERROR "Insufficient Cray Compiler Environment version" )
- endif()
-else()
- option ( VF_CXX_COMPILER_IS_CRAY "Use Cray compiler" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_CRAY )
-
-# Check for MPI wrapper
-get_filename_component( CXX_COMPILER_WITHOUT_PATH ${CMAKE_CXX_COMPILER} NAME )
-if( CXX_COMPILER_WITHOUT_PATH MATCHES "mpi" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "mpi" )
- option ( VF_CXX_COMPILER_IS_MPI_WRAPPER "Compiler is MPI wrapper" ON )
-else()
- option ( VF_CXX_COMPILER_IS_MPI_WRAPPER "Compiler is MPI wrapper" OFF )
-endif()
-mark_as_advanced ( VF_CXX_COMPILER_IS_MPI_WRAPPER )
-
-############################################################################################################################
diff --git a/CMake/CMakeSetCompilerFlags.cmake b/CMake/CMakeSetCompilerFlags.cmake
index 7197caaa64838edbcfbd421af334dd29fe4362ba..9ecf187011e5ddd2564ee8ffb25ef77c53ded423 100644
--- a/CMake/CMakeSetCompilerFlags.cmake
+++ b/CMake/CMakeSetCompilerFlags.cmake
@@ -1,154 +1,89 @@
+
+###############################################################
+# set hostname -> CAB_MACHINE and load an optional config file
+###############################################################
+macro(loadMachineFile)
+
+ IF(NOT CAB_MACHINE)
+ SET(CAB_MACHINE $ENV{CAB_MACHINE})
+
+ IF( CAB_MACHINE )
+ STRING(TOUPPER "${CAB_MACHINE}" CAB_MACHINE)
+ ELSE()
+ EXECUTE_PROCESS( COMMAND hostname OUTPUT_VARIABLE CAB_MACHINE)
+ STRING(REGEX REPLACE "[ ]*([A-Za-z0-9]+).*[\\\\n]*" "\\1" CAB_MACHINE "${CAB_MACHINE}" )
+ STRING(TOUPPER "${CAB_MACHINE}" CAB_MACHINE)
+ ENDIF()
+ ENDIF()
+
+ LIST(APPEND VF_COMPILER_DEFINITION CAB_MACHINE=${CAB_MACHINE})
+ SET(CMAKE_CONFIG_FILE "${VF_CMAKE_DIR}/cmake_config_files/${CAB_MACHINE}.config.cmake")
+
+ IF(NOT EXISTS ${CMAKE_CONFIG_FILE})
+ status("No configuration file found.")
+ ELSE()
+ status("Load configuration file ${CAB_MACHINE}.config.cmake")
+ include(${CMAKE_CONFIG_FILE})
+ ENDIF()
+
+endmacro()
+
+
################################################################
### SET_COMPILER_SPECIFIC_FLAGS ###
-### determines compiler flags variabels ###
-### compiler_type: e.g. msvc9_x64 ###
-### build_type : BINARY, STATIC, SHARED ###
+### determines compiler flags variables ###
################################################################
-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
- ###############################################################################################################
- SET(CAB_COMPILER_ADDITIONAL_LINK_PROPS "")
- SET(CAB_COMPILER_ADDITIONAL_LINK_PROPS_DEBUG "")
- SET(CAB_COMPILER_ADDITIONAL_LINK_PROPS_RELEASE "")
-
+macro(loadCompilerFlags)
+
SET(CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "")
SET(CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "")
SET(CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "")
- SET(CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "")
- SET(CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS_DEBUG "")
- SET(CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS_RELEASE "")
+ # https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_ID.html#variable:CMAKE_<LANG>_COMPILER_ID
- ###############################################################################################################
- ## ggf. spezielles compiler flag file lesen
- ###############################################################################################################
IF( SPECIFIC_COMPILER_FLAG_FILE )
- INCLUDE( ${SPECIFIC_COMPILER_FLAG_FILE})
- ###############################################################################################################
- ## standard compiler flags
- ###############################################################################################################
- ELSEIF( EXISTS "${VF_CMAKE_DIR}/compilerflags/${CAB_COMPILER}.cmake" )
- INCLUDE( ${VF_CMAKE_DIR}/compilerflags/${CAB_COMPILER}.cmake)
- ###############################################################################################################
- ## unknown compiler
- ###############################################################################################################
+ include( ${SPECIFIC_COMPILER_FLAG_FILE})
+ ELSEIF( EXISTS "${VF_CMAKE_DIR}/compilerflags/${CMAKE_CXX_COMPILER_ID}.cmake" )
+ status("Load compiler file: ${CMAKE_CXX_COMPILER_ID}.cmake")
+ include(${VF_CMAKE_DIR}/compilerflags/${CMAKE_CXX_COMPILER_ID}.cmake)
ELSE()
- #MESSAGE(FATAL_ERROR "CAB_COMPILER=${CAB_COMPILER} seems to be a not supported compiler")
- #MESSAGE(WARNING "CAB_COMPILER=${CAB_COMPILER} seems to be a not supported compiler; set to generic")
- SET(CAB_COMPILER "gccGeneric")
- INCLUDE( ${VF_CMAKE_DIR}/compilerflags/${CAB_COMPILER}.cmake)
+ MESSAGE(FATAL_ERROR "compiler=${CMAKE_CXX_COMPILER_ID} seems to be a not supported compiler")
ENDIF()
-
-
- ###############################################################################################################
- #64 Bit compilation??
- ###############################################################################################################
- IF(NOT DEFINED USE_64BIT_COMPILER_OPTIONS)
- IF(MSVC AND NOT CMAKE_CL_64)
- SET(OPTION64 OFF)
- ELSEIF(MSVC AND CMAKE_CL_64)
- SET(OPTION64 ON)
- ELSE()
- IS_64BIT_SYSTEM( IS64BITSYSTEM )
- IF(IS64BITSYSTEM STREQUAL "TRUE")
- SET(OPTION64 ON)
- ELSE()
- SET(OPTION64 OFF)
- ENDIF()
- ENDIF()
- ENDIF()
-
- OPTION(USE_64BIT_COMPILER_OPTIONS "set 64 bit compiler flags" ${OPTION64})
-
- ###############################################################################################################
- # 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()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS compiler_type build_type)
+
+endmacro()
################################################################
### ADD_COMPILER_FLAGS_TO_PROJECT ###
-### adds COMPILER_FLGAS TO project ###
-### project_language: CXX , C ###
################################################################
-MACRO(ADD_COMPILER_FLAGS_TO_PROJECT compiler_type project_name project_language build_type)
-
- IF(NOT ${project_language} MATCHES "C")
- IF(NOT ${project_language} MATCHES "CXX")
- MESSAGE(FATAL_ERROR "project_language must be CXX or C")
- ENDIF()
- ENDIF()
-
- ################################################################
- # SET_COMPILER_SPECIFIC_FLAGS
- ################################################################
- SET_COMPILER_SPECIFIC_FLAGS( ${compiler_type} ${build_type} )
-
- #workaround fuer itanium processoren
- IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ia64")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS -D_M_IA64)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS -D_M_IA64)
- ENDIF()
-
- ################################################################
- # LINKER PROPS
- ################################################################
- status("additional linker probs: ${CAB_COMPILER_ADDITIONAL_LINK_PROPS}")
-
- IF(CAB_COMPILER_ADDITIONAL_LINK_PROPS)
- ADD_TARGET_PROPERTIES(${project_name} LINK_FLAGS ${CAB_COMPILER_ADDITIONAL_LINK_PROPS})
- ENDIF()
- IF(CAB_COMPILER_ADDITIONAL_LINK_PROPS_DEBUG)
- ADD_TARGET_PROPERTIES(${project_name} LINK_FLAGS ${CAB_COMPILER_ADDITIONAL_LINK_PROPS_DEBUG})
- ENDIF()
- IF(CAB_COMPILER_ADDITIONAL_LINK_PROPS_RELEASE)
- ADD_TARGET_PROPERTIES(${project_name} LINK_FLAGS ${CAB_COMPILER_ADDITIONAL_LINK_PROPS_RELEASE})
- ENDIF()
-
- ################################################################
- # COMPILER FLAGS
- ################################################################
- #message (COMPILE FLAGS INTERN: ${CAB_COMPILER_ADDTIONAL_${project_language}_COMPILER_FLAGS})
-
- # TODO: Clean this up!!
- IF(CAB_COMPILER_ADDTIONAL_${project_language}_COMPILER_FLAGS)
- #message (COMPILE FLAGS INTERN: ${CAB_COMPILER_ADDTIONAL_${project_language}_COMPILER_FLAGS})
- foreach(flag IN LISTS CAB_COMPILER_ADDTIONAL_${project_language}_COMPILER_FLAGS)
- #message(compiler option: ${flag})
- target_compile_options(${project_name} PRIVATE "$<$<COMPILE_LANGUAGE:${project_language}>:${flag}>")
- endforeach()
- #get_target_property(var ${project_name} COMPILE_OPTIONS)
- #message(set compile options: ${var})
-
- #add_custom_command(TARGET ${project_name} POST_BUILD COMMAND echo built with the flags: ${var})
- #ADD_TARGET_PROPERTIES(${project_name} COMPILE_FLAGS ${CAB_COMPILER_ADDTIONAL_${project_language}_COMPILER_FLAGS})
- #target_compile_options (${project_name} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${CAB_COMPILER_ADDTIONAL_${project_language}_COMPILER_FLAGS}>)
- ENDIF()
- IF(CAB_COMPILER_ADDTIONAL_${project_language}_COMPILER_FLAGS_DEBUG)
- MESSAGE(STATUS "ADD_COMPILER_FLAGS_TO_PROJECT: sorry, a long as CMake has no support for COMPILE_FLAGS_<CONFIG> -> DEBUG flags are neglected")
- #ADD_TARGET_PROPERTIES(${project_name} COMPILE_FLAGS_DEBUG ${CAB_COMPILER_ADDTIONAL_${project_language}_COMPILER_FLAGS_DEBUG})
- ENDIF()
- IF(CAB_COMPILER_ADDTIONAL_${project_language}_COMPILER_FLAGS_RELEASE)
- MESSAGE(STATUS "ADD_COMPILER_FLAGS_TO_PROJECT: sorry, a long as CMake has no support for COMPILE_FLAGS_<CONFIG> -> RELEASE flags are set for RELEASE AND DEBUG")
- ADD_TARGET_PROPERTIES(${project_name} COMPILE_FLAGS ${CAB_COMPILER_ADDTIONAL_${project_language}_COMPILER_FLAGS_RELEASE})
- #ADD_TARGET_PROPERTIES(${project_name} COMPILE_FLAGS_RELEASE ${CAB_COMPILER_ADDTIONAL_${project_language}_COMPILER_FLAGS_RELEASE})
- ENDIF()
-
-
-ENDMACRO(ADD_COMPILER_FLAGS_TO_PROJECT compiler_type project_name project_language build_type)
\ No newline at end of file
+function(addAdditionalFlags project_name)
+
+ status_lib("additional compiler flags CXX: ${CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS}")
+ status_lib("additional compiler flags CXX debug: ${CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG}")
+ status_lib("additional compiler flags CXX release: ${CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE}")
+ status_lib("additional compiler definitions: ${VF_COMPILER_DEFINITION}")
+ status_lib("additional linker flags: ${VF_LINK_OPTIONS}")
+
+ # compile definitions
+ foreach(flag IN LISTS VF_COMPILER_DEFINITION)
+ target_compile_definitions(${library_name} PRIVATE ${flag})
+ endforeach()
+
+ # link options
+ foreach(flag IN LISTS VF_LINK_OPTIONS) #TODO: check what happens when lib is static
+ target_link_options(${library_name} PRIVATE ${flag})
+ endforeach()
+
+ # compile options
+ foreach(flag IN LISTS CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS)
+ target_compile_options(${project_name} PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${flag}>")
+ endforeach()
+
+ foreach(flag IN LISTS CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG)
+ target_compile_options(${project_name} PRIVATE "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>:${flag}>")
+ endforeach()
+
+ foreach(flag IN LISTS CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE)
+ target_compile_options(${project_name} PRIVATE "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>:${flag}>")
+ endforeach()
+
+endfunction()
\ No newline at end of file
diff --git a/CMake/VirtualFluidsMacros.cmake b/CMake/VirtualFluidsMacros.cmake
index 83274c2fb21a54d8aead43e1215c3f1c53cea4f3..676353ea2c2e03f2f55e096948643f85f8b87ec0 100644
--- a/CMake/VirtualFluidsMacros.cmake
+++ b/CMake/VirtualFluidsMacros.cmake
@@ -8,9 +8,49 @@
#################################################################################
function(status msg)
- message(STATUS " VF - ${msg}")
+ message(STATUS " VF: ${msg}")
endfunction()
+function(status_lib msg)
+ message(STATUS " ${msg}")
+endfunction()
+
+#################################################################################
+## include intern macros
+#################################################################################
+include(${VF_CMAKE_DIR}/CMakeSetCompilerFlags.cmake)
+include(${VF_CMAKE_DIR}/FileUtilities.cmake)
+include(${VF_CMAKE_DIR}/3rd.cmake)
+
+###############################################################################################################
+# Reset the compiler and linker flags
+###############################################################################################################
+SET(VF_COMPILER_DEFINITION)
+SET(VF_LINK_OPTIONS)
+SET(CAB_ADDITIONAL_LINK_LIBRARIES)
+LIST(APPEND VF_COMPILER_DEFINITION SOURCE_ROOT=${VF_ROOT_DIR} )
+
+#################################################################
+### OS DEFINES ###
+#################################################################
+IF(WIN32)
+ list(APPEND VF_COMPILER_DEFINITION __WIN__)
+ELSEIF(UNIX)
+ list(APPEND VF_COMPILER_DEFINITION __unix__)
+ENDIF()
+
+IF(APPLE)
+ list(APPEND VF_COMPILER_DEFINITION __APPLE__)
+endif()
+
+list(APPEND VF_COMPILER_DEFINITION ${CMAKE_CXX_COMPILER_ID})
+
+#################################################################
+### load compiler and machine file ###
+#################################################################
+loadMachineFile()
+loadCompilerFlags()
+
#################################################################################
## set global project file endings
#################################################################################
@@ -46,9 +86,9 @@ endfunction()
#################################################################################
## Add a target, link the libraries and add the compiler flags to the target
-## The name of the target is vf_get_library_name().
##
## parameter:
+## NAME - Name of the target. If not passed the name is vf_get_library_name().
## BUILDTYPE - STATIC; SHARED; EXECUTABLE
## DEPENDS - libraries to link
## FILES - adds these files to the target
@@ -63,10 +103,14 @@ function(vf_add_library)
set( options )
set( oneValueArgs )
- set( multiValueArgs BUILDTYPE DEPENDS FILES FOLDER EXCLUDE)
+ set( multiValueArgs NAME BUILDTYPE DEPENDS FILES FOLDER EXCLUDE)
cmake_parse_arguments( ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
- vf_get_library_name (library_name)
+ if(${ARG_NAME})
+ set(library_name ${ARG_NAME})
+ else()
+ vf_get_library_name (library_name)
+ endif()
status("Configuring the target: ${library_name} (type=${ARG_BUILDTYPE})...")
@@ -75,23 +119,6 @@ function(vf_add_library)
includeProductionFiles (${library_name} "${sourceFiles}")
-
- #################################################################
- ### 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 ###
#################################################################
@@ -119,7 +146,7 @@ function(vf_add_library)
#################################################################
### ADDITIONAL LINK LIBRARIES ###
#################################################################
- status("Link Depending Libraries: ${ARG_DEPENDS}")
+ status_lib("Link Depending Libraries: ${ARG_DEPENDS}")
if (ARG_DEPENDS)
target_link_libraries(${library_name} PRIVATE ${ARG_DEPENDS})
endif()
@@ -127,38 +154,7 @@ function(vf_add_library)
#################################################################
### COMPILER Flags ###
#################################################################
- ADD_COMPILER_FLAGS_TO_PROJECT(${CAB_COMPILER} ${library_name} "CXX" ${ARG_BUILDTYPE})
- status("compiler flags for compiler ${CAB_COMPILER} on machine ${CAB_MACHINE} for project ${project_name} (${ARG_BUILDTYPE}) have been configured")
- status("compiler flags: ${CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS}")
- status("additional compiler flags: ${CAB_ADDTIONAL_COMPILER_FLAGS}")
-
- #MESSAGE (COMPILE FLAGS: ${CAB_ADDTIONAL_COMPILER_FLAGS})
- IF(CAB_ADDTIONAL_COMPILER_FLAGS)
- ADD_TARGET_PROPERTIES(${library_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(${library_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(${library_name} COMPILE_FLAGS_RELEASE ${CAB_ADDTIONAL_COMPILER_FLAGS_RELEASE})
- ENDIF()
-
- #################################################################
- ### ADDITIONAL LINK PROPERTIES ###
- #################################################################
- status("additional linker flags: ${CAB_ADDITIONAL_LINK_FLAGS}")
-
- IF(CAB_ADDITIONAL_LINK_FLAGS)
- ADD_TARGET_PROPERTIES(${library_name} LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS})
- ENDIF()
- IF(CAB_ADDITIONAL_LINK_FLAGS_DEBUG)
- ADD_TARGET_PROPERTIES(${library_name} LINK_FLAGS_DEBUG ${CAB_ADDITIONAL_LINK_FLAGS_DEBUG})
- ENDIF()
- IF(CAB_ADDITIONAL_LINK_FLAGS_RELEASE)
- ADD_TARGET_PROPERTIES(${library_name} LINK_FLAGS_RELEASE ${CAB_ADDITIONAL_LINK_FLAGS_RELEASE})
- ENDIF()
+ addAdditionalFlags(${library_name})
if (NOT ${ARG_BUILDTYPE} MATCHES binary)
@@ -172,7 +168,7 @@ function(vf_add_library)
target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/cpu)
- #status("... configuring target: ${library_name} (type=${ARG_BUILDTYPE}) done")
+ status("... configuring target: ${library_name} (type=${ARG_BUILDTYPE}) done")
endfunction()
diff --git a/CMake/cmake_config_files/ALATAR.config.cmake b/CMake/cmake_config_files/ALATAR.config.cmake
deleted file mode 100644
index e6d45e580866c963a43c0db09614c859e5ceaf90..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/ALATAR.config.cmake
+++ /dev/null
@@ -1,67 +0,0 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-
-########################################################################################
-## BOOST ALLGMEINGUELTIG ##
-########################################################################################
-#standard boost: 1.50.0
-SET(BOOST_VERSION "1.51.0" CACHE STRING "std: 1.51.0")
-
-#SET(MPI_DIR "/hpc3lustre/software/lib/openmpi-1.4.1-gcc41")
-
-SET(USE_MPI_CXX_SYNTAX OFF)
-#SET(MPI_COMPILER "/hpc3lustre/software/lib/openmpi-1.4.1-gcc41/bin/mpicxx")
-
-IF(CAB_COMPILER MATCHES "gcc41")
- SET(BOOST_USE_MULTITHREAD ON)
-
- SET(BOOST_COMPILER_SUFFIX -gcc41)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.51.0" )
- SET(BOOST_INCLUDEDIR "/hpc3lustre/software/irmb/boost/boost_1_51_0")
- SET(BOOST_LIBRARYDIR "/hpc3lustre/software/irmb/boost/boost_1_51_0/stageGCC/lib")
-
- ENDIF()
-ENDIF()
-
-IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-ENDIF()
-
-#################################################################################
-# ZOLTAN
-#################################################################################
-IF(${USE_ZOLTAN})
- SET(ZOLTAN_INCLUDEDIR "/hpc3lustre/software/irmb/Trilinos/trilinos-10.6.4-Source/packages/zoltan/src/include")
- SET(ZOLTAN_DEBUG_LIBRARY "/hpc3lustre/software/irmb/Trilinos/trilinos-10.6.4-Build/packages/zoltan/src/libzoltan.a")
- SET(ZOLTAN_RELEASE_LIBRARY "/hpc3lustre/software/irmb/Trilinos/trilinos-10.6.4-Build/packages/zoltan/src/libzoltan.a")
-ENDIF()
-
-#################################################################################
-# METIS
-#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "/hpc3lustre/software/irmb/metis/include")
- SET(METIS_DEBUG_LIBRARY "/hpc3lustre/software/irmb/metis/lib/libmetis.a")
- SET(METIS_RELEASE_LIBRARY "/hpc3lustre/software/irmb/metis/lib/libmetis.a")
-ENDIF()
-
-#################################################################################
-# YAML
-#################################################################################
-IF(${USE_YAML})
- SET(YAML_INCLUDEDIR "/hpc3lustre/software/irmb/yaml/yaml-cpp/include")
- SET(YAML_DEBUG_LIBRARY "/hpc3lustre/software/irmb/yaml/yaml-cpp/build/libyaml-cpp.a")
- SET(YAML_RELEASE_LIBRARY "/hpc3lustre/software/irmb/yaml/yaml-cpp/build/libyaml-cpp.a")
-ENDIF()
-
-##################################################################################
-# Bond
-##################################################################################
-IF(${USE_BOND})
- SET(BOND_INCLUDEDIR "/hpc3lustre/home/koskuche/projects/bond/bond_src/cpp/bond/fetol")
- SET(BOND_DEBUG_LIBRARY "/hpc3lustre/home/koskuche/projects/bond/bin/lib/libbond.a")
- SET(BOND_RELEASE_LIBRARY "/hpc3lustre/home/koskuche/projects/bond/bin/lib/libbond.a")
-ENDIF()
-
diff --git a/CMake/cmake_config_files/ALTIX.config.cmake b/CMake/cmake_config_files/ALTIX.config.cmake
deleted file mode 100644
index 387da3bdb7069019545afa809d005a339e1ec170..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/ALTIX.config.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
-OPTION(CAB_COMPILER_64BIT "64BIT COMPILATION" ON)
-
-#################################################################################
-# COMPILER
-#################################################################################
-SET( ALTIX_CXX_COMPILER "mpiCC" )
-SET( ALTIX_C_COMPILER "mpicc" )
-
-#################################################################################
-# COMPILER FLAG VAR
-#################################################################################
-IF(NOT CAB_COMPILER})
- IF(NOT DEFINED CAB_COMPILER)
- SET( CAB_COMPILER "intel9" )
- ENDIF()
-ENDIF()
-
-SET(BOOST_DIR "/home/hlrb2/h005x/h005xac/boost/include/boost-1_34_1")
-SET(USE_BOOST_STATIC_LIBS TRUE)
-
-#################################################################################
-# MPI
-#################################################################################
-
-
-#################################################################################
-# BOOST
-#################################################################################
-IF(NEED_BOOST)
- SET(BOOST_USE_MULTITHREAD ON)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- #IF(BOOST_VERSION MATCHES "1.35.0" )
- #
- # SET(BOOST_INCLUDEDIR "E:/3rdPartyLibs/boost/boost_1_35")
- #
- # IF(CMAKE_CL_64)
- # SET(BOOST_LIBRARYDIR "E:/3rdPartyLibs/boost/boost_1_35/lib/x86_64bit")
- # ELSE()
- # SET(BOOST_LIBRARYDIR "E:/3rdPartyLibs/boost/boost_1_35/lib/x86_32bit")
- # ENDIF()
-
- #ELSE
- IF(BOOST_VERSION MATCHES "1.34.1" )
- SET(BOOST_INCLUDEDIR "/home/hlrb2/h005x/h005xac/boost/include/boost-1_34_1")
- SET(BOOST_LIBRARYDIR "/home/hlrb2/h005x/h005xac/boost/include/boost-1_34_1/lib")
- ENDIF()
-
- IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
- ENDIF()
-ENDIF()
-
diff --git a/CMake/cmake_config_files/AMAN.config.cmake b/CMake/cmake_config_files/AMAN.config.cmake
deleted file mode 100644
index 49694f481dfcb9ab194f75bf55b10a8351931861..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/AMAN.config.cmake
+++ /dev/null
@@ -1,83 +0,0 @@
-########################################################################################
-## CPU ##
-########################################################################################
-SET(CPU_TYPE "Opteron")
-
-########################################################################################
-## BOOST ALLGMEINGUELTIG ##
-########################################################################################
-#standard boost: 1.37.0
-SET(BOOST_VERSION "1.37.0" CACHE STRING "std: 1.37.0")
-
-########################################################################################
-## gcc42 ##
-########################################################################################
-IF(CAB_COMPILER MATCHES "gcc42")
- SET(BOOST_USE_MULTITHREAD ON)
-
- SET(BOOST_COMPILER_SUFFIX -gcc42)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.37.0" )
- SET(BOOST_INCLUDEDIR "/opt/boost/gcc-4.2/include/boost-1_37")
- SET(BOOST_LIBRARYDIR "/opt/boost/gcc-4.2/lib")
- ENDIF()
-
- SET(MPI_DIR "/opt/mpich-gm/gcc-4.2")
-
-########################################################################################
-## gcc41 ##
-########################################################################################
-ELSEIF(CAB_COMPILER MATCHES "gcc41")
- SET(BOOST_USE_MULTITHREAD ON)
-
- SET(BOOST_COMPILER_SUFFIX -gcc41)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.37.0" )
- SET(BOOST_INCLUDEDIR "/opt/boost/gcc-4.1/include/boost-1_37")
- SET(BOOST_LIBRARYDIR "/opt/boost/gcc-4.1/lib")
- ENDIF()
-
- SET(MPI_DIR "/opt/mpich-gm/gcc-4.1")
-
-########################################################################################
-## gcc34 ##
-########################################################################################
-ELSEIF(CAB_COMPILER MATCHES "gcc34")
- SET(BOOST_USE_MULTITHREAD ON)
-
- SET(BOOST_COMPILER_SUFFIX -gcc34)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.37.0" )
- SET(BOOST_INCLUDEDIR "/opt/boost/gcc-3.4/include/boost-1_37")
- SET(BOOST_LIBRARYDIR "/opt/boost/gcc-3.4/lib")
- ENDIF()
-
- SET(MPI_DIR "/opt/mpich-gm/gcc-3.4")
-
-########################################################################################
-## intel10.1 ##
-########################################################################################
-ELSEIF(CAB_COMPILER MATCHES "intel10" )
- SET(BOOST_USE_MULTITHREAD ON)
-
- SET(BOOST_COMPILER_SUFFIX -il)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.37.0" )
- #SET(BOOST_INCLUDEDIR "/opt/boost/intel-10.1/include/boost-1_37")
- #SET(BOOST_LIBRARYDIR "/opt/boost/intel-10.1/lib")
- ENDIF()
-
- #SET(MPI_DIR "/opt/mpich/intel-10.1")
-ENDIF()
-
-
-IF(NEED_BOOST AND BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-ENDIF()
-
-
-
diff --git a/CMake/cmake_config_files/AMATERASU.config.cmake b/CMake/cmake_config_files/AMATERASU.config.cmake
index a3bba0249a40dc116a986324e5ac6368ae3e7ef2..4cf53d794e743b61aa18a0565f97f6eb5fbf723b 100644
--- a/CMake/cmake_config_files/AMATERASU.config.cmake
+++ b/CMake/cmake_config_files/AMATERASU.config.cmake
@@ -1,8 +1,14 @@
+#################################################################################
+# VirtualFluids MACHINE FILE
+# Responsible: Martin Geier
+# OS: Windows 10
+#################################################################################
+
+
+
#################################################################################
# METIS
#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "C:/Users/geier/Documents/metis-5.1.0/include")
- SET(METIS_DEBUG_LIBRARY "C:/Users/geier/Documents/metis-5.1.0/build/libmetis/Debug/metis.lib")
- SET(METIS_RELEASE_LIBRARY "C:/Users/geier/Documents/metis-5.1.0/build/libmetis/Release/metis.lib")
-ENDIF()
\ No newline at end of file
+SET(METIS_INCLUDEDIR "C:/Users/geier/Documents/metis-5.1.0/include")
+SET(METIS_DEBUG_LIBRARY "C:/Users/geier/Documents/metis-5.1.0/build/libmetis/Debug/metis.lib")
+SET(METIS_RELEASE_LIBRARY "C:/Users/geier/Documents/metis-5.1.0/build/libmetis/Release/metis.lib")
diff --git a/CMake/cmake_config_files/ARAGORN.config.cmake b/CMake/cmake_config_files/ARAGORN.config.cmake
deleted file mode 100644
index 26d71771a5f895f76e05fccd53e6b1165efce4d7..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/ARAGORN.config.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
-#################################################################################
-# COMPILER FLAG VAR
-#################################################################################
-IF(NOT CAB_COMPILER})
- IF( ${MSVC_VERSION} MATCHES "1400" AND CMAKE_CL_64)
- SET( CAB_COMPILER "msvc8_64" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1400" AND NOT CMAKE_CL_64)
- SET( CAB_COMPILER "msvc8_32" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1500" AND CMAKE_CL_64)
- SET( CAB_COMPILER "msvc9_64" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1500" AND NOT CMAKE_CL_64)
- SET( CAB_COMPILER "msvc9_32" )
- ELSE()
- MESSAGE(ERROR, "unknown ms studio version MSVC_VERSION = "${MSVC_VERSION})
- ENDIF()
-ENDIF()
-
-#################################################################################
-# MPI
-#################################################################################
-SET(MPI_DIR "c:/programme/mpich2")
-
-#################################################################################
-# BOOST
-#################################################################################
-IF(NEED_BOOST)
-
- SET(BOOST_USE_MULTITHREAD ON)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.35.0" )
-
- SET(BOOST_INCLUDEDIR "c:/cpp/boost/boost_1_35_0")
-
- IF(CMAKE_CL_64)
- # SET(BOOST_LIBRARYDIR "c:/cpp/boost/boost_1_35_0/lib/x86_64bit")
- ELSE()
- SET(BOOST_LIBRARYDIR "c:/cpp/boost/boost_1_35_0/lib")
- ENDIF()
-
- ELSEIF(BOOST_VERSION MATCHES "1.38.0" )
- SET(BOOST_INCLUDEDIR "e:/cpp/boost/boost_1_38")
- SET(BOOST_LIBRARYDIR "e:/cpp/boost/boost_1_38/lib")
-
- ENDIF()
-
- IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
- ENDIF()
-ENDIF()
-
-
-
diff --git a/CMake/cmake_config_files/ARWEN.config.cmake b/CMake/cmake_config_files/ARWEN.config.cmake
deleted file mode 100644
index d932fbf064157d0dcc141d80279ba7c6899028ce..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/ARWEN.config.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-#################################################################################
-# BOOST
-#################################################################################
-SET(BOOST_VERSION "1.60.0")
-SET(BOOST_ROOT "d:/boost/boost_1_60_0")
-SET(BOOST_DIR ${BOOST_ROOT})
-SET(BOOST_LIBRARYDIR ${BOOST_ROOT}"/stageMSVC64/lib")
-#################################################################################
-
-#################################################################################
-# METIS
-#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "d:/metis-5.1.0/include")
- SET(METIS_DEBUG_LIBRARY "d:/metis-5.1.0/build/libmetis/Debug/metis.lib")
- SET(METIS_RELEASE_LIBRARY "d:/metis-5.1.0/build/libmetis/Release/metis.lib")
-ENDIF()
\ No newline at end of file
diff --git a/CMake/cmake_config_files/BAUMBART.config.cmake b/CMake/cmake_config_files/BAUMBART.config.cmake
index 6b0aece2c2e47e713ed7cf8cfd99967a5c9bf047..ba0412c88fb9b1982c73c1256ae17eec2901d54c 100644
--- a/CMake/cmake_config_files/BAUMBART.config.cmake
+++ b/CMake/cmake_config_files/BAUMBART.config.cmake
@@ -1,3 +1,8 @@
+#################################################################################
+# VirtualFluids MACHINE FILE
+# Responsible: Martin Schoenherr
+# OS: Windows 10
+#################################################################################
#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")
diff --git a/CMake/cmake_config_files/BILBO.config.cmake b/CMake/cmake_config_files/BILBO.config.cmake
index ead4ef15bcfe529d4b6a5a2d9d5e6f5211f04a66..3c7f0f728ddad36d22ff1d65d83aa7927c14ed48 100644
--- a/CMake/cmake_config_files/BILBO.config.cmake
+++ b/CMake/cmake_config_files/BILBO.config.cmake
@@ -1,41 +1,13 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__APPLE__)
-
-#################################################################################
-# MPI
-#################################################################################
-#SET(MPI_DIR "C:/Program Files (x86)/mpich2")
-#SET(MPI_DIR "C:/Program Files/mpich2")
-#SET(USE_MPI_CXX_SYNTAX OFF)
-#SET(MPI_COMPILER "C:/Program Files/mpich2/bin/mpicxx")
-#SET(MPI_INCLUDE_PATH "C:/Program Files (x86)/mpich2/include")
-#SET(MPI_LIBRARY "C:/Program Files/mpich2/lib/libmpi.a")
-#SET(MPI_CXX_LIBRARY "C:/Program Files/MPICH2/lib/cxx.lib")
-#################################################################################
-# BOOST
#################################################################################
-#SET(BOOST_VERSION "1.47")
-#SET(BOOST_USE_MULTITHREAD ON)
-#SET(BOOST_USE_STATIC_LIBS ON)
-#
-#IF(BOOST_VERSION MATCHES "1.47" )
-# SET(BOOST_ROOT "/host/tools/boost/boost_1_47_0")
-# SET(BOOST_LIBRARYDIR "/host/tools/boost/boost_1_47_0/stageLinux/lib")
-#ENDIF()
+# VirtualFluids MACHINE FILE
+# Responsible: Soeren Peters
+# OS: MacOS X
#################################################################################
-# ZOLTAN
-#################################################################################
-#IF(${USE_ZOLTAN})
-# SET(ZOLTAN_INCLUDEDIR "/home/kostja/tools/Zoltan_v3.5/bin/include")
-# SET(ZOLTAN_DEBUG_LIBRARY "/home/kostja/tools/Zoltan_v3.5/bin/lib/libzoltan.a")
-# SET(ZOLTAN_RELEASE_LIBRARY "/home/kostja/tools/Zoltan_v3.5/bin/lib/libzoltan.a")
-#ENDIF()
+
#################################################################################
# METIS
#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "/usr/local/include")
- SET(METIS_DEBUG_LIBRARY "/usr/local/lib/libmetis.a")
- SET(METIS_RELEASE_LIBRARY "/usr/local/lib/libmetis.a")
-ENDIF()
+SET(METIS_INCLUDEDIR "/usr/local/include")
+SET(METIS_DEBUG_LIBRARY "/usr/local/lib/libmetis.a")
+SET(METIS_RELEASE_LIBRARY "/usr/local/lib/libmetis.a")
+
diff --git a/CMake/cmake_config_files/BLOGIN.config.cmake b/CMake/cmake_config_files/BLOGIN.config.cmake
deleted file mode 100644
index 45102e380198cd9e4e22efba5403d2bb8dea726d..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/BLOGIN.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/KONRAD.config.cmake")
\ No newline at end of file
diff --git a/CMake/cmake_config_files/BLOGIN1.config.cmake b/CMake/cmake_config_files/BLOGIN1.config.cmake
deleted file mode 100644
index 45102e380198cd9e4e22efba5403d2bb8dea726d..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/BLOGIN1.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/KONRAD.config.cmake")
\ No newline at end of file
diff --git a/CMake/cmake_config_files/BLOGIN2.config.cmake b/CMake/cmake_config_files/BLOGIN2.config.cmake
deleted file mode 100644
index 45102e380198cd9e4e22efba5403d2bb8dea726d..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/BLOGIN2.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/KONRAD.config.cmake")
\ No newline at end of file
diff --git a/CMake/cmake_config_files/BOMBADIL.config.cmake b/CMake/cmake_config_files/BOMBADIL.config.cmake
index a1415455f7b8d789e2a9e667e9871c1623013596..7838e2f52b35deae8c114c57968f4b71e0b5b2e4 100644
--- a/CMake/cmake_config_files/BOMBADIL.config.cmake
+++ b/CMake/cmake_config_files/BOMBADIL.config.cmake
@@ -1,11 +1,9 @@
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__APPLE__)
+#################################################################################
+# VirtualFluids MACHINE FILE
+# Responsible: Konstantin Kutscher
+# OS: Windows 10
+#################################################################################
-IF(NOT CMAKE_CXX_COMPILER)
- MESSAGE(FATAL_ERROR "before cmake-config-file can be included -> project must be extecuted")
-ENDIF()
-
#################################################################################
# MPI
#################################################################################
@@ -27,14 +25,6 @@ SET(BOOST_LIBRARYDIR ${BOOST_ROOT}"/stageMSVC64/lib")
# VTK
#################################################################################
set(VTK_DIR "d:/Tools/VTK/build/VTK-8.0.0")
-#################################################################################
-# ZOLTAN
-#################################################################################
-IF(${USE_ZOLTAN})
- SET(ZOLTAN_INCLUDEDIR "d:/Tools/zoltan/include")
- SET(ZOLTAN_DEBUG_LIBRARY "d:/Tools/zoltan/lib/Debug/zoltan.lib")
- SET(ZOLTAN_RELEASE_LIBRARY "d:/Tools/zoltan/lib/Release/zoltan.lib")
-ENDIF()
#################################################################################
# METIS
diff --git a/CMake/cmake_config_files/CCSMASTER.config.cmake b/CMake/cmake_config_files/CCSMASTER.config.cmake
deleted file mode 100644
index 1a7be411b4754573cd992c363930879df80aae89..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/CCSMASTER.config.cmake
+++ /dev/null
@@ -1,57 +0,0 @@
-#################################################################################
-# COMPILER FLAG VAR
-#################################################################################
-IF(NOT CAB_COMPILER})
- IF( ${MSVC_VERSION} MATCHES "1400" AND CMAKE_CL_64)
- SET( CAB_COMPILER "msvc8_64" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1400" AND NOT CMAKE_CL_64)
- SET( CAB_COMPILER "msvc8_32" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1500" AND CMAKE_CL_64)
- SET( CAB_COMPILER "msvc9_64" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1500" AND NOT CMAKE_CL_64)
- SET( CAB_COMPILER "msvc9_32" )
- ELSE()
- MESSAGE(ERROR, "unknown ms studio version MSVC_VERSION = "${MSVC_VERSION})
- ENDIF()
-ENDIF()
-
-#################################################################################
-# MPI
-#################################################################################
-IF(CMAKE_CL_64)
- SET(MPI_DIR "c:/Program Files/MPICH2")
-ELSE()
- SET(MPI_DIR "c:/Program Files (x86)/MPICH2")
-ENDIF()
-
-#################################################################################
-# BOOST
-#################################################################################
-IF(NEED_BOOST)
- SET(BOOST_USE_MULTITHREAD ON)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.35.0" )
-
- SET(BOOST_INCLUDEDIR "Y:/boost_1_35_0")
-
- IF(CMAKE_CL_64)
- SET(BOOST_LIBRARYDIR "Y:/boost_1_35_0/lib/x86_64bit")
- ELSE()
- SET(BOOST_LIBRARYDIR "Y:/boost_1_35_0/lib/x86_32bit")
- ENDIF()
-
- ELSEIF(BOOST_VERSION MATCHES "1.34.1" )
- SET(BOOST_INCLUDEDIR "H:/boost1.34.1")
- IF(CMAKE_CL_64)
- SET(BOOST_LIBRARYDIR "H:/boost1.34.1/stage64/lib")
- ELSE()
- SET(BOOST_LIBRARYDIR "H:/boost1.34.1/lib")
- ENDIF()
- ENDIF()
-
- IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
- ENDIF()
-ENDIF()
-
diff --git a/CMake/cmake_config_files/CCS_ERLANGEN.config.cmake b/CMake/cmake_config_files/CCS_ERLANGEN.config.cmake
deleted file mode 100644
index 933862768f6ef130cc367e16486bff36a6cc6d6c..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/CCS_ERLANGEN.config.cmake
+++ /dev/null
@@ -1,57 +0,0 @@
-#################################################################################
-# COMPILER FLAG VAR
-#################################################################################
-IF(NOT CAB_COMPILER})
- IF( ${MSVC_VERSION} MATCHES "1400" AND CMAKE_CL_64)
- SET( CAB_COMPILER "msvc8_64" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1400" AND NOT CMAKE_CL_64)
- SET( CAB_COMPILER "msvc8_32" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1500" AND CMAKE_CL_64)
- SET( CAB_COMPILER "msvc9_64" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1500" AND NOT CMAKE_CL_64)
- SET( CAB_COMPILER "msvc9_32" )
- ELSE()
- MESSAGE(ERROR, "unknown ms studio version MSVC_VERSION = "${MSVC_VERSION})
- ENDIF()
-ENDIF()
-
-#################################################################################
-# MPI
-#################################################################################
-IF(CMAKE_CL_64)
- SET(MPI_DIR "c:/Program Files/MPICH2")
-ELSE()
- SET(MPI_DIR "c:/Program Files (x86)/MPICH2")
-ENDIF()
-
-#################################################################################
-# BOOST
-#################################################################################
-IF(NEED_BOOST)
- SET(BOOST_USE_MULTITHREAD ON)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.35.0" )
-
- SET(BOOST_INCLUDEDIR "E:/3rdPartyLibs/boost/boost_1_35")
-
- IF(CMAKE_CL_64)
- SET(BOOST_LIBRARYDIR "E:/3rdPartyLibs/boost/boost_1_35/lib/x86_64bit")
- ELSE()
- SET(BOOST_LIBRARYDIR "E:/3rdPartyLibs/boost/boost_1_35/lib/x86_32bit")
- ENDIF()
-
- ELSEIF(BOOST_VERSION MATCHES "1.34.1" )
- SET(BOOST_INCLUDEDIR "H:/boost1.34.1")
- IF(CMAKE_CL_64)
- SET(BOOST_LIBRARYDIR "H:/boost1.34.1/stage64/lib")
- ELSE()
- SET(BOOST_LIBRARYDIR "H:/boost1.34.1//lib")
- ENDIF()
- ENDIF()
-
- IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
- ENDIF()
-ENDIF()
-
diff --git a/CMake/cmake_config_files/COAST.config.cmake b/CMake/cmake_config_files/COAST.config.cmake
deleted file mode 100644
index 70b61016587b95c4587cd2928fea2e820a62aa19..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/COAST.config.cmake
+++ /dev/null
@@ -1,63 +0,0 @@
-
-#SET(CAB_COMPILER gcc41 CACHE STRING "gcc41" FORCE)
-CHECK_FOR_VARIABLE(CAB_COMPILER "gcc41, geller_gcc41")
-
-#################################################################################
-# COMPILER FLAG VAR
-#################################################################################
-IF(NOT CAB_COMPILER})
- IF(NOT DEFINED CAB_COMPILER)
- SET(CAB_COMPILER "CAB_COMPILER-NOTFOUND")
- MESSAGE("CHECK_FOR_VARIABLE - error - set CAB_COMPILER")
- ENDIF()
-ENDIF()
-
-SET(CPU_TYPE "Opteron")
-
-#standard boost: 1.37.0
-SET(BOOST_VERSION "1.37.0" CACHE STRING "std: 1.37.0")
-
-########################################################################################
-## gcc41 ##
-########################################################################################
-IF(CAB_COMPILER MATCHES "gcc41")
- SET(BOOST_USE_MULTITHREAD ON)
-
- SET(BOOST_COMPILER_SUFFIX -gcc41)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.37.0" )
- SET(BOOST_INCLUDEDIR "/home/hegewald/bin/boost/boost_1_37_0")
- SET(BOOST_LIBRARYDIR "/home/hegewald/bin/boost/boost_1_37_0/lib")
- ENDIF()
-
- #SET(MPI_DIR "/opt/mpich-gm/gcc-4.1")
-
- SET_CXX_COMPILER("/usr/bin/g++-4.1")
- SET_C_COMPILER("/usr/bin/gcc-4.1")
-
-ELSEIF(CAB_COMPILER MATCHES "geller_gcc41")
-
- SET(BOOST_USE_MULTITHREAD ON)
-
- SET(BOOST_COMPILER_SUFFIX -gcc41)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.37.0" )
- SET(BOOST_INCLUDEDIR "/home/hegewald/bin/boost/boost_1_37_0")
- SET(BOOST_LIBRARYDIR "/home/hegewald/bin/boost/boost_1_37_0/lib")
- ENDIF()
-
- SET(MPI_DIR "/home/geller/bin/mpich2-1.0.8")
-
- SET_CXX_COMPILER("/usr/bin/g++-4.2")
- SET_C_COMPILER("/usr/bin/gcc-4.2")
-ENDIF()
-
-
-IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-ENDIF()
-
-
-
diff --git a/CMake/cmake_config_files/CSE01.config.cmake b/CMake/cmake_config_files/CSE01.config.cmake
index f68bdf54619860f167fccd1f0a99d8524bfe361e..baa0f94981c2e9f9ac05b62468311f4bead32ff3 100644
--- a/CMake/cmake_config_files/CSE01.config.cmake
+++ b/CMake/cmake_config_files/CSE01.config.cmake
@@ -1,3 +1,4 @@
+# Alena
#################################################################################
# BOOST
#################################################################################
diff --git a/CMake/cmake_config_files/DESKTOP-U072UFM.config.cmake b/CMake/cmake_config_files/DESKTOP-U072UFM.config.cmake
deleted file mode 100644
index 7fe89b566616d56ac15811092228323b102e4e2a..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/DESKTOP-U072UFM.config.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#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/CMake/cmake_config_files/ELENDUR.config.cmake b/CMake/cmake_config_files/ELENDUR.config.cmake
index 0ec17a47aff4255d69dbe8fd85c40144225f9414..5ef9d62dd8dbd7d352dfa812c05327b652ee83df 100644
--- a/CMake/cmake_config_files/ELENDUR.config.cmake
+++ b/CMake/cmake_config_files/ELENDUR.config.cmake
@@ -1,3 +1,4 @@
+# Hiwi Rechner Olli
#################################################################################
# BOOST
#################################################################################
@@ -11,8 +12,7 @@ SET(BOOST_LIBRARYDIR ${BOOST_ROOT}"/stage/lib")
#################################################################################
# METIS
#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "c:/Libraries/metis/metis-5.1.0/include")
- SET(METIS_DEBUG_LIBRARY "c:/Libraries/metis/metis-5.1.0/MSVC2015/libmetis/Debug/metis.lib")
- SET(METIS_RELEASE_LIBRARY "c:/Libraries/metis/metis-5.1.0/MSVC2015/libmetis/Release/metis.lib")
-ENDIF()
\ No newline at end of file
+SET(METIS_INCLUDEDIR "c:/Libraries/metis/metis-5.1.0/include")
+SET(METIS_DEBUG_LIBRARY "c:/Libraries/metis/metis-5.1.0/MSVC2015/libmetis/Debug/metis.lib")
+SET(METIS_RELEASE_LIBRARY "c:/Libraries/metis/metis-5.1.0/MSVC2015/libmetis/Release/metis.lib")
+
diff --git a/CMake/cmake_config_files/ELLADAN.config.cmake b/CMake/cmake_config_files/ELLADAN.config.cmake
index 7896929276a2969029937ab819b7a59b8132a7c6..80291455e6db49f542b847640ec187620d7eacca 100644
--- a/CMake/cmake_config_files/ELLADAN.config.cmake
+++ b/CMake/cmake_config_files/ELLADAN.config.cmake
@@ -1,44 +1,14 @@
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__APPLE__)
-
-#################################################################################
-# MPI
-#################################################################################
-#SET(MPI_DIR "C:/Program Files (x86)/mpich2")
-#SET(MPI_DIR "C:/Program Files/mpich2")
-#SET(USE_MPI_CXX_SYNTAX OFF)
-#SET(MPI_COMPILER "C:/Program Files/mpich2/bin/mpicxx")
-#SET(MPI_INCLUDE_PATH "C:/Program Files (x86)/mpich2/include")
-#SET(MPI_LIBRARY "C:/Program Files/mpich2/lib/libmpi.a")
-#SET(MPI_CXX_LIBRARY "C:/Program Files/MPICH2/lib/cxx.lib")
-#################################################################################
-# BOOST
#################################################################################
-#SET(BOOST_VERSION "1.47")
-#SET(BOOST_USE_MULTITHREAD ON)
-#SET(BOOST_USE_STATIC_LIBS ON)
-#
-#IF(BOOST_VERSION MATCHES "1.47" )
-# SET(BOOST_ROOT "/host/tools/boost/boost_1_47_0")
-# SET(BOOST_LIBRARYDIR "/host/tools/boost/boost_1_47_0/stageLinux/lib")
-#ENDIF()
+# VirtualFluids MACHINE FILE
+# Responsible: Soeren Peters
+# OS: Ubuntu 20.04
#################################################################################
-# ZOLTAN
-#################################################################################
-#IF(${USE_ZOLTAN})
-# SET(ZOLTAN_INCLUDEDIR "/home/kostja/tools/Zoltan_v3.5/bin/include")
-# SET(ZOLTAN_DEBUG_LIBRARY "/home/kostja/tools/Zoltan_v3.5/bin/lib/libzoltan.a")
-# SET(ZOLTAN_RELEASE_LIBRARY "/home/kostja/tools/Zoltan_v3.5/bin/lib/libzoltan.a")
-#ENDIF()
+
+set(NVCUDASAMPLES_ROOT "~/cuda-samples/Common")
#################################################################################
# METIS
#################################################################################
-set (NVCUDASAMPLES_ROOT "~/cuda-samples/Common")
-
+set(METIS_INCLUDEDIR "/usr/include")
+set(METIS_DEBUG_LIBRARY "/usr/lib/x86_64-linux-gnu/libmetis.so")
+set(METIS_RELEASE_LIBRARY "/usr/lib/x86_64-linux-gnu/libmetis.so")
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "/usr/include")
- SET(METIS_DEBUG_LIBRARY "/usr/lib/x86_64-linux-gnu/libmetis.so")
- SET(METIS_RELEASE_LIBRARY "/usr/lib/x86_64-linux-gnu/libmetis.so")
-ENDIF()
diff --git a/CMake/cmake_config_files/ESLOGIN001.config.cmake b/CMake/cmake_config_files/ESLOGIN001.config.cmake
deleted file mode 100644
index 210df3d6c98d28535e00a1c0856763a3da25103d..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/ESLOGIN001.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/HERMIT.config.cmake")
diff --git a/CMake/cmake_config_files/ESLOGIN002.config.cmake b/CMake/cmake_config_files/ESLOGIN002.config.cmake
deleted file mode 100644
index 210df3d6c98d28535e00a1c0856763a3da25103d..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/ESLOGIN002.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/HERMIT.config.cmake")
diff --git a/CMake/cmake_config_files/ESLOGIN003.config.cmake b/CMake/cmake_config_files/ESLOGIN003.config.cmake
deleted file mode 100644
index 210df3d6c98d28535e00a1c0856763a3da25103d..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/ESLOGIN003.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/HERMIT.config.cmake")
diff --git a/CMake/cmake_config_files/ESLOGIN008.config.cmake b/CMake/cmake_config_files/ESLOGIN008.config.cmake
deleted file mode 100644
index 210df3d6c98d28535e00a1c0856763a3da25103d..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/ESLOGIN008.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/HERMIT.config.cmake")
diff --git a/CMake/cmake_config_files/FRWAB.config.cmake b/CMake/cmake_config_files/FRWAB.config.cmake
deleted file mode 100644
index 6b93153e5df17a8558e4a6d409c04c1a323a42e8..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/FRWAB.config.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-OPTION(CAB_COMPILER_64BIT "64BIT COMPILATION" ON)
-
-########################################################################################
-## BOOST ALLGMEINGUELTIG ##
-########################################################################################
-#standard boost: 1.38.0
-SET(BOOST_VERSION "1.38.0" CACHE STRING "std: 1.38.0")
-
-########################################################################################
-## gcc41 ##
-########################################################################################
-IF(CAB_COMPILER MATCHES "gcc41")
- SET(BOOST_USE_MULTITHREAD ON)
-
- SET(BOOST_COMPILER_SUFFIX -gcc41)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.38.0" )
- SET(BOOST_INCLUDEDIR "/nfs/HOME/HLRS/iws/iwsirmb/boost/gcc41/boost_1_38_0/include/boost-1_38")
- SET(BOOST_LIBRARYDIR "/nfs/HOME/HLRS/iws/iwsirmb/boost/gcc41/boost_1_38_0/lib")
- ENDIF()
-
- SET(MPI_DIR "/opt/bwgrid/mpi/openmpi/1.3-gnu-4.1")
- SET(MPI_CXX_LIBRARY libmpi_cxx.so)
- SET(MPI_C_LIBRARY libmpi.so)
-
-########################################################################################
-## intel10.1 ##
-########################################################################################
-ELSEIF(CAB_COMPILER MATCHES "intel10" )
- SET(BOOST_USE_MULTITHREAD ON)
-
- SET(BOOST_COMPILER_SUFFIX -il)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.37.0" )
- SET(BOOST_INCLUDEDIR "/nfs/HOME/HLRS/iws/iwsirmb/boost/intel101/boost_1_38_0/include/boost-1_38")
- SET(BOOST_LIBRARYDIR "/nfs/HOME/HLRS/iws/iwsirmb/boost/intel101/boost_1_38_0/lib")
- ENDIF()
-
- #SET(MPI_DIR "/opt/mpich/intel-10.1")
- SET(MPI_DIR "/opt/bwgrid/mpi/openmpi/1.3-intel-10.1")
-
- SET_CXX_COMPILER("/opt/intel/vve/10.1.018/bin/icpc")
- SET_C_COMPILER("/opt/intel/vve/10.1.018/bin/icc")
-ENDIF()
-
-
-IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-ENDIF()
-
-
-
diff --git a/CMake/cmake_config_files/FRY29.config.cmake b/CMake/cmake_config_files/FRY29.config.cmake
deleted file mode 100644
index 27b63654bb7eba4e8909c9dbaa416419e7f018f4..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/FRY29.config.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-
-########################################################################################
-## BOOST ALLGMEINGUELTIG ##
-########################################################################################
-SET(BOOST_VERSION "1.60.0" CACHE STRING "std: 1.60.0")
-
-
-SET(USE_MPI_CXX_SYNTAX OFF)
-SET(BOOST_INCLUDEDIR "/home/irmb/kutscher/boost_1_60_0/boost")
-SET(BOOST_LIBRARYDIR "/home/irmb/kutscher/boost_1_60_0/stage/lib")
-SET(Boost_INCLUDE_DIR "/home/irmb/kutscher/boost_1_60_0")
-
-IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-ENDIF()
-
-#################################################################################
-# METIS
-#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "/home/irmb/kutscher/metis-5.1.0/include")
- SET(METIS_DEBUG_LIBRARY "/home/irmb/kutscher/metis-5.1.0/build/Linux-x86_64/libmetis/libmetis.a")
- SET(METIS_RELEASE_LIBRARY "/home/irmb/kutscher/metis-5.1.0/build/Linux-x86_64/libmetis/libmetis.a")
-ENDIF()
-
-
-
diff --git a/CMake/cmake_config_files/GAMLING.config.cmake b/CMake/cmake_config_files/GAMLING.config.cmake
deleted file mode 100644
index b3a52ae0fcdccd83ab688a5ca5757899f793f39d..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/GAMLING.config.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#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 TO CORRECT PATH:
-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")
diff --git a/CMake/cmake_config_files/GENIUS1.config.cmake b/CMake/cmake_config_files/GENIUS1.config.cmake
deleted file mode 100644
index 675a542085e90458b700c59a0b7ed95c1e9e2144..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/GENIUS1.config.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-
-IF(NOT CMAKE_CXX_COMPILER)
- MESSAGE(FATAL_ERROR "before cmake-config-file can be included -> project must be extecuted")
-ENDIF()
-
-#################################################################################
-# MPI
-#################################################################################
-SET(USE_MPI_CXX_SYNTAX OFF)
-
-#################################################################################
-# BOOST
-#################################################################################
-SET(BOOST_VERSION "1.44")
-SET(BOOST_USE_MULTITHREAD ON)
-SET(BOOST_USE_STATIC_LIBS ON)
-
-IF(BOOST_VERSION MATCHES "1.44" )
- SET(BOOST_INCLUDEDIR "/u/lrz102bk/soft/boost_1_44_0/build/include")
- SET(BOOST_LIBRARYDIR "/u/lrz102bk/soft/boost_1_44_0/build/lib")
-ENDIF()
-
-IF(${USE_ZOLTAN})
- SET(ZOLTAN_INCLUDEDIR "/u/lrz102bk/BlueGene/soft/Zoltan_v3.1/bin/include")
- SET(ZOLTAN_DEBUG_LIBRARY "/u/lrz102bk/BlueGene/soft/Zoltan_v3.1/bin/lib/libzoltan.a")
- SET(ZOLTAN_RELEASE_LIBRARY "/u/lrz102bk/BlueGene/soft/Zoltan_v3.1/bin/lib/libzoltan.a")
-ENDIF()
-
-set(SOURCE_ROOT "/u/lrz102bk/BlueGene/projects/pFluid/source")
-
-
diff --git a/CMake/cmake_config_files/GIMLI.config.cmake b/CMake/cmake_config_files/GIMLI.config.cmake
deleted file mode 100644
index 753957d6d8583f5e114b9cfb78e8cde89f1b2f57..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/GIMLI.config.cmake
+++ /dev/null
@@ -1,63 +0,0 @@
-#################################################################################
-# COMPILER FLAG VAR
-#################################################################################
-IF(NOT CAB_COMPILER})
- IF( ${MSVC_VERSION} MATCHES "1400" AND CMAKE_CL_64)
- SET( CAB_COMPILER "msvc8_64" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1400" AND NOT CMAKE_CL_64)
- SET( CAB_COMPILER "msvc8_32" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1500" AND CMAKE_CL_64)
- SET( CAB_COMPILER "msvc9_64" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1500" AND NOT CMAKE_CL_64)
- SET( CAB_COMPILER "msvc9_32" )
- ELSE()
- MESSAGE(ERROR, "unknown ms studio version MSVC_VERSION = "${MSVC_VERSION})
- ENDIF()
-ENDIF()
-
-#################################################################################
-# MPI
-#################################################################################
-IF(CMAKE_CL_64)
- SET(MPI_DIR "c:/Program Files/MPICH2")
-ELSE()
- SET(MPI_DIR "c:/Program Files (x86)/MPICH2")
-ENDIF()
-
-#################################################################################
-# BOOST
-#################################################################################
-IF(NEED_BOOST)
- SET(BOOST_USE_MULTITHREAD ON)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.35.0.svn" )
-
- SET(BOOST_INCLUDEDIR "E:/3rdPartyLibs/boost/boost_1_35")
-
- IF(CMAKE_CL_64)
- SET(BOOST_LIBRARYDIR "E:/3rdPartyLibs/boost/boost_1_35/lib/x86_64bit")
- ELSE()
- SET(BOOST_LIBRARYDIR "E:/3rdPartyLibs/boost/boost_1_35/lib/x86_32bit")
- ENDIF()
-
- ELSEIF(BOOST_VERSION MATCHES "1.35.0" )
-
- SET(BOOST_INCLUDEDIR "E:/3rdPartyLibs/boost/boost_1_35_0")
-
- IF(CMAKE_CL_64)
- SET(BOOST_LIBRARYDIR "E:/3rdPartyLibs/boost/boost_1_35_0/lib/x86_64bit")
- ELSE()
- SET(BOOST_LIBRARYDIR "E:/3rdPartyLibs/boost/boost_1_35_0/lib/x86_32bit")
- ENDIF()
-
- ELSEIF(BOOST_VERSION MATCHES "1.34.1" )
- SET(BOOST_INCLUDEDIR "C:/Program Files (x86)/boost/boost_1_34_1")
- SET(BOOST_LIBRARYDIR "C:/Program Files (x86)/boost/boost_1_34_1/lib")
- ENDIF()
-
- IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
- ENDIF()
-ENDIF()
-
diff --git a/CMake/cmake_config_files/GLOGIN1.config.cmake b/CMake/cmake_config_files/GLOGIN1.config.cmake
deleted file mode 100644
index 31c781a0a2e8d555e2ef1b2a5c7e6085fd0f23e7..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/GLOGIN1.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/HLRNG.config.cmake")
diff --git a/CMake/cmake_config_files/GOTTFRIED.config.cmake b/CMake/cmake_config_files/GOTTFRIED.config.cmake
deleted file mode 100644
index 2144d13c18a6a6dfa2e466d09224549381404d8c..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/GOTTFRIED.config.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-
-########################################################################################
-## BOOST ALLGMEINGUELTIG ##
-########################################################################################
-#standard boost
-SET(BOOST_VERSION "1.54.0" CACHE STRING "std: 1.54.0")
-
-#SET(USE_MPI_CXX_SYNTAX OFF)
-
-#IF(CAB_COMPILER MATCHES "gcc41")
-# SET(BOOST_USE_MULTITHREAD ON)
-
- #SET(BOOST_COMPILER_SUFFIX -gcc41)
-# SET(BOOST_USE_STATIC_LIBS ON)
-
-# IF(BOOST_VERSION MATCHES "1.54.0" )
-# SET(BOOST_INCLUDEDIR "/gfs1/work/niivfcpu/tools/boost_1_54_0")
-# SET(BOOST_LIBRARYDIR "/gfs1/work/niivfcpu/tools/boost_1_54_0/stageGCC/lib")
-# ENDIF()
-#ENDIF()
-
-#IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
-# MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-#ENDIF()
-
-
-#################################################################################
-# METIS
-#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "/gfs1/work/niikonst/libs/metis/include")
- SET(METIS_DEBUG_LIBRARY "/gfs1/work/niikonst/libs/metis/lib/libmetis.a")
- SET(METIS_RELEASE_LIBRARY "/gfs1/work/niikonst/libs/metis/lib/libmetis.a")
-ENDIF()
-
-# #################################################################################
-# # YAML
-# #################################################################################
-# IF(${USE_YAML})
-# SET(YAML_INCLUDEDIR "/hpc3lustre/software/irmb/yaml/yaml-cpp/include")
-# SET(YAML_DEBUG_LIBRARY "/hpc3lustre/software/irmb/yaml/yaml-cpp/build/libyaml-cpp.a")
-# SET(YAML_RELEASE_LIBRARY "/hpc3lustre/software/irmb/yaml/yaml-cpp/build/libyaml-cpp.a")
-# ENDIF()
-#
-# ##################################################################################
-# # Bond
-# ##################################################################################
-# IF(${USE_BOND})
-# SET(BOND_INCLUDEDIR "/hpc3lustre/home/koskuche/projects/bond/bond_src/cpp/bond/fetol")
-# SET(BOND_DEBUG_LIBRARY "/hpc3lustre/home/koskuche/projects/bond/bin/lib/libbond.a")
-# SET(BOND_RELEASE_LIBRARY "/hpc3lustre/home/koskuche/projects/bond/bin/lib/libbond.a")
-# ENDIF()
-
diff --git a/CMake/cmake_config_files/HELM.config.cmake b/CMake/cmake_config_files/HELM.config.cmake
deleted file mode 100644
index 341d045f60e0a505f9abbc8b6c3e6b780af0762e..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/HELM.config.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-#################################################################################
-# COMPILER FLAG VAR
-#################################################################################
-
-SET(CAB_COMPILER "gcc41" CACHE STRING "gcc41, gcc43, intel9" FORCE)
-# on MacOS X __APPLE__ is defined but not __unix__
-add_definitions(-D__unix__)
-SET(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING "ppc;i386;ppc64;x86_64" FORCE)
-
-#ADD_CXX_FLAGS(-arch x86_64 -L/usr/local/lib/x86_64)# -Wall -ansi)
-#ADD_CXX_BUILDTYPE_FLAGS(DEBUG -DDEBUG -D_DEBUG -gdwarf-2 -arch x86_64 -L/usr/local/lib/x86_64 -Wall -ansi)
-#ADD_CXX_BUILDTYPE_FLAGS(RELEASE -O3 -DNDEBUG -fomit-frame-pointer -finline-functions -funroll-all-loops -arch x86_64 -L/usr/local/lib/x86_64 -Wall -ansi)
-ADD_CXX_BUILDTYPE_FLAGS(DEBUG -DDEBUG -D_DEBUG -gdwarf-2 -Wall -ansi)
-ADD_CXX_BUILDTYPE_FLAGS(RELEASE -O3 -DNDEBUG -fomit-frame-pointer -finline-functions -funroll-all-loops -Wall -ansi)
-
-#ADD_C_FLAGS(-arch x86_64 -L/usr/local/lib/x86_64)# -Wall -ansi)
-
-
-SET(BOOST_VERSION "1.47.0")
-#IF(CAB_COMPILER MATCHES "gcc41")
-# SET(BOOST_USE_MULTITHREAD ON)
-# SET(BOOST_USE_STATIC_LIBS ON)
-#
-# SET(BOOST_COMPILER_SUFFIX -xgcc40)
-#
-# IF(BOOST_VERSION MATCHES "1.37.0" )
-# SET(BOOST_INCLUDEDIR "/Users/hg/bin/boost/boost_1_37_0")
-# SET(BOOST_LIBRARYDIR "/Users/hg/bin/boost/boost_1_37_0/lib")
-# ENDIF()
-## IF(BOOST_VERSION MATCHES "1.37.0" )
-## SET(BOOST_INCLUDEDIR "/opt/local/include")
-## SET(BOOST_LIBRARYDIR "/opt/local/lib")
-## ENDIF()
-#ENDIF()
-#IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
-# MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-#ENDIF()
-
-SET(BOOST_USE_MULTITHREAD ON)
-SET(BOOST_USE_STATIC_LIBS ON)
-
-IF(BOOST_VERSION MATCHES "1.47.0" )
- SET(BOOST_INCLUDEDIR "/Users/hg/bin/boost/boost_1_47_0_bin/include")
- SET(BOOST_LIBRARYDIR "/Users/hg/bin/boost/boost_1_47_0_bin/lib")
-ENDIF()
-#################################################################################
-# ZOLTAN
-#################################################################################
-IF(${USE_ZOLTAN})
- SET(ZOLTAN_INCLUDEDIR "/Users/hg/bin/zoltan_distrib_v3.501_bin/include")
- SET(ZOLTAN_DEBUG_LIBRARY "/Users/hg/bin/zoltan_distrib_v3.501_bin/lib/libzoltan.a")
- SET(ZOLTAN_RELEASE_LIBRARY "/Users/hg/bin/zoltan_distrib_v3.501_bin/lib/libzoltan.a")
-ENDIF()
-set(SOURCE_ROOT "/Users/hg/hg+/Konstantin_Kucher/Patchcode/src")
\ No newline at end of file
diff --git a/CMake/cmake_config_files/HERMIT.config.cmake b/CMake/cmake_config_files/HERMIT.config.cmake
deleted file mode 100644
index 559bbb6deab44320693ac527a35e215b935e2743..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/HERMIT.config.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-
-########################################################################################
-## BOOST ALLGMEINGUELTIG ##
-########################################################################################
-
-SET(BOOST_VERSION "1.54.0" CACHE STRING "std: 1.54.0")
-
-# IF(BOOST_VERSION MATCHES "1.51.0" )
-# SET(BOOST_INCLUDEDIR "/zhome/academic/HLRS/xrm/xrmkuchr/tools/boost_1_51_0")
-# SET(BOOST_LIBRARYDIR "/zhome/academic/HLRS/xrm/xrmkuchr/tools/boost_1_51_0/stageGCC/lib")
-#
-# ENDIF()
-#
-# IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
-# MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-# ENDIF()
-
-
-#################################################################################
-# METIS
-#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "/zhome/academic/HLRS/xrm/xrmkuchr/tools/metis-5.0.2/include")
- SET(METIS_DEBUG_LIBRARY "/zhome/academic/HLRS/xrm/xrmkuchr/tools/metis-5.0.2/build/Linux-x86_64/libmetis/libmetis.a")
- SET(METIS_RELEASE_LIBRARY "/zhome/academic/HLRS/xrm/xrmkuchr/tools/metis-5.0.2/build/Linux-x86_64/libmetis/libmetis.a")
-ENDIF()
diff --git a/CMake/cmake_config_files/HICEGATE0.config.cmake b/CMake/cmake_config_files/HICEGATE0.config.cmake
deleted file mode 100644
index efee9adbee829914f678e284a5473f5917866f88..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/HICEGATE0.config.cmake
+++ /dev/null
@@ -1,63 +0,0 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-
-########################################################################################
-## BOOST ALLGMEINGUELTIG ##
-########################################################################################
-#standard boost
-SET(BOOST_VERSION "1.54.0" CACHE STRING "std: 1.54.0")
-
-SET(USE_MPI_CXX_SYNTAX OFF)
-
-#IF(CAB_COMPILER MATCHES "gcc41")
-# SET(BOOST_USE_MULTITHREAD ON)
-
- #SET(BOOST_COMPILER_SUFFIX -gcc41)
-# SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.54.0" )
- SET(BOOST_INCLUDEDIR "/gfs1/work/niivfcpu/tools/boost_1_54_0")
- SET(BOOST_LIBRARYDIR "/gfs1/work/niivfcpu/tools/boost_1_54_0/stageGCC/lib")
- ENDIF()
-#ENDIF()
-
-#IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
-# MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-#ENDIF()
-
-#################################################################################
-# ZOLTAN
-#################################################################################
-IF(${USE_ZOLTAN})
- SET(ZOLTAN_INCLUDEDIR "/hpc3lustre/software/irmb/Trilinos/trilinos-10.6.4-Source/packages/zoltan/src/include")
- SET(ZOLTAN_DEBUG_LIBRARY "/hpc3lustre/software/irmb/Trilinos/trilinos-10.6.4-Build/packages/zoltan/src/libzoltan.a")
- SET(ZOLTAN_RELEASE_LIBRARY "/hpc3lustre/software/irmb/Trilinos/trilinos-10.6.4-Build/packages/zoltan/src/libzoltan.a")
-ENDIF()
-
-#################################################################################
-# METIS
-#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "/gfs1/work/niivfcpu/tools/metis/include")
- SET(METIS_DEBUG_LIBRARY "/gfs1/work/niivfcpu/tools/metis/lib/libmetis.a")
- SET(METIS_RELEASE_LIBRARY "/gfs1/work/niivfcpu/tools/metis/lib/libmetis.a")
-ENDIF()
-
-#################################################################################
-# YAML
-#################################################################################
-IF(${USE_YAML})
- SET(YAML_INCLUDEDIR "/gfs1/work/niivfcpu/tools/yaml-cpp/include")
- SET(YAML_DEBUG_LIBRARY "/gfs1/work/niivfcpu/tools/yaml-cpp/build/libyaml-cpp.a")
- SET(YAML_RELEASE_LIBRARY "/gfs1/work/niivfcpu/tools/yaml-cpp/build/libyaml-cpp.a")
-ENDIF()
-
-##################################################################################
-# Bond
-##################################################################################
-IF(${USE_BOND})
- SET(BOND_INCLUDEDIR "/gfs1/work/niivfcpu/tools/bond/bond_src/cpp/bond/fetol")
- SET(BOND_DEBUG_LIBRARY "/gfs1/work/niivfcpu/tools/bond/bin/lib/libbond.a")
- SET(BOND_RELEASE_LIBRARY "/gfs1/work/niivfcpu/tools/bond/bin/lib/libbond.a")
-ENDIF()
-
diff --git a/CMake/cmake_config_files/HLOGIN.config.cmake b/CMake/cmake_config_files/HLOGIN.config.cmake
deleted file mode 100644
index a88e4fa4cd56dcd3f74835e9bfe00a402eb21530..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/HLOGIN.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/GOTTFRIED.config.cmake")
\ No newline at end of file
diff --git a/CMake/cmake_config_files/HLOGIN1.config.cmake b/CMake/cmake_config_files/HLOGIN1.config.cmake
deleted file mode 100644
index a88e4fa4cd56dcd3f74835e9bfe00a402eb21530..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/HLOGIN1.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/GOTTFRIED.config.cmake")
\ No newline at end of file
diff --git a/CMake/cmake_config_files/HLOGIN2.config.cmake b/CMake/cmake_config_files/HLOGIN2.config.cmake
deleted file mode 100644
index a88e4fa4cd56dcd3f74835e9bfe00a402eb21530..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/HLOGIN2.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/GOTTFRIED.config.cmake")
\ No newline at end of file
diff --git a/CMake/cmake_config_files/HLOGIN3.config.cmake b/CMake/cmake_config_files/HLOGIN3.config.cmake
deleted file mode 100644
index a88e4fa4cd56dcd3f74835e9bfe00a402eb21530..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/HLOGIN3.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/GOTTFRIED.config.cmake")
\ No newline at end of file
diff --git a/CMake/cmake_config_files/HLOGIN4.config.cmake b/CMake/cmake_config_files/HLOGIN4.config.cmake
deleted file mode 100644
index a88e4fa4cd56dcd3f74835e9bfe00a402eb21530..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/HLOGIN4.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/GOTTFRIED.config.cmake")
\ No newline at end of file
diff --git a/CMake/cmake_config_files/HLRNG.config.cmake b/CMake/cmake_config_files/HLRNG.config.cmake
deleted file mode 100644
index faa8bde39c0e49e5108b403ff34a31afcefcbdd9..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/HLRNG.config.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-
-#################################################################################
-# METIS
-#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "/home/niikonst/libs/metis-5.1.0/include")
- SET(METIS_DEBUG_LIBRARY "/home/niikonst/libs/metis-5.1.0/build/Linux-x86_64/libmetis/libmetis.a")
- SET(METIS_RELEASE_LIBRARY "/home/niikonst/libs/metis-5.1.0/build/Linux-x86_64/libmetis/libmetis.a")
-ENDIF()
-
-
diff --git a/CMake/cmake_config_files/HOST2.config.cmake b/CMake/cmake_config_files/HOST2.config.cmake
index defe7bf92ad2089e4fa8f080a90514110cbdf83f..caba4aed96df0145ca919a760ed38a401193b8fe 100644
--- a/CMake/cmake_config_files/HOST2.config.cmake
+++ b/CMake/cmake_config_files/HOST2.config.cmake
@@ -1,21 +1,9 @@
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__APPLE__)
-
-IF(NOT CMAKE_CXX_COMPILER)
- MESSAGE(FATAL_ERROR "before cmake-config-file can be included -> project must be extecuted")
-ENDIF()
-
#################################################################################
-# MPI
+# VirtualFluids MACHINE FILE
+# Responsible: Konstantin Kutscher
+# OS: ???
#################################################################################
-#SET(MPI_DIR "C:/Program Files (x86)/mpich2")
-#SET(MPI_DIR "C:/Program Files/mpich2")
-#SET(USE_MPI_CXX_SYNTAX OFF)
-#SET(MPI_COMPILER "C:/Program Files/mpich2/bin/mpicxx")
-#SET(MPI_INCLUDE_PATH "C:/Program Files (x86)/mpich2/include")
-#SET(MPI_LIBRARY "C:/Program Files/mpich2/lib/libmpi.a")
-#SET(MPI_CXX_LIBRARY "C:/Program Files/MPICH2/lib/cxx.lib")
+
#################################################################################
# BOOST
#################################################################################
@@ -23,24 +11,12 @@ SET(BOOST_VERSION "1.47")
SET(BOOST_USE_MULTITHREAD ON)
SET(BOOST_USE_STATIC_LIBS ON)
-#IF(BOOST_VERSION MATCHES "1.47" )
- SET(BOOST_ROOT "/host/tools/boost/boost_1_47_0")
- SET(BOOST_LIBRARYDIR "/host/tools/boost/boost_1_47_0/stageLinux/lib")
-#ENDIF()
-#################################################################################
-# ZOLTAN
-#################################################################################
-IF(${USE_ZOLTAN})
- SET(ZOLTAN_INCLUDEDIR "c:/Tools/zoltan/include")
- SET(ZOLTAN_DEBUG_LIBRARY "c:/Tools/zoltan/lib/Debug/zoltan.lib")
- SET(ZOLTAN_RELEASE_LIBRARY "c:/Tools/zoltan/lib/Release/zoltan.lib")
-ENDIF()
+SET(BOOST_ROOT "/host/tools/boost/boost_1_47_0")
+SET(BOOST_LIBRARYDIR "/host/tools/boost/boost_1_47_0/stageLinux/lib")
+
#################################################################################
# METIS
#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "c:/Tools/metis-5.0.1/include")
- SET(METIS_DEBUG_LIBRARY "c:/Tools/metis-5.0.1/build/libmetis/Debug/metis.lib")
- SET(METIS_RELEASE_LIBRARY "c:/Tools/metis-5.0.1/build/libmetis/Release/metis.lib")
-ENDIF()
-set(SOURCE_ROOT "/host/Projects/pFluid/source")
\ No newline at end of file
+SET(METIS_INCLUDEDIR "c:/Tools/metis-5.0.1/include")
+SET(METIS_DEBUG_LIBRARY "c:/Tools/metis-5.0.1/build/libmetis/Debug/metis.lib")
+SET(METIS_RELEASE_LIBRARY "c:/Tools/metis-5.0.1/build/libmetis/Release/metis.lib")
diff --git a/CMake/cmake_config_files/KONRAD.config.cmake b/CMake/cmake_config_files/KONRAD.config.cmake
deleted file mode 100644
index 2144d13c18a6a6dfa2e466d09224549381404d8c..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/KONRAD.config.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-
-########################################################################################
-## BOOST ALLGMEINGUELTIG ##
-########################################################################################
-#standard boost
-SET(BOOST_VERSION "1.54.0" CACHE STRING "std: 1.54.0")
-
-#SET(USE_MPI_CXX_SYNTAX OFF)
-
-#IF(CAB_COMPILER MATCHES "gcc41")
-# SET(BOOST_USE_MULTITHREAD ON)
-
- #SET(BOOST_COMPILER_SUFFIX -gcc41)
-# SET(BOOST_USE_STATIC_LIBS ON)
-
-# IF(BOOST_VERSION MATCHES "1.54.0" )
-# SET(BOOST_INCLUDEDIR "/gfs1/work/niivfcpu/tools/boost_1_54_0")
-# SET(BOOST_LIBRARYDIR "/gfs1/work/niivfcpu/tools/boost_1_54_0/stageGCC/lib")
-# ENDIF()
-#ENDIF()
-
-#IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
-# MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-#ENDIF()
-
-
-#################################################################################
-# METIS
-#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "/gfs1/work/niikonst/libs/metis/include")
- SET(METIS_DEBUG_LIBRARY "/gfs1/work/niikonst/libs/metis/lib/libmetis.a")
- SET(METIS_RELEASE_LIBRARY "/gfs1/work/niikonst/libs/metis/lib/libmetis.a")
-ENDIF()
-
-# #################################################################################
-# # YAML
-# #################################################################################
-# IF(${USE_YAML})
-# SET(YAML_INCLUDEDIR "/hpc3lustre/software/irmb/yaml/yaml-cpp/include")
-# SET(YAML_DEBUG_LIBRARY "/hpc3lustre/software/irmb/yaml/yaml-cpp/build/libyaml-cpp.a")
-# SET(YAML_RELEASE_LIBRARY "/hpc3lustre/software/irmb/yaml/yaml-cpp/build/libyaml-cpp.a")
-# ENDIF()
-#
-# ##################################################################################
-# # Bond
-# ##################################################################################
-# IF(${USE_BOND})
-# SET(BOND_INCLUDEDIR "/hpc3lustre/home/koskuche/projects/bond/bond_src/cpp/bond/fetol")
-# SET(BOND_DEBUG_LIBRARY "/hpc3lustre/home/koskuche/projects/bond/bin/lib/libbond.a")
-# SET(BOND_RELEASE_LIBRARY "/hpc3lustre/home/koskuche/projects/bond/bin/lib/libbond.a")
-# ENDIF()
-
diff --git a/CMake/cmake_config_files/KUBUNTU64.config.cmake b/CMake/cmake_config_files/KUBUNTU64.config.cmake
deleted file mode 100644
index 4d7a3091c40f90de1484a1cbc875956de5587526..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/KUBUNTU64.config.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-#################################################################################
-# COMPILER FLAG VAR
-#################################################################################
-SET(CAB_COMPILER "gcc43" FORCE)
-SET(BOOST_VERSION "1.37.0")
-
-#################################################################################
-# BOOST AND MPI
-#################################################################################
-IF(CAB_COMPILER MATCHES "gcc43")
- IF(NEED_BOOST)
- SET(BOOST_USE_MULTITHREAD ON)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.37.0" )
-
- SET(USER_DEFINED_BOOST_COMPILER -gcc43)
- SET(BOOST_INCLUDEDIR "/opt/boost_1_37_0/gcc4.3.1/include/boost-1_37")
- SET(BOOST_LIBRARYDIR "/opt/boost_1_37_0/gcc4.3.1/lib")
- SET(BOOST_COMPILER_SUFFIX -gcc43)
-
- ENDIF()
- ENDIF()
-ENDIF()
-
-IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-ENDIF()
diff --git a/CMake/cmake_config_files/LOGIN07.config.cmake b/CMake/cmake_config_files/LOGIN07.config.cmake
deleted file mode 100644
index e19a785b2c96964fb9dc02e7ef6e84b37985be4b..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/LOGIN07.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/SUPERMUC.config.cmake")
diff --git a/CMake/cmake_config_files/LOGIN22.config.cmake b/CMake/cmake_config_files/LOGIN22.config.cmake
deleted file mode 100644
index e19a785b2c96964fb9dc02e7ef6e84b37985be4b..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/LOGIN22.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/SUPERMUC.config.cmake")
diff --git a/CMake/cmake_config_files/LRR_OPTERON.config.cmake b/CMake/cmake_config_files/LRR_OPTERON.config.cmake
deleted file mode 100644
index dce597c90d151a4f8a08a35ed28fb7b736fe89a5..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/LRR_OPTERON.config.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-OPTION(CAB_COMPILER_64BIT "64BIT COMPILATION" ON)
-
-IF(NOT CAB_COMPILER})
- SET(BOOST_VERSION "1.37.0")
-ENDIF()
-
-IF(NOT CAB_COMPILER})
- SET(CAB_COMPILER "intel10")
-ENDIF()
-
-SET(CAB_COMPILER ${CAB_COMPILER} CACHE STRING "intel10" FORCE)
-SET(CPU_TYPE "Opteron")
-
-#################################################################################
-# BOOST AND MPI
-#################################################################################
-IF(CAB_COMPILER MATCHES "intel10" )
-########################################################################################
-## intel10 ##
-########################################################################################
- SET(BOOST_USE_MULTITHREAD ON)
-
- IF(BOOST_VERSION MATCHES "1.37.0" )
-
- SET(BOOST_USE_STATIC_LIBS ON)
-
- SET(BOOST_INCLUDEDIR "/home/freudigx/sw/boost/intel/boost_1_37_0")
- SET(BOOST_LIBRARYDIR "/home/freudigx/sw/boost/intel/boost_1_37_0/lib")
-
- SET( BOOST_COMPILER_SUFFIX "-il" )
- ENDIF()
-
- SET(MPI_DIR "/sw/mpi/mvapich-1.0-intel101")
-
- SET_CXX_COMPILER("icpc")
- SET_C_COMPILER("icc")
-ENDIF()
-
-IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on "${CAB_MACHINE}" for specified compiler")
-ENDIF()
diff --git a/CMake/cmake_config_files/LUDWIG.config.cmake b/CMake/cmake_config_files/LUDWIG.config.cmake
deleted file mode 100644
index c25c581297138278bb789fc4bc1d5533116f98df..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/LUDWIG.config.cmake
+++ /dev/null
@@ -1,66 +0,0 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-
-########################################################################################
-## BOOST ALLGMEINGUELTIG ##
-########################################################################################
-#standard boost: 1.50.0
-SET(BOOST_VERSION "1.54.0" CACHE STRING "std: 1.54.0")
-
-#SET(MPI_DIR "/hpc3lustre/software/lib/openmpi-1.4.1-gcc41")
-
-SET(USE_MPI_CXX_SYNTAX OFF)
-#SET(MPI_COMPILER "/hpc3lustre/software/lib/openmpi-1.4.1-gcc41/bin/mpicxx")
-
-#IF(CAB_COMPILER MATCHES "gcc41")
- #SET(BOOST_USE_MULTITHREAD ON)
-
- #SET(BOOST_COMPILER_SUFFIX -gcc41)
- #SET(BOOST_USE_STATIC_LIBS ON)
-
- #IF(BOOST_VERSION MATCHES "1.54.0" )
- SET(BOOST_INCLUDEDIR "/hpc3lustre/software/irmb/boost/boost_1_54_0")
- SET(BOOST_LIBRARYDIR "/hpc3lustre/software/irmb/boost/boost_1_54_0/stageINTEL/lib")
- #ENDIF()
-#ENDIF()
-
-IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-ENDIF()
-
-#################################################################################
-# ZOLTAN
-#################################################################################
-IF(${USE_ZOLTAN})
- SET(ZOLTAN_INCLUDEDIR "/hpc3lustre/software/irmb/Trilinos/trilinos-10.6.4-Source/packages/zoltan/src/include")
- SET(ZOLTAN_DEBUG_LIBRARY "/hpc3lustre/software/irmb/Trilinos/trilinos-10.6.4-Build/packages/zoltan/src/libzoltan.a")
- SET(ZOLTAN_RELEASE_LIBRARY "/hpc3lustre/software/irmb/Trilinos/trilinos-10.6.4-Build/packages/zoltan/src/libzoltan.a")
-ENDIF()
-
-#################################################################################
-# METIS
-#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "/hpc3lustre/software/irmb/metis/include")
- SET(METIS_DEBUG_LIBRARY "/hpc3lustre/software/irmb/metis/lib/libmetis.a")
- SET(METIS_RELEASE_LIBRARY "/hpc3lustre/software/irmb/metis/lib/libmetis.a")
-ENDIF()
-
-#################################################################################
-# YAML
-#################################################################################
-IF(${USE_YAML})
- SET(YAML_INCLUDEDIR "/hpc3lustre/software/irmb/yaml/yaml-cpp/include")
- SET(YAML_DEBUG_LIBRARY "/hpc3lustre/software/irmb/yaml/yaml-cpp/build/libyaml-cpp.a")
- SET(YAML_RELEASE_LIBRARY "/hpc3lustre/software/irmb/yaml/yaml-cpp/build/libyaml-cpp.a")
-ENDIF()
-
-##################################################################################
-# Bond
-##################################################################################
-IF(${USE_BOND})
- SET(BOND_INCLUDEDIR "/hpc3lustre/home/koskuche/projects/bond/bond_src/cpp/bond/fetol")
- SET(BOND_DEBUG_LIBRARY "/hpc3lustre/home/koskuche/projects/bond/bin/lib/libbond.a")
- SET(BOND_RELEASE_LIBRARY "/hpc3lustre/home/koskuche/projects/bond/bin/lib/libbond.a")
-ENDIF()
-
diff --git a/CMake/cmake_config_files/M01.config.cmake b/CMake/cmake_config_files/M01.config.cmake
deleted file mode 100644
index 3553a2a9282a752c3ed96c644aa8003e90fb0b36..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/M01.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/LUDWIG.config.cmake")
\ No newline at end of file
diff --git a/CMake/cmake_config_files/M02.config.cmake b/CMake/cmake_config_files/M02.config.cmake
deleted file mode 100644
index 3553a2a9282a752c3ed96c644aa8003e90fb0b36..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/M02.config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE("CMake/cmake_config_files/LUDWIG.config.cmake")
\ No newline at end of file
diff --git a/CMake/cmake_config_files/MAFALDA.config.cmake b/CMake/cmake_config_files/MAFALDA.config.cmake
deleted file mode 100644
index cfc0d659a30f82d79e54df76637050e35a10b87d..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/MAFALDA.config.cmake
+++ /dev/null
@@ -1,68 +0,0 @@
-#################################################################################
-# COMPILER FLAG VAR
-#################################################################################
-IF(NOT CAB_COMPILER})
- IF( ${MSVC_VERSION} MATCHES "1400" AND CMAKE_CL_64)
- SET( CAB_COMPILER "msvc8_64" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1400" AND NOT CMAKE_CL_64)
- SET( CAB_COMPILER "msvc8_32" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1500" AND CMAKE_CL_64)
- SET( CAB_COMPILER "msvc9_64" )
- ELSEIF( ${MSVC_VERSION} MATCHES "1500" AND NOT CMAKE_CL_64)
- SET( CAB_COMPILER "msvc9_32" )
- ELSE()
- MESSAGE(ERROR, "unknown ms studio version MSVC_VERSION = "${MSVC_VERSION})
- ENDIF()
-ENDIF()
-
-#################################################################################
-# MPI
-#################################################################################
-IF(CMAKE_CL_64)
- SET(MPI_DIR "c:/Program Files/MPICH2")
-ELSE()
- SET(MPI_DIR "c:/Program Files (x86)/MPICH2")
-ENDIF()
-
-#################################################################################
-# BOOST
-#################################################################################
-IF(NEED_BOOST)
- SET(BOOST_USE_MULTITHREAD ON)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.35.0.svn" )
-
- SET(BOOST_INCLUDEDIR "E:/3rdPartyLibs/boost/boost_1_35")
-
- IF(CMAKE_CL_64)
- SET(BOOST_LIBRARYDIR "E:/3rdPartyLibs/boost/boost_1_35/lib/x86_64bit")
- ELSE()
- SET(BOOST_LIBRARYDIR "E:/3rdPartyLibs/boost/boost_1_35/lib/x86_32bit")
- ENDIF()
-
- ELSEIF(BOOST_VERSION MATCHES "1.35.0" )
-
- SET(BOOST_INCLUDEDIR "D:/code/3rdParty/PhysicsEngine/boost")
-
- IF(CMAKE_CL_64)
- SET(BOOST_LIBRARYDIR "D:/code/3rdParty/PhysicsEngine/boost")
- ELSE()
- SET(BOOST_LIBRARYDIR "D:/code/3rdParty/PhysicsEngine/boost")
- ENDIF()
-
- ELSEIF(BOOST_VERSION MATCHES "1.34.1" )
- SET(BOOST_INCLUDEDIR "D:/code/boost_1_34_1")
- SET(BOOST_LIBRARYDIR "D:/code/boost_1_34_1")
-
- ELSEIF(BOOST_VERSION MATCHES "1.36.0" )
- SET(BOOST_INCLUDEDIR "D:/code/boost_1_36_0")
- SET(BOOST_LIBRARYDIR "D:/code/boost_1_36_0")
-
- ENDIF()
-
- IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
- ENDIF()
-ENDIF()
-
diff --git a/CMake/cmake_config_files/PHOENIX.config.cmake b/CMake/cmake_config_files/PHOENIX.config.cmake
index 48bb20259a7bc6c1fdd93531131cb25c403a3164..1d69df88bc174c206fb3639b7d67e703dd41d5eb 100644
--- a/CMake/cmake_config_files/PHOENIX.config.cmake
+++ b/CMake/cmake_config_files/PHOENIX.config.cmake
@@ -1,16 +1,18 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
+#################################################################################
+# VirtualFluids MACHINE FILE
+# Responsible: Konstantin Kutscher
+# OS: CentOS 7.3
+#################################################################################
SET(BOOST_VERSION "1.63.0" CACHE STRING "std: 1.63.0")
#################################################################################
# METIS
#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "/cluster/lib/metis/5.1.0/gcc/include")
- SET(METIS_DEBUG_LIBRARY "/cluster/lib/metis/5.1.0/gcc/lib/libmetis.a")
- SET(METIS_RELEASE_LIBRARY "/cluster/lib/metis/5.1.0/gcc/lib/libmetis.a")
-ENDIF()
+SET(METIS_INCLUDEDIR "/cluster/lib/metis/5.1.0/gcc/include")
+SET(METIS_DEBUG_LIBRARY "/cluster/lib/metis/5.1.0/gcc/lib/libmetis.a")
+SET(METIS_RELEASE_LIBRARY "/cluster/lib/metis/5.1.0/gcc/lib/libmetis.a")
+
#################################################################################
# PE
@@ -33,11 +35,6 @@ IF(${USE_DEM_COUPLING})
ENDIF()
-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 "/cluster/lib/boost/1.63.0/gcc" CACHE PATH "BOOST_ROOT")
SET(BOOST_LIBRARYDIR "/cluster/lib/boost/1.63.0/gcc/lib" CACHE PATH "BOOST_LIBRARYDIR")
@@ -46,6 +43,4 @@ SET(BOOST_LIBRARYDIR "/cluster/lib/boost/1.63.0/gcc/lib" CACHE PATH "BOOST_LIB
#SET(VTK_DIR "/home/irmb/tools/VTK/build/VTK-8.2.0" CACHE PATH "VTK directory override" FORCE)
#SET(VTK_DIR "/home/stelenz/software/vtk/VTK-8.1.0/build" CACHE PATH "VTK directory override" FORCE)
-SET(CUDA_CUT_INCLUDE_DIR "/cluster/cuda/9.0/include;/cluster/cuda/9.0/samples/common/inc" CACHE PATH "CUDA_CUT_INCLUDE_DIR")
-
-SET(CUDA_SAMPLE_INCLUDE_DIR "/cluster/cuda/9.0/samples/common/inc" CACHE PATH "CUDA_CUT_INCLUDE_DIR")
+set(NVCUDASAMPLES_ROOT "/cluster/cuda/11.0/samples")
diff --git a/CMake/cmake_config_files/PIPPIN.config.cmake b/CMake/cmake_config_files/PIPPIN.config.cmake
deleted file mode 100644
index 8c548b2f1c8bfdf816894cbc4b6b48fa2fa05034..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/PIPPIN.config.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-#################################################################################
-# MPI
-#################################################################################
-IF(CMAKE_CL_64)
- IF(NEED_MPI)
- MESSAGE(FATAL_ERROR "kein 64 bit mpi installiert")
- ENDIF()
- #SET(MPI_DIR "c:/Program Files/MPICH2")
-ELSE()
- SET(MPI_DIR "c:/Program Files (x86)/MPICH2")
-ENDIF()
-
-#################################################################################
-# BOOST
-#################################################################################
-SET(BOOST_VERSION 1.38.0)
-SET(BOOST_USE_MULTITHREAD ON)
-SET(BOOST_USE_STATIC_LIBS ON)
-
-IF(CMAKE_CL_64)
- MESSAGE(FATAL_ERROR "kein 64 bit boost ${BOOST_VERSION} installiert")
-ELSE()
- SET(BOOST_INCLUDEDIR "C:/Program Files (x86)/boost/boost_1_38")
- SET(BOOST_LIBRARYDIR "C:/Program Files (x86)/boost/boost_1_38/lib")
-ENDIF()
diff --git a/CMake/cmake_config_files/SAMWEIS.config.cmake b/CMake/cmake_config_files/SAMWEIS.config.cmake
index 68fa413d8d85dc14687fa5e8b7d11f4e3c13c0ea..5b08c08610c37e1a38947d8842ca744622ffa524 100644
--- a/CMake/cmake_config_files/SAMWEIS.config.cmake
+++ b/CMake/cmake_config_files/SAMWEIS.config.cmake
@@ -1,21 +1,9 @@
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__APPLE__)
-
-IF(NOT CMAKE_CXX_COMPILER)
- MESSAGE(FATAL_ERROR "before cmake-config-file can be included -> project must be extecuted")
-ENDIF()
-
#################################################################################
-# MPI
+# VirtualFluids MACHINE FILE
+# Responsible: Lennard Lux
+# OS: Windows 10
#################################################################################
-#SET(MPI_DIR "C:/Program Files (x86)/mpich2")
-#SET(MPI_DIR "C:/Program Files/mpich2")
-#SET(USE_MPI_CXX_SYNTAX OFF)
-#SET(MPI_COMPILER "C:/Program Files/mpich2/bin/mpicxx")
-#SET(MPI_INCLUDE_PATH "C:/Program Files (x86)/mpich2/include")
-#SET(MPI_LIBRARY "C:/Program Files/mpich2/lib/libmpi.a")
-#SET(MPI_CXX_LIBRARY "C:/Program Files/MPICH2/lib/cxx.lib")
+
#################################################################################
# BOOST
#################################################################################
@@ -27,46 +15,10 @@ SET(BOOST_LIBRARYDIR ${BOOST_ROOT}"/stageMSVC64/lib")
# VTK
#################################################################################
set(VTK_DIR "E:/Tools/VTK-8.1.2-build")
-#################################################################################
-# ZOLTAN
-#################################################################################
-IF(${USE_ZOLTAN})
- SET(ZOLTAN_INCLUDEDIR "d:/Tools/zoltan/include")
- SET(ZOLTAN_DEBUG_LIBRARY "d:/Tools/zoltan/lib/Debug/zoltan.lib")
- SET(ZOLTAN_RELEASE_LIBRARY "d:/Tools/zoltan/lib/Release/zoltan.lib")
-ENDIF()
#################################################################################
# METIS
#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "c:/Tools/metis-5.1.0/include")
- SET(METIS_DEBUG_LIBRARY "c:/Tools/metis-5.1.0/build/libmetis/Debug/metis.lib")
- SET(METIS_RELEASE_LIBRARY "c:/Tools/metis-5.1.0/build/libmetis/Release/metis.lib")
-ENDIF()
-
-##################################################################################
-# FETOL
-##################################################################################
-IF(${USE_FETOL})
- SET(FETOL_INCLUDEDIR "d:/Projects/FETOL/dev/CppFETOLlib")
- SET(FETOL_DEBUG_LIBRARY "d:/Projects/FETOL/dev/CppFETOLlib/build/Debug/fetol.lib")
- SET(FETOL_RELEASE_LIBRARY "d:/Projects/FETOL/dev/CppFETOLlib/build/Release/fetol.lib")
-
- SET(YAML_INCLUDEDIR "d:/Tools/yaml-cpp/include")
- SET(YAML_DEBUG_LIBRARY "d:/Tools/yaml-cpp/buildVS11/Debug/libyaml-cppmdd.lib")
- SET(YAML_RELEASE_LIBRARY "d:/Tools/yaml-cpp/buildVS11/Release/libyaml-cppmd.lib")
-
- SET(BOND_INCLUDEDIR "d:/Projects/FETOL/dev/bond_src/cpp/bond/fetol")
- SET(BOND_DEBUG_LIBRARY "d:/Projects/FETOL/dev/bond_lib/Debug/bond.lib")
- SET(BOND_RELEASE_LIBRARY "d:/Projects/FETOL/dev/bond_lib/Release/bond.lib")
-ENDIF()
-
-##################################################################################
-# Java
-##############################################################################
-### FindJNI.cmake
-#find_package(JNI REQUIRED)
-#SET(JNI_INCLUDE_DIRS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2} ${JAVA_AWT_INCLUDE_PATH})
-#SET(JNI_LIBRARIES ${JAVA_AWT_LIBRARY} ${JAVA_JVM_LIBRARY})
-#SET(JNI_FOUND 1)
\ No newline at end of file
+SET(METIS_INCLUDEDIR "c:/Tools/metis-5.1.0/include")
+SET(METIS_DEBUG_LIBRARY "c:/Tools/metis-5.1.0/build/libmetis/Debug/metis.lib")
+SET(METIS_RELEASE_LIBRARY "c:/Tools/metis-5.1.0/build/libmetis/Release/metis.lib")
diff --git a/CMake/cmake_config_files/SHELOB.config.cmake b/CMake/cmake_config_files/SHELOB.config.cmake
deleted file mode 100644
index f2f62ad9dd1c710ca881653d56a4c1c2a422a348..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/SHELOB.config.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__APPLE__)
-
-#################################################################################
-# RUBY
-#################################################################################
-#IF(CMAKE_CL_64)
-# SET(RUBY_EXECUTABLE "C:/ruby191/bin/ruby.exe")
-# SET(RUBY_LIBRARY "C:/ruby191/lib/msvcr90-ruby191.lib")
-#ELSE()
-# SET(RUBY_EXECUTABLE "C:/ruby186/bin/ruby.exe")
-# SET(RUBY_LIBRARY "C:/ruby186/lib/msvcrt-ruby18.lib")
-#ENDIF()
-
-#################################################################################
-# SWIG
-#################################################################################
-SET(SWIG_EXECUTABLE "/Users/freud/dev/swig/bin/swig")
-
-
-########################################################################################
-## BOOST ALLGMEINGUELTIG ##
-########################################################################################
-#standard boost: 1.41.0
-SET(BOOST_VERSION "1.41.0" CACHE STRING "std: 1.41.0")
-
-SET(MPI_DIR "/usr/local/mpich2/gcc401")
-
-IF(CAB_COMPILER MATCHES "gcc42")
- SET(BOOST_USE_MULTITHREAD ON)
-
- SET(BOOST_COMPILER_SUFFIX -xgcc40)
- SET(BOOST_USE_STATIC_LIBS ON)
-
- IF(BOOST_VERSION MATCHES "1.41.0" )
- SET(BOOST_INCLUDEDIR "/scratch/shared/boost_1_41_0/include")
- SET(BOOST_LIBRARYDIR "/scratch/shared/boost_1_41_0/lib")
- ELSEIF(BOOST_VERSION MATCHES "1.39.0" )
- SET(BOOST_INCLUDEDIR "/usr/local/boost/gcc401/boost_1_39_0/include/boost-1_39")
- SET(BOOST_LIBRARYDIR "/usr/local/boost/gcc401/boost_1_39_0/lib")
- ENDIF()
-ENDIF()
-
-IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
- MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-ENDIF()
-
-
diff --git a/CMake/cmake_config_files/SMAUG.config.cmake b/CMake/cmake_config_files/SMAUG.config.cmake
deleted file mode 100644
index 09c9f4420ea26d937e5dacbe2573022f318c2989..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/SMAUG.config.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-IF(NOT CMAKE_CXX_COMPILER)
- MESSAGE(FATAL_ERROR "before cmake-config-file can be included -> project must be extecuted")
-ENDIF()
-
-
-#################################################################################
-# BOOST
-#################################################################################
-SET(BOOST_VERSION "1.44")
-SET(BOOST_USE_MULTITHREAD ON)
-SET(BOOST_USE_STATIC_LIBS ON)
-
-IF(BOOST_VERSION MATCHES "1.44" )
- SET(BOOST_INCLUDEDIR "C:/boost/boost_1_44_0")
- SET(BOOST_LIBRARYDIR "C:/boost/boost_1_44_0/stage64/lib")
-ENDIF()
-#################################################################################
-# ZOLTAN
-#################################################################################
- SET(ZOLTAN_INCLUDEDIR "c:/zoltan/include")
- SET(ZOLTAN_LIBRARY "c:/zoltan/lib/Debug/zoltan.lib")
-
-set(SOURCE_ROOT "g:/Kostja/pFluid/source")
-
-
-
-
diff --git a/CMake/cmake_config_files/SP0201.config.cmake b/CMake/cmake_config_files/SP0201.config.cmake
deleted file mode 100644
index bf28750def2e59a571e64af3c62ef9149041e616..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/SP0201.config.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__AIX__)
-
-
-IF(NOT CMAKE_CXX_COMPILER)
- MESSAGE(FATAL_ERROR "before cmake-config-file can be included -> project must be extecuted")
-ENDIF()
-
-#################################################################################
-# MPI
-#################################################################################
-SET(USE_MPI_CXX_SYNTAX OFF)
-#################################################################################
-# BOOST
-#################################################################################
-SET(BOOST_VERSION "1.44")
-SET(BOOST_USE_MULTITHREAD ON)
-SET(BOOST_USE_STATIC_LIBS ON)
-
-IF(BOOST_VERSION MATCHES "1.44" )
- SET(BOOST_INCLUDEDIR "/sp6/userdeisa/lrz102bk/tools/boost_1_44_0")
- SET(BOOST_LIBRARYDIR "/sp6/userdeisa/lrz102bk/tools/boost_1_44_0/stage/lib")
-ENDIF()
-
-set(SOURCE_ROOT "/sp6/userdeisa/lrz102bk/projects/pFluid/source")
-set(pFluid_ROOT "/sp6/userdeisa/lrz102bk/projects/pFluid")
\ No newline at end of file
diff --git a/CMake/cmake_config_files/SUPERMUC.config.cmake b/CMake/cmake_config_files/SUPERMUC.config.cmake
deleted file mode 100644
index 91316ea69f2aa2e33abe4cc6e4b62552d0b0247e..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/SUPERMUC.config.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-
-########################################################################################
-## BOOST ALLGMEINGUELTIG ##
-########################################################################################
-#standard boost
-SET(BOOST_VERSION "1.61.0" CACHE STRING "std: 1.61.0")
-SET(BOOST_INCLUDEDIR "/lrz/sys/libraries/boost/1.61_icc/include")
-SET(BOOST_LIBRARYDIR "/lrz/sys/libraries/boost/1.61_icc/lib")
-
-#IF(BOOST_VERSION AND NOT BOOST_INCLUDEDIR)
-# MESSAGE("${BOOST_VERSION} not found on ${CAB_MACHINE} for specified compiler")
-#ENDIF()
-
-#################################################################################
-# METIS
-#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "/lrz/sys/libraries/metis/5.1.0/i4r4/include")
- SET(METIS_DEBUG_LIBRARY "/lrz/sys/libraries/metis/5.1.0/i4r4/lib/libmetis.a")
- SET(METIS_RELEASE_LIBRARY "/lrz/sys/libraries/metis/5.1.0/i4r4/lib/libmetis.a")
-ENDIF()
diff --git a/CMake/cmake_config_files/TESLA01.config.cmake b/CMake/cmake_config_files/TESLA01.config.cmake
index bc3b0e796a45d49cc654813293cad84ae9d79865..c92603b3508a2cac51019cc80d99083e2a400a58 100644
--- a/CMake/cmake_config_files/TESLA01.config.cmake
+++ b/CMake/cmake_config_files/TESLA01.config.cmake
@@ -1,18 +1,17 @@
-#Don't change:
-SET(METIS_ROOT ${VF_THIRD_DIR}/metis/metis-5.1.0 CACHE PATH "METIS ROOT")
-SET(GMOCK_ROOT ${VF_THIRD_DIR}/googletest CACHE PATH "GMOCK ROOT")
-SET(JSONCPP_ROOT ${VF_THIRD_DIR}/jsoncpp CACHE PATH "JSONCPP ROOT")
-SET(FFTW_ROOT ${VF_THIRD_DIR}/fftw/fftw-3.3.7 CACHE PATH "JSONCPP ROOT")
+#################################################################################
+# VirtualFluids MACHINE FILE
+# Responsible: Soeren Peters
+# OS: Windows 10
+#################################################################################
-
-#SET TO CORRECT PATH:
SET(BOOST_ROOT "C:\\Libraries\\boost_1_65_1" CACHE PATH "BOOST_ROOT")
SET(BOOST_LIBRARYDIR "C:\\Libraries\\boost_1_65_1\\lib" CACHE PATH "BOOST_LIBRARYDIR")
SET(VTK_DIR "C:/Libraries/VTK-8.0.1/build")
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "C:/Libraries/metis-5.1.0//include")
- SET(METIS_DEBUG_LIBRARY "C:/Libraries/metis-5.1.0/build/libmetis/Debug/metis.lib")
- SET(METIS_RELEASE_LIBRARY "C:/Libraries/metis-5.1.0/build/libmetis/Release/metis.lib")
-ENDIF()
+#################################################################################
+# METIS
+#################################################################################
+SET(METIS_INCLUDEDIR "C:/Libraries/metis-5.1.0//include")
+SET(METIS_DEBUG_LIBRARY "C:/Libraries/metis-5.1.0/build/libmetis/Debug/metis.lib")
+SET(METIS_RELEASE_LIBRARY "C:/Libraries/metis-5.1.0/build/libmetis/Release/metis.lib")
diff --git a/CMake/cmake_config_files/TESLA03.config.cmake b/CMake/cmake_config_files/TESLA03.config.cmake
index ac45019eb659c4559e7b1e4d0b3437fbc8c2cd8a..110c78ebcecb7c3d8393da4494d9a677c679b611 100644
--- a/CMake/cmake_config_files/TESLA03.config.cmake
+++ b/CMake/cmake_config_files/TESLA03.config.cmake
@@ -1,3 +1,9 @@
+#################################################################################
+# VirtualFluids MACHINE FILE
+# Responsible: Martin Schoenherr
+# OS: Windows 10
+#################################################################################
+
#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")
diff --git a/CMake/cmake_config_files/TOLKIEN.config.cmake b/CMake/cmake_config_files/TOLKIEN.config.cmake
deleted file mode 100644
index 5ad8d989c1d5f26368190237f1ea89d8898595bd..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/TOLKIEN.config.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-IF(NOT CMAKE_CXX_COMPILER)
- MESSAGE(FATAL_ERROR "before cmake-config-file can be included -> project must be extecuted")
-ENDIF()
-
-#################################################################################
-# MPI
-#################################################################################
-SET(MPI_DIR "C:/Program Files/mpich2")
-
-#################################################################################
-# BOOST
-#################################################################################
-SET(BOOST_VERSION "1.38")
-SET(BOOST_USE_MULTITHREAD ON)
-SET(BOOST_USE_STATIC_LIBS ON)
-
-IF(BOOST_VERSION MATCHES "1.38" )
- SET(BOOST_INCLUDEDIR "C:/Program Files/boost/boost_1_38")
- SET(BOOST_LIBRARYDIR "C:/Program Files/boost/boost_1_38/lib")
-ENDIF()
-
-
diff --git a/CMake/cmake_config_files/TOLKIEN2.config.cmake b/CMake/cmake_config_files/TOLKIEN2.config.cmake
deleted file mode 100644
index 5ad8d989c1d5f26368190237f1ea89d8898595bd..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/TOLKIEN2.config.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-IF(NOT CMAKE_CXX_COMPILER)
- MESSAGE(FATAL_ERROR "before cmake-config-file can be included -> project must be extecuted")
-ENDIF()
-
-#################################################################################
-# MPI
-#################################################################################
-SET(MPI_DIR "C:/Program Files/mpich2")
-
-#################################################################################
-# BOOST
-#################################################################################
-SET(BOOST_VERSION "1.38")
-SET(BOOST_USE_MULTITHREAD ON)
-SET(BOOST_USE_STATIC_LIBS ON)
-
-IF(BOOST_VERSION MATCHES "1.38" )
- SET(BOOST_INCLUDEDIR "C:/Program Files/boost/boost_1_38")
- SET(BOOST_LIBRARYDIR "C:/Program Files/boost/boost_1_38/lib")
-ENDIF()
-
-
diff --git a/CMake/cmake_config_files/UBUNTU.config.cmake b/CMake/cmake_config_files/UBUNTU.config.cmake
deleted file mode 100644
index b266286f44fe98575f932128080c22a57b1535d2..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/UBUNTU.config.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__unix__)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__UNIX__)
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D__APPLE__)
-
-IF(NOT CMAKE_CXX_COMPILER)
- MESSAGE(FATAL_ERROR "before cmake-config-file can be included -> project must be extecuted")
-ENDIF()
-
-#################################################################################
-# MPI
-#################################################################################
-#SET(MPI_DIR "C:/Program Files (x86)/mpich2")
-#SET(MPI_DIR "C:/Program Files/mpich2")
-#SET(USE_MPI_CXX_SYNTAX OFF)
-#SET(MPI_COMPILER "C:/Program Files/mpich2/bin/mpicxx")
-#SET(MPI_INCLUDE_PATH "C:/Program Files (x86)/mpich2/include")
-#SET(MPI_LIBRARY "C:/Program Files/mpich2/lib/libmpi.a")
-#SET(MPI_CXX_LIBRARY "C:/Program Files/MPICH2/lib/cxx.lib")
-#################################################################################
-# BOOST
-#################################################################################
-SET(BOOST_VERSION "1.47")
-SET(BOOST_USE_MULTITHREAD ON)
-SET(BOOST_USE_STATIC_LIBS ON)
-
-IF(BOOST_VERSION MATCHES "1.47" )
- SET(BOOST_ROOT "/host/tools/boost/boost_1_47_0")
- SET(BOOST_LIBRARYDIR "/host/tools/boost/boost_1_47_0/stageLinux/lib")
-ENDIF()
-#################################################################################
-# ZOLTAN
-#################################################################################
-IF(${USE_ZOLTAN})
- SET(ZOLTAN_INCLUDEDIR "/home/kostja/tools/Zoltan_v3.5/bin/include")
- SET(ZOLTAN_DEBUG_LIBRARY "/home/kostja/tools/Zoltan_v3.5/bin/lib/libzoltan.a")
- SET(ZOLTAN_RELEASE_LIBRARY "/home/kostja/tools/Zoltan_v3.5/bin/lib/libzoltan.a")
-ENDIF()
-#################################################################################
-# METIS
-#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "/home/kostja/tools/metis-5.0.1/include")
- SET(METIS_DEBUG_LIBRARY "/home/kostja/tools/metis-5.0.1/build/Linux-x86_64/libmetis/libmetis.a")
- SET(METIS_RELEASE_LIBRARY "/home/kostja/tools/metis-5.0.1/build/Linux-x86_64/libmetis/libmetis.a")
-ENDIF()
-set(SOURCE_ROOT "/host/Projects/pFluid/source")
\ No newline at end of file
diff --git a/CMake/cmake_config_files/YWANG.config.cmake b/CMake/cmake_config_files/YWANG.config.cmake
deleted file mode 100644
index 9e802e4840926ccbd1ff24df77e6ef8752c46fb6..0000000000000000000000000000000000000000
--- a/CMake/cmake_config_files/YWANG.config.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-IF(NOT CMAKE_CXX_COMPILER)
- MESSAGE(FATAL_ERROR "before cmake-config-file can be included -> project must be extecuted")
-ENDIF()
-
-#################################################################################
-# BOOST
-#################################################################################
-SET(BOOST_VERSION "1.49")
-SET(BOOST_USE_MULTITHREAD ON)
-SET(BOOST_USE_STATIC_LIBS ON)
-
-IF(BOOST_VERSION MATCHES "1.49" )
- SET(BOOST_ROOT "C:/boost/boost_1_49_0")
- SET(BOOST_LIBRARYDIR "c:/boost/boost_1_49_0/stageMSVC64/lib")
-ENDIF()
-
-#################################################################################
-# METIS
-#################################################################################
-IF(${USE_METIS})
- SET(METIS_INCLUDEDIR "c:/metis-5.1.0/include")
- SET(METIS_DEBUG_LIBRARY "c:/metis-5.1.0/build/libmetis/Debug/metis.lib")
- SET(METIS_RELEASE_LIBRARY "c:/metis-5.1.0/build/libmetis/Release/metis.lib")
-ENDIF()
diff --git a/CMake/compilerflags/AppleClang.cmake b/CMake/compilerflags/AppleClang.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..ef97a54a4ebe17bde5e016e04a40a187371172e9
--- /dev/null
+++ b/CMake/compilerflags/AppleClang.cmake
@@ -0,0 +1,42 @@
+###############################################################################################################
+##
+## apple clang
+##
+###############################################################################################################
+
+#############################################################################################################
+# Flags
+#############################################################################################################
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3;-fomit-frame-pointer;-finline-functions;-fPIC;-Wbackslash-newline-escape")
+
+#############################################################################################################
+# mt support
+#############################################################################################################
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
+
+#############################################################################################################
+# c++ 11 support
+#############################################################################################################
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
+
+
+# test
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "-Wall")
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "-Werror")
+
+#############################################################################################################
+# disable warning
+#############################################################################################################
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wbackslash-newline-escape") #backslash and newline separated by space
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wcomment") #'/*' within block comment
+
+#############################################################################################################
+# c++ 17 support
+#############################################################################################################
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++17")
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++17")
+
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fext-numeric-literals")
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_GLIBCXX_USE_CXX11_ABI=0")
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wregister")
diff --git a/CMake/compilerflags/Clang.cmake b/CMake/compilerflags/Clang.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..4e79d520c0b91a41d62f658092489941926bda05
--- /dev/null
+++ b/CMake/compilerflags/Clang.cmake
@@ -0,0 +1,40 @@
+###############################################################################################################
+##
+## clang
+##
+###############################################################################################################
+
+#############################################################################################################
+# Flags
+#############################################################################################################
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3;-fomit-frame-pointer;-finline-functions;-fPIC;-Wbackslash-newline-escape")
+
+#############################################################################################################
+# mt support
+#############################################################################################################
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
+
+#############################################################################################################
+# c++ 11 support
+#############################################################################################################
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
+
+#############################################################################################################
+# disable warning
+#############################################################################################################
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wbackslash-newline-escape") #backslash and newline separated by space
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wcomment") #'/*' within block comment
+
+#############################################################################################################
+# c++ 17 support
+#############################################################################################################
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++17")
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++17")
+
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fext-numeric-literals")
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_GLIBCXX_USE_CXX11_ABI=0")
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wregister")
+
+
+LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
\ No newline at end of file
diff --git a/CMake/compilerflags/GNU.cmake b/CMake/compilerflags/GNU.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..08dc75adc01375fc35ddd46bc00ae539dce4c96c
--- /dev/null
+++ b/CMake/compilerflags/GNU.cmake
@@ -0,0 +1,30 @@
+
+#############################################################################################################
+# Flags
+#############################################################################################################
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3;-fomit-frame-pointer;-finline-functions;-funroll-all-loops;-fPIC")
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
+
+#############################################################################################################
+# mt support
+#############################################################################################################
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
+
+#############################################################################################################
+# c++ 11 support
+#############################################################################################################
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
+
+#############################################################################################################
+# c++ 17 support
+#############################################################################################################
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++17")
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++17")
+
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fext-numeric-literals")
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_GLIBCXX_USE_CXX11_ABI=0")
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wregister")
+
+
+list(APPEND VF_LINK_OPTIONS -lgomp)
+list(APPEND VF_LINK_OPTIONS -lrt)
diff --git a/CMake/compilerflags/Intel.cmake b/CMake/compilerflags/Intel.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..4f4c7bb3ed2dad45a6f91e644fa0d74e5b4d98be
--- /dev/null
+++ b/CMake/compilerflags/Intel.cmake
@@ -0,0 +1,37 @@
+###############################################################################################################
+## intel
+###############################################################################################################
+
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O")
+#~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd654")
+#~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1125") #virtual function override intended
+#~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1224") #warning directive: This file includes at least one deprecated or antiquated header
+#~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd377") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
+#~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
+#~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
+#~
+#~ LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-wd266") #function "__GKfree" declared implicitly
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-xHOST -O3 -ip -ipo -fno-alias -mcmodel=medium -qopt-streaming-stores=always")
+
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1478") #auto_ptr warning from mu::Parser
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-xHOST;-O3;-ip;-fno-alias;-mcmodel=medium;-qopt-streaming-stores=always;-xCORE-AVX512;-qopt-zmm-usage=high")
+
+#Debug
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-g -traceback")
+
+###############################################################################################################
+## mt support
+###############################################################################################################
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
+
+#############################################################################################################
+# c++ 11 support
+#############################################################################################################
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
+
+list(APPEND VF_LINK_OPTIONS -parallel)
+list(APPEND VF_LINK_OPTIONS -irc)
+
+
+# LIST(APPEND VF_COMPILER_DEFINITION MPICH_IGNORE_CXX_SEEK)
+# LIST(APPEND VF_COMPILER_DEFINITION MPICH_SKIP_MPICXX)
diff --git a/CMake/compilerflags/MSVC.cmake b/CMake/compilerflags/MSVC.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..0a279571cc9aa2cba70476316068f52463246b03
--- /dev/null
+++ b/CMake/compilerflags/MSVC.cmake
@@ -0,0 +1,27 @@
+###############################################################################################################
+## MSVC
+###############################################################################################################
+
+###############################################################################################################
+## USE_UNSECURE_STL_VECTORS_RELEASE ?
+###############################################################################################################
+OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
+IF(USE_UNSECURE_STL_VECTORS_RELEASE)
+ # More MSVC specific compilation flags
+ LIST(APPEND VF_COMPILER_DEFINITION _SECURE_SCL=0)
+ LIST(APPEND VF_COMPILER_DEFINITION _SCL_SECURE_NO_WARNINGS)
+ENDIF()
+
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/W1")
+#LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/Wall")
+
+###############################################################################################################
+## Flags
+###############################################################################################################
+LIST(APPEND VF_COMPILER_DEFINITION _CRT_SECURE_NO_DEPRECATE) # disable warnings promoting Microsoft's security enhanced CRT
+LIST(APPEND VF_COMPILER_DEFINITION _SCL_SECURE_NO_WARNINGS) # disable warnings triggered by Microsoft's checked iterators
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") # deprecated strcpy...
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") # forcing value to bool 'true' or 'false' (performance warning)
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") # ansonsten funzt mit boost das compilieren unter windows nimmer
+
+LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-MP") # enable multi-threaded compiling
\ No newline at end of file
diff --git a/CMake/compilerflags/clang.cmake b/CMake/compilerflags/clang.cmake
deleted file mode 100644
index af6fd3b16255a64dd12bd3c5fd27a40e2f12c2f5..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/clang.cmake
+++ /dev/null
@@ -1,68 +0,0 @@
-###############################################################################################################
-##
-## clang
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- #############################################################################################################
- # Flags
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3;-fomit-frame-pointer;-finline-functions;-fPIC;-Wbackslash-newline-escape")
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3;-fomit-frame-pointer;-finline-functions;-fPIC")
-
- #############################################################################################################
- # 64Bit support
- #############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- 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
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- #############################################################################################################
- # c++ 11 support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++11")
-
- #############################################################################################################
- # disable warning
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wbackslash-newline-escape") #backslash and newline separated by space
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wcomment") #'/*' within block comment
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-Wbackslash-newline-escape") #backslash and newline separated by space
-
- #############################################################################################################
- # c++ 17 support
- #############################################################################################################
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++17")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++17")
-
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fext-numeric-literals")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_GLIBCXX_USE_CXX11_ABI=0")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wregister")
-
-
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc33.cmake b/CMake/compilerflags/gcc33.cmake
deleted file mode 100644
index 88e52224110fa5177048e4aa40737fc846d9cb29..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc33.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################################################
-##
-## gcc33
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type)
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -ffast-math -Wall -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- IF(CPU_TYPE MATCHES "Opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-march=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-march=opteron" )
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-march=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-march=opteron" )
- ENDIF()
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- MESSAGE(STATUS "gcc33 has no OpenMP support -> OpenMP deactivated")
- SET(USE_OPENMP "OFF")
- ENDIF()
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type)
-
diff --git a/CMake/compilerflags/gcc34.cmake b/CMake/compilerflags/gcc34.cmake
deleted file mode 100644
index f052bf9fe2dabc36b72afdbf5424fafb7410676b..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc34.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################################################
-##
-## gcc34
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -ffast-math -Wall -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- IF(CPU_TYPE MATCHES "Opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mtune=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mcpu=opteron" )
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mtune=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mcpu=opteron" )
- ENDIF()
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- MESSAGE(STATUS "gcc34 has no OpenMP support -> OpenMP deactivated")
- SET(USE_OPENMP "OFF")
- ENDIF()
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
diff --git a/CMake/compilerflags/gcc40.cmake b/CMake/compilerflags/gcc40.cmake
deleted file mode 100644
index e16bc3504dd436253d05ce24e56ba297f3ef6760..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc40.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-###############################################################################################################
-##
-## gcc40
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- IF(CPU_TYPE MATCHES "Opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mtune=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mcpu=opteron" )
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mtune=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mcpu=opteron" )
- ENDIF()
-
-
- ###############################################################################################################
- ## 64Bit support
- ###############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-m64" )
- ENDIF()
-
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- MESSAGE(STATUS "gcc40 has no OpenMP support -> OpenMP deactivated")
- SET(USE_OPENMP "OFF")
- ENDIF()
-
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc41.cmake b/CMake/compilerflags/gcc41.cmake
deleted file mode 100644
index 34f54b74c2bb6030fea770d0599cb9545550b17e..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc41.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-###############################################################################################################
-##
-## gcc41
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- IF(CPU_TYPE MATCHES "Opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mtune=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mcpu=opteron" )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mtune=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mcpu=opteron" )
- ENDIF()
-
- ###############################################################################################################
- ## 64Bit support
- ###############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-m64" )
- ENDIF()
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- MESSAGE(STATUS "gcc41 has no OpenMP support -> OpenMP deactivated")
- SET(USE_OPENMP "OFF")
- ENDIF()
-
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc42.cmake b/CMake/compilerflags/gcc42.cmake
deleted file mode 100644
index a81e7ff0f3e8234944e11bdb0f7716785e86862b..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc42.cmake
+++ /dev/null
@@ -1,57 +0,0 @@
-###############################################################################################################
-##
-## gcc42
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- #Anmerkung: bei O3 oder "O2 mit finline-function" gibt es Probleme beim MuParser. bug im gcc?
- #Bug kann durch "test" in MuParser/examples ueberprueft werden
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O2 -fomit-frame-pointer -funroll-all-loops -fPIC")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O2 -fomit-frame-pointer -finline-functions -funroll-all-loops")
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- IF(CPU_TYPE MATCHES "Opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mtune=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mcpu=opteron" )
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mtune=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mcpu=opteron" )
- ENDIF()
-
-
- ###############################################################################################################
- ## 64Bit support
- ###############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-m64" )
- ENDIF()
-
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fopenmp")
- ENDIF()
-
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc43.cmake b/CMake/compilerflags/gcc43.cmake
deleted file mode 100644
index bc7deed357ea326e258c7ee3f110fd38a0ce917b..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc43.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-###############################################################################################################
-##
-## gcc43
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- IF(CPU_TYPE MATCHES "Opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mtune=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mcpu=opteron" )
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mtune=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mcpu=opteron" )
- ENDIF()
-
-
- ###############################################################################################################
- ## 64Bit support
- ###############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-m64" )
- ENDIF()
-
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fopenmp")
- ENDIF()
-
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc44.cmake b/CMake/compilerflags/gcc44.cmake
deleted file mode 100644
index 10b8f71f7693789d79f298fedebb5e03d89ddc07..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc44.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-###############################################################################################################
-##
-## gcc44
-##
-###############################################################################################################
-
-#MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type)
-#ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type)
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- IF(CPU_TYPE MATCHES "Opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mtune=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mcpu=opteron" )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mtune=opteron")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mcpu=opteron" )
- ENDIF()
-
-
- ###############################################################################################################
- ## 64Bit support
- ###############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-m64" )
- ENDIF()
-
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fopenmp")
- ENDIF()
-
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc45.cmake b/CMake/compilerflags/gcc45.cmake
deleted file mode 100644
index 5c4d597e2ebef788272bb7cc48941797ee20d779..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc45.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-###############################################################################################################
-##
-## gcc45
-##
-###############################################################################################################
-
-#MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type)
-#ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type)
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- # IF(CPU_TYPE MATCHES "Opteron")
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mtune=opteron")
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mcpu=opteron" )
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mtune=opteron")
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mcpu=opteron" )
- # ENDIF()
-
-
- # ###############################################################################################################
- # ## 64Bit support
- # ###############################################################################################################
- # IF( ${use64BitOptions} )
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-m64" )
- # ENDIF()
-
-
- # ###############################################################################################################
- # ## OpenMP support
- # ###############################################################################################################
- # IF(USE_OPENMP)
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fopenmp")
- # ENDIF()
-
-
- # ###############################################################################################################
- # ## mt support
- # ###############################################################################################################
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- # IF(NOT APPLE)
- # LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- # ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc46.cmake b/CMake/compilerflags/gcc46.cmake
deleted file mode 100644
index 2f56fac857cf3a63f2c9eb3ef8e857c94941ac4e..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc46.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-###############################################################################################################
-##
-## gcc46
-##
-###############################################################################################################
-
-#MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type)
-#ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type)
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- # IF(CPU_TYPE MATCHES "Opteron")
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mtune=opteron")
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-mcpu=opteron" )
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mtune=opteron")
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-mcpu=opteron" )
- # ENDIF()
-
-
- # ###############################################################################################################
- # ## 64Bit support
- # ###############################################################################################################
- # IF( ${use64BitOptions} )
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-m64" )
- # ENDIF()
-
-
- # ###############################################################################################################
- # ## OpenMP support
- # ###############################################################################################################
- # IF(USE_OPENMP)
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fopenmp")
- # ENDIF()
-
-
- # ###############################################################################################################
- # ## mt support
- # ###############################################################################################################
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- # IF(NOT APPLE)
- # LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- # ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc47.cmake b/CMake/compilerflags/gcc47.cmake
deleted file mode 100644
index 2a6b91042c55e3bb0159030676310b541a952a2f..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc47.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################################################
-##
-## gcc47
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- #############################################################################################################
- # Flags
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- #############################################################################################################
- # 64Bit support
- #############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-m64" )
- ENDIF()
-
- #############################################################################################################
- # OpenMP support
- #############################################################################################################
- IF(USE_OPENMP)
- MESSAGE(STATUS "gcc41 has no OpenMP support -> OpenMP deactivated")
- SET(USE_OPENMP "OFF")
- ENDIF()
-
- #############################################################################################################
- # mt support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc48.cmake b/CMake/compilerflags/gcc48.cmake
deleted file mode 100644
index 989afcc3e886ef1a92921982bdda4e720f7df436..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc48.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################################################
-##
-## gcc48
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- #############################################################################################################
- # Flags
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- #############################################################################################################
- # 64Bit support
- #############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-m64" )
- ENDIF()
-
- #############################################################################################################
- # OpenMP support
- #############################################################################################################
- IF(USE_OPENMP)
- MESSAGE(STATUS "gcc48 has no OpenMP support -> OpenMP deactivated")
- SET(USE_OPENMP "OFF")
- ENDIF()
-
- #############################################################################################################
- # mt support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc49.cmake b/CMake/compilerflags/gcc49.cmake
deleted file mode 100644
index 26f641ae19d9d0270f17e234ee37b3c5e0496f20..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc49.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################################################
-##
-## gcc49
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- #############################################################################################################
- # Flags
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- #############################################################################################################
- # 64Bit support
- #############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-m64" )
- ENDIF()
-
- #############################################################################################################
- # OpenMP support
- #############################################################################################################
- IF(USE_OPENMP)
- MESSAGE(STATUS "gcc49 has no OpenMP support -> OpenMP deactivated")
- SET(USE_OPENMP "OFF")
- ENDIF()
-
- #############################################################################################################
- # mt support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc51.cmake b/CMake/compilerflags/gcc51.cmake
deleted file mode 100644
index 1c4df2a693a8104ef4204715f4910d576a777336..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc51.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################################################
-##
-## gcc51
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- #############################################################################################################
- # Flags
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- #############################################################################################################
- # 64Bit support
- #############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- 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
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- #############################################################################################################
- # c++ 11 support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++11")
-
-
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc52.cmake b/CMake/compilerflags/gcc52.cmake
deleted file mode 100644
index 41649c34a3b94c3703878554309c1c3cf032876e..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc52.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################################################
-##
-## gcc52
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- #############################################################################################################
- # Flags
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- #############################################################################################################
- # 64Bit support
- #############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- 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
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- #############################################################################################################
- # c++ 11 support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++11")
-
-
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc54.cmake b/CMake/compilerflags/gcc54.cmake
deleted file mode 100644
index 234797337a662621e76c23e621ecbe4e0c84c319..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc54.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################################################
-##
-## gcc54
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- #############################################################################################################
- # Flags
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- #############################################################################################################
- # 64Bit support
- #############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- 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
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- #############################################################################################################
- # c++ 11 support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++11")
-
-
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc62.cmake b/CMake/compilerflags/gcc62.cmake
deleted file mode 100644
index 5e80808ac777bf091434e1df1e43cff7a930c5f4..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc62.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################################################
-##
-## gcc62
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- #############################################################################################################
- # Flags
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- #############################################################################################################
- # 64Bit support
- #############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- 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
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- #############################################################################################################
- # c++ 11 support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++11")
-
-
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc63.cmake b/CMake/compilerflags/gcc63.cmake
deleted file mode 100644
index c624265fa66e7c73bc9e7ad980f1ac5e9b6a670a..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc63.cmake
+++ /dev/null
@@ -1,52 +0,0 @@
-###############################################################################################################
-##
-## gcc63
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- #############################################################################################################
- # Flags
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- #############################################################################################################
- # 64Bit support
- #############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- 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
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- #############################################################################################################
- # c++ 17 support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++17")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++17")
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fext-numeric-literals")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_GLIBCXX_USE_CXX11_ABI=0")
-
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gcc82.cmake b/CMake/compilerflags/gcc82.cmake
deleted file mode 100644
index 13857f5ceb6f882ae21d2235df15e60c0cbf5fbe..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gcc82.cmake
+++ /dev/null
@@ -1,60 +0,0 @@
-###############################################################################################################
-##
-## gcc82
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- #############################################################################################################
- # Flags
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -fPIC")
-
- #############################################################################################################
- # 64Bit support
- #############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- 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
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- #############################################################################################################
- # c++ 11 support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++11")
-
- #############################################################################################################
- # c++ 17 support
- #############################################################################################################
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++17")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++17")
-
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fext-numeric-literals")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_GLIBCXX_USE_CXX11_ABI=0")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wregister")
-
-
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/gccGeneric.cmake b/CMake/compilerflags/gccGeneric.cmake
deleted file mode 100644
index d658afe73f2a7c1991018553b4488ed028e9d787..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/gccGeneric.cmake
+++ /dev/null
@@ -1,62 +0,0 @@
-###############################################################################################################
-##
-## gcc generic
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
- #############################################################################################################
- # Flags
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3;-fomit-frame-pointer;-finline-functions;-funroll-all-loops;-fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wno-unused-result")
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3;-fomit-frame-pointer;-finline-functions;-funroll-all-loops;-fPIC")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-Wno-deprecated") #deprecated header warning (jarl benutzt sstream weil schneller und so)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-Wno-unused-result")
- #############################################################################################################
- # 64Bit support
- #############################################################################################################
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-m64" )
- 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
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- #############################################################################################################
- # c++ 11 support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++11")
-
- #############################################################################################################
- # c++ 17 support
- #############################################################################################################
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++17")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++17")
-
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fext-numeric-literals")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_GLIBCXX_USE_CXX11_ABI=0")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-Wregister")
-
-
-
- IF(NOT APPLE)
- LIST(APPEND CAB_ADDITIONAL_LINK_PROPS "-lrt")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/icc101.cmake b/CMake/compilerflags/icc101.cmake
deleted file mode 100644
index 3cd6b535e82ca27b02b055428d1103ef363e8e0a..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/icc101.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-###############################################################################################################
-##
-## intel10
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D__amd64" )
- ENDIF()
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd654")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1125") #virtual function override intended
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1224") #warning directive: This file includes at least one deprecated or antiquated header
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd377") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-wd266") #function "__GKfree" declared implicitly
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops")
-
- IF(CPU_TYPE MATCHES "Opteron")
- IF(WIN32)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-QxO") #Enables SSE3, SSE2 and SSE instruction sets optimizations for non-Intel CPUs
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-QxO") #Enables SSE3, SSE2 and SSE instruction sets optimizations for non-Intel CPUs
- ELSE()
- #auf unserem cluster gibt es kein ss3 SET( CAB_CXX_FLAGS "${CAB_CXX_FLAGS} -xO") #Enables SSE3, SSE2 and SSE instruction sets optimizations for non-Intel CPUs
- #gibt teils probleme beim ausfuehren: SET( CAB_C_FLAGS "${CAB_C_FLAGS} -xO") #Enables SSE3, SSE2 and SSE instruction sets optimizations for non-Intel CPUs
- ENDIF()
- ELSE()
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-fast")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-fast")
- ENDIF()
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-openmp")
- ENDIF()
-
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/icc130.cmake b/CMake/compilerflags/icc130.cmake
deleted file mode 100644
index 346b9c25768f93df7d48e9c499aa712b502e11c9..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/icc130.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################################################
-##
-## intel10
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- #~ IF( ${use64BitOptions} )
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D__amd64" )
- #~ ENDIF()
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd654")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1125") #virtual function override intended
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1224") #warning directive: This file includes at least one deprecated or antiquated header
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd377") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
-#~
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-wd266") #function "__GKfree" declared implicitly
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops")
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-openmp")
- ENDIF()
-
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/icc140.cmake b/CMake/compilerflags/icc140.cmake
deleted file mode 100644
index 120a25c38432410ae002b5fda8ae61d3555f6eb1..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/icc140.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-###############################################################################################################
-##
-## intel140
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- #~ IF( ${use64BitOptions} )
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D__amd64" )
- #~ ENDIF()
-
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd654")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1125") #virtual function override intended
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1224") #warning directive: This file includes at least one deprecated or antiquated header
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd377") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
-#~
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-wd266") #function "__GKfree" declared implicitly
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-xHOST -O3 -ip -fno-alias -mcmodel=medium")
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-openmp")
- ENDIF()
-
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/icc150.cmake b/CMake/compilerflags/icc150.cmake
deleted file mode 100644
index 7c5abc3a0fe053af90fd171a12432130afe34eef..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/icc150.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################################################
-##
-## intel150
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- #~ IF( ${use64BitOptions} )
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D__amd64" )
- #~ ENDIF()
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd654")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1125") #virtual function override intended
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1224") #warning directive: This file includes at least one deprecated or antiquated header
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd377") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
-#~
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-wd266") #function "__GKfree" declared implicitly
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fomit-frame-pointer -finline-functions -funroll-all-loops")
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-openmp")
- ENDIF()
-
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/icc160.cmake b/CMake/compilerflags/icc160.cmake
deleted file mode 100644
index 88b25faa5e84154c0b2106ca18a9131ccfbec513..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/icc160.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################################################
-##
-## intel160
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- #~ IF( ${use64BitOptions} )
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D__amd64" )
- #~ ENDIF()
-
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd654")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1125") #virtual function override intended
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1224") #warning directive: This file includes at least one deprecated or antiquated header
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd377") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
-#~
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-wd266") #function "__GKfree" declared implicitly
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-xHOST -O3 -ip -ipo -fno-alias -mcmodel=medium -qopt-streaming-stores=always")
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-xHOST -O3 -ip -fno-alias -mcmodel=medium -qopt-streaming-stores=always")
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-openmp")
- ENDIF()
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
- #############################################################################################################
- # c++ 11 support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++11"
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/icc170.cmake b/CMake/compilerflags/icc170.cmake
deleted file mode 100644
index c0607f7aa48322150c50932f3f9618023efd89fe..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/icc170.cmake
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################################################
-##
-## intel170
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- #~ IF( ${use64BitOptions} )
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D__amd64" )
- #~ ENDIF()
-
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd654")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1125") #virtual function override intended
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1224") #warning directive: This file includes at least one deprecated or antiquated header
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd377") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
-#~
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-wd266") #function "__GKfree" declared implicitly
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-xHOST -O3 -ip -ipo -fno-alias -mcmodel=medium -qopt-streaming-stores=always")
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1478") #auto_ptr warning from mu::Parser
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-xHOST -O3 -ip -fno-alias -mcmodel=medium -qopt-streaming-stores=always")
-
- #Debug
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-g -traceback")
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-qopenmp")
- ENDIF()
-
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- #############################################################################################################
- # c++ 11 support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++11")
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/icc180.cmake b/CMake/compilerflags/icc180.cmake
deleted file mode 100644
index db9f3a70e299eae5eee2fbc71bdf248fbca35b64..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/icc180.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-###############################################################################################################
-##
-## intel180
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- #~ IF( ${use64BitOptions} )
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D__amd64" )
- #~ ENDIF()
-
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd654")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1125") #virtual function override intended
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1224") #warning directive: This file includes at least one deprecated or antiquated header
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd377") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
-#~
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-wd266") #function "__GKfree" declared implicitly
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-xHOST -O3 -ip -ipo -fno-alias -mcmodel=medium -qopt-streaming-stores=always")
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1478") #auto_ptr warning from mu::Parser
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-xHOST -O3 -ip -fno-alias -mcmodel=medium -qopt-streaming-stores=always -xCORE-AVX512 -qopt-zmm-usage=high")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-xHOST -O3 -ip -fno-alias -mcmodel=medium -qopt-streaming-stores=always -xCORE-AVX512 -qopt-zmm-usage=high")
-
- #Debug
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-g -traceback")
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-qopenmp")
- ENDIF()
-
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- #############################################################################################################
- # c++ 11 support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++11")
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/icc190.cmake b/CMake/compilerflags/icc190.cmake
deleted file mode 100644
index ff7aafd6da9a9c1e5e922acf21ad59dbb65457ba..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/icc190.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-###############################################################################################################
-##
-## intel190
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- #~ IF( ${use64BitOptions} )
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D__amd64" )
- #~ ENDIF()
-
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd654")
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1125") #virtual function override intended
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1224") #warning directive: This file includes at least one deprecated or antiquated header
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd377") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
-#~
- #~ LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-wd266") #function "__GKfree" declared implicitly
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-xHOST -O3 -ip -ipo -fno-alias -mcmodel=medium -qopt-streaming-stores=always")
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1478") #auto_ptr warning from mu::Parser
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-xHOST -O3 -ip -fno-alias -mcmodel=medium -qopt-streaming-stores=always -xCORE-AVX512 -qopt-zmm-usage=high")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-xHOST -O3 -ip -fno-alias -mcmodel=medium -qopt-streaming-stores=always -xCORE-AVX512 -qopt-zmm-usage=high")
-
- #Debug
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-g -traceback")
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-qopenmp")
- ENDIF()
-
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- #LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
- #############################################################################################################
- # c++ 11 support
- #############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-std=c++11")
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/icc91.cmake b/CMake/compilerflags/icc91.cmake
deleted file mode 100644
index a77f20ff8e98de88ac3379269240c1fd2420a6fa..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/icc91.cmake
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################################################
-##
-## intel9
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF( ${use64BitOptions} )
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D__amd64" )
- ENDIF()
-
- #IF( ${compiler} MATCHES "INTEL_91_IPO")
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-ipo" )
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-ipo" )
- # LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-opt-mem-bandwidth2" )
- #ENDIF( ${compiler} MATCHES "INTEL_91_IPO")
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-O3 -fast -fomit-frame-pointer -finline-functions")
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd68" ) #integer conversion resulted in a change of sign
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd186") # pointless comparison of unsigned integer with zero
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd654")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd654")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1125") #virtual function override intended
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd1224") #warning directive: This file includes at least one deprecated or antiquated header
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd377") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-wd327") #class "std::auto_ptr<RCF::I_ClientTransport>" has no suitable copy constructor
-
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-wd266") #function "__GKfree" declared implicitly
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-O3 -fast -fomit-frame-pointer -finline-functions")
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-openmp")
- ENDIF()
-
- ###############################################################################################################
- ## mt support
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-pthread")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_C_COMPILER_FLAGS "-pthread")
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/msvc10_32.cmake b/CMake/compilerflags/msvc10_32.cmake
deleted file mode 100644
index 60f733c7ed5faf3bd7d1f6e1d563201ebdf1fd62..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/msvc10_32.cmake
+++ /dev/null
@@ -1,59 +0,0 @@
-###############################################################################################################
-##
-## MSVC 2010 (Version 10.0) 32bit (msvc10_32)
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF(${use64BitOptions})
- MESSAGE(FATAL_ERROR "SET_COMPILER_SPECIFIC_FLAGS: use64BitOptions must be OFF for msvc10_32")
- ENDIF()
-
- ###############################################################################################################
- ## USE_UNSECURE_STL_VECTORS_RELEASE ?
- ###############################################################################################################
- OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
- IF(USE_UNSECURE_STL_VECTORS_RELEASE)
- # More MSVC specific compilation flags
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SECURE_SCL=0")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SCL_SECURE_NO_WARNINGS")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_DEPRECATE")
- ENDIF()
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_WARNINGS")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
-
-#foreach(flag_var
-# CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-# CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-# if(${flag_var} MATCHES "/MD")
-# string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-# endif(${flag_var} MATCHES "/MD")
-#endforeach(flag_var)
-
-# IF(${build_type} MATCHES BINARY)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MTd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MT" )
-# ELSEIF(${build_type} MATCHES STATIC)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MTd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MT" )
-# ELSEIF(${build_type} MATCHES SHARED)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MDd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MD" )
-# ELSE()
-# MESSAGE(FATAL_ERROR "build_type=${build_type} doesn't match BINARY, SHARED or STATIC")
-# ENDIF()
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/openmp")
- ENDIF()
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/msvc10_64.cmake b/CMake/compilerflags/msvc10_64.cmake
deleted file mode 100644
index 5db3a092d55f22eca2acdd271198d6ed48fa3c3e..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/msvc10_64.cmake
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################################################
-##
-## MSVC 2010 (Version 10.0) 64bit (msvc10_64)
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF(NOT ${use64BitOptions})
- MESSAGE(FATAL_ERROR "SET_COMPILER_SPECIFIC_FLAGS: use64BitOptions must be ON for msvc10_64")
- ENDIF()
-
- ###############################################################################################################
- ## USE_UNSECURE_STL_VECTORS_RELEASE ?
- ###############################################################################################################
- OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
- IF(USE_UNSECURE_STL_VECTORS_RELEASE)
- # More MSVC specific compilation flags
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SECURE_SCL=0")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SCL_SECURE_NO_WARNINGS")
- ENDIF()
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_DEPRECATE")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
-
-#folgendes kann man mittlerweile weglassen..
-#unser project kompilert einwandfrei durch!
-
-#hack (solange CMAke OMPILER_FLAGS_<CONFIG> nicht supported
-#foreach(flag_var
-# CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-# CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-# if(${flag_var} MATCHES "/MD")
-# string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-# endif(${flag_var} MATCHES "/MD")
-#endforeach(flag_var)
-
-# IF(${build_type} MATCHES BINARY)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MTd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MT" )
-# ELSEIF(${build_type} MATCHES STATIC)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MTd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MT" )
-# ELSEIF(${build_type} MATCHES SHARED)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MDd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MD" )
-# ELSE()
-# MESSAGE(FATAL_ERROR "build_type=${build_type} doesn't match BINARY, SHARED or STATIC")
-# ENDIF()
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/openmp")
- ENDIF()
-
- ###############################################################################################################
- ## boost + rcf extensions
- ###############################################################################################################
- IF(NEED_BOOST)
- IF(BOOST_VERSION)
- STRING(REGEX REPLACE "(.*)\\.(.*)\\.(.*)" "\\2" BoostMinorVersion "${BOOST_VERSION}")
- IF(NOT BoostMinorVersion LESS 35 )
-
- #IF(NOT ${build_type} MATCHES SHARED)
- #LIST(APPEND CAB_COMPILER_ADDITIONAL_LINK_PROPS "/NODEFAULTLIB:\"MSVCRT\"" )
- #ENDIF()
- ENDIF()
- ENDIF()
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/msvc11_32.cmake b/CMake/compilerflags/msvc11_32.cmake
deleted file mode 100644
index 67c463f99d09861742a1c973258e90351da33b54..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/msvc11_32.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################################################
-##
-## MSVC 2012 (Version 11.0) 32bit (msvc11_32)
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF(${use64BitOptions})
- MESSAGE(FATAL_ERROR "SET_COMPILER_SPECIFIC_FLAGS: use64BitOptions must be OFF for msvc11_32")
- ENDIF()
-
- ###############################################################################################################
- ## USE_UNSECURE_STL_VECTORS_RELEASE ?
- ###############################################################################################################
- OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
- IF(USE_UNSECURE_STL_VECTORS_RELEASE)
- # More MSVC specific compilation flags
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SECURE_SCL=0")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SCL_SECURE_NO_WARNINGS")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_DEPRECATE")
- ENDIF()
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_WARNINGS")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/openmp")
- ENDIF()
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/msvc11_64.cmake b/CMake/compilerflags/msvc11_64.cmake
deleted file mode 100644
index 53a667bc930a42239cd88c65550062e92d01f6c7..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/msvc11_64.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################################################
-##
-## MSVC 2012 (Version 11.0) 64bit (msvc11_64)
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF(NOT ${use64BitOptions})
- MESSAGE(FATAL_ERROR "SET_COMPILER_SPECIFIC_FLAGS: use64BitOptions must be ON for msvc11_64")
- ENDIF()
-
- ###############################################################################################################
- ## USE_UNSECURE_STL_VECTORS_RELEASE ?
- ###############################################################################################################
- OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
- IF(USE_UNSECURE_STL_VECTORS_RELEASE)
- # More MSVC specific compilation flags
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SECURE_SCL=0")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SCL_SECURE_NO_WARNINGS")
- ENDIF()
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_DEPRECATE")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/openmp")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/msvc12_32.cmake b/CMake/compilerflags/msvc12_32.cmake
deleted file mode 100644
index 997764d8526f42a0668122e9c2312973942968d5..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/msvc12_32.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################################################
-##
-## MSVC 2013 (Version 12.0) 32bit (msvc12_32)
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF(${use64BitOptions})
- MESSAGE(FATAL_ERROR "SET_COMPILER_SPECIFIC_FLAGS: use64BitOptions must be OFF for msvc11_32")
- ENDIF()
-
- ###############################################################################################################
- ## USE_UNSECURE_STL_VECTORS_RELEASE ?
- ###############################################################################################################
- OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
- IF(USE_UNSECURE_STL_VECTORS_RELEASE)
- # More MSVC specific compilation flags
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SECURE_SCL=0")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SCL_SECURE_NO_WARNINGS")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_DEPRECATE")
- ENDIF()
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_WARNINGS")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/openmp")
- ENDIF()
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/msvc12_64.cmake b/CMake/compilerflags/msvc12_64.cmake
deleted file mode 100644
index bd1796b5418c5e16ebad4213e530a76e799f8e8f..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/msvc12_64.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################################################
-##
-## MSVC 2013 (Version 12.0) 64bit (msvc12_64)
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF(NOT ${use64BitOptions})
- MESSAGE(FATAL_ERROR "SET_COMPILER_SPECIFIC_FLAGS: use64BitOptions must be ON for msvc11_64")
- ENDIF()
-
- ###############################################################################################################
- ## USE_UNSECURE_STL_VECTORS_RELEASE ?
- ###############################################################################################################
- OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
- IF(USE_UNSECURE_STL_VECTORS_RELEASE)
- # More MSVC specific compilation flags
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SECURE_SCL=0")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SCL_SECURE_NO_WARNINGS")
- ENDIF()
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_DEPRECATE")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/openmp")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/msvc14_32.cmake b/CMake/compilerflags/msvc14_32.cmake
deleted file mode 100644
index 180d879356b8579b1c5b62795ca63537b7dcf0be..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/msvc14_32.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################################################
-##
-## MSVC 2015 (Version 14.0) 32bit (msvc14_32)
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF(${use64BitOptions})
- MESSAGE(FATAL_ERROR "SET_COMPILER_SPECIFIC_FLAGS: use64BitOptions must be OFF for msvc11_32")
- ENDIF()
-
- ###############################################################################################################
- ## USE_UNSECURE_STL_VECTORS_RELEASE ?
- ###############################################################################################################
- OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
- IF(USE_UNSECURE_STL_VECTORS_RELEASE)
- # More MSVC specific compilation flags
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SECURE_SCL=0")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SCL_SECURE_NO_WARNINGS")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_DEPRECATE")
- ENDIF()
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_WARNINGS")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/openmp")
- ENDIF()
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/msvc14_64.cmake b/CMake/compilerflags/msvc14_64.cmake
deleted file mode 100644
index 1fc3ef188d31b7d7e9c4230d061e09b0966eab23..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/msvc14_64.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################################################
-##
-## MSVC 2015 (Version 14.0) 64bit (msvc14_64)
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF(NOT ${use64BitOptions})
- MESSAGE(FATAL_ERROR "SET_COMPILER_SPECIFIC_FLAGS: use64BitOptions must be ON for msvc11_64")
- ENDIF()
-
- ###############################################################################################################
- ## USE_UNSECURE_STL_VECTORS_RELEASE ?
- ###############################################################################################################
- OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
- IF(USE_UNSECURE_STL_VECTORS_RELEASE)
- # More MSVC specific compilation flags
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SECURE_SCL=0")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SCL_SECURE_NO_WARNINGS")
- ENDIF()
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_DEPRECATE")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/openmp")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/msvc19_64.cmake b/CMake/compilerflags/msvc19_64.cmake
deleted file mode 100644
index 57f1155613ad4bfad55469b23c5658ba472fa29e..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/msvc19_64.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-###############################################################################################################
-##
-## MSVC 2019 (Version 16.0) 64bit (msvc16_64)
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF(NOT ${use64BitOptions})
- MESSAGE(FATAL_ERROR "SET_COMPILER_SPECIFIC_FLAGS: use64BitOptions must be ON for msvc11_64")
- ENDIF()
-
- ###############################################################################################################
- ## USE_UNSECURE_STL_VECTORS_RELEASE ?
- ###############################################################################################################
- OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
- IF(USE_UNSECURE_STL_VECTORS_RELEASE)
- # More MSVC specific compilation flags
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SECURE_SCL=0")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SCL_SECURE_NO_WARNINGS")
- ENDIF()
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_DEPRECATE")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/openmp")
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
diff --git a/CMake/compilerflags/msvc8_32.cmake b/CMake/compilerflags/msvc8_32.cmake
deleted file mode 100644
index cebc116464760924ba4214e645c2b54b16d988df..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/msvc8_32.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-###############################################################################################################
-##
-## MSVC 2005 (Version 8.0) 32bit (msvc8_32)
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF(${use64BitOptions})
- MESSAGE(FATAL_ERROR "SET_COMPILER_SPECIFIC_FLAGS: use64BitOptions must be OFF for msvc10_32")
- ENDIF()
-
- ###############################################################################################################
- ## USE_UNSECURE_STL_VECTORS_RELEASE ?
- ###############################################################################################################
- OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
- IF(USE_UNSECURE_STL_VECTORS_RELEASE)
- # More MSVC specific compilation flags
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SECURE_SCL=0")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SCL_SECURE_NO_WARNINGS")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_DEPRECATE")
- ENDIF()
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_WARNINGS")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
-
-# IF(${build_type} MATCHES BINARY)
-# LIST(APPEND CAB_COMPILER_ADDITIONAL_LINK_PROPS_DEBUG "/MTd" )
-# LIST(APPEND CAB_COMPILER_ADDITIONAL_LINK_PROPS_RELEASE "/MT" )
-# ELSEIF(${build_type} MATCHES STATIC)
-# LIST(APPEND CAB_COMPILER_ADDITIONAL_LINK_PROPS_DEBUG "/MTd" )
-# LIST(APPEND CAB_COMPILER_ADDITIONAL_LINK_PROPS_RELEASE "/MT" )
-# ELSEIF(${build_type} MATCHES SHARED)
-# LIST(APPEND CAB_COMPILER_ADDITIONAL_LINK_PROPS_DEBUG "/MDd" )
-# LIST(APPEND CAB_COMPILER_ADDITIONAL_LINK_PROPS_RELEASE "/MD" )
-# ELSE()
-# MESSAGE(FATAL_ERROR "build_type=${build_type} doesn't match BINARY, SHARED or STATIC")
-# ENDIF()
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/openmp")
- ENDIF()
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/msvc8_64.cmake b/CMake/compilerflags/msvc8_64.cmake
deleted file mode 100644
index b5cd87c5ccd29abfaa7388f44e7ead2f572079f8..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/msvc8_64.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-###############################################################################################################
-##
-## MSVC 2005 (Version 8.0) 32bit (msvc8_64)
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF(NOT ${use64BitOptions})
- MESSAGE(FATAL_ERROR "SET_COMPILER_SPECIFIC_FLAGS: use64BitOptions must be ON for msvc8_64")
- ENDIF()
-
- ###############################################################################################################
- ## USE_UNSECURE_STL_VECTORS_RELEASE ?
- ###############################################################################################################
- OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
- IF(USE_UNSECURE_STL_VECTORS_RELEASE)
- # More MSVC specific compilation flags
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SECURE_SCL=0")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SCL_SECURE_NO_WARNINGS")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_DEPRECATE")
- ENDIF()
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -D_CRT_SECURE_NO_WARNINGS)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
-
-# IF(${build_type} MATCHES BINARY)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MTd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MT" )
-# ELSEIF(${build_type} MATCHES STATIC)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MTd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MT" )
-# ELSEIF(${build_type} MATCHES SHARED)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MDd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MD" )
-# ELSE()
-# MESSAGE(FATAL_ERROR "build_type=${build_type} doesn't match BINARY, SHARED or STATIC")
-# ENDIF()
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/openmp")
- ENDIF()
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/msvc9_32.cmake b/CMake/compilerflags/msvc9_32.cmake
deleted file mode 100644
index b3792c099669323bc537a9291a8cccda37e18eb6..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/msvc9_32.cmake
+++ /dev/null
@@ -1,59 +0,0 @@
-###############################################################################################################
-##
-## MSVC 2008 (Version 9.0) 32bit (msvc9_32)
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF(${use64BitOptions})
- MESSAGE(FATAL_ERROR "SET_COMPILER_SPECIFIC_FLAGS: use64BitOptions must be OFF for msvc9_32")
- ENDIF()
-
- ###############################################################################################################
- ## USE_UNSECURE_STL_VECTORS_RELEASE ?
- ###############################################################################################################
- OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
- IF(USE_UNSECURE_STL_VECTORS_RELEASE)
- # More MSVC specific compilation flags
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SECURE_SCL=0")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SCL_SECURE_NO_WARNINGS")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_DEPRECATE")
- ENDIF()
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_WARNINGS")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
-
-#foreach(flag_var
-# CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-# CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-# if(${flag_var} MATCHES "/MD")
-# string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-# endif(${flag_var} MATCHES "/MD")
-#endforeach(flag_var)
-
-# IF(${build_type} MATCHES BINARY)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MTd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MT" )
-# ELSEIF(${build_type} MATCHES STATIC)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MTd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MT" )
-# ELSEIF(${build_type} MATCHES SHARED)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MDd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MD" )
-# ELSE()
-# MESSAGE(FATAL_ERROR "build_type=${build_type} doesn't match BINARY, SHARED or STATIC")
-# ENDIF()
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/openmp")
- ENDIF()
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMake/compilerflags/msvc9_64.cmake b/CMake/compilerflags/msvc9_64.cmake
deleted file mode 100644
index 1bedf31255862982bcb1cb6630a2ede438a15995..0000000000000000000000000000000000000000
--- a/CMake/compilerflags/msvc9_64.cmake
+++ /dev/null
@@ -1,80 +0,0 @@
-###############################################################################################################
-##
-## MSVC 2008 (Version 9.0) 64bit (msvc9_64)
-##
-##
-##
-###############################################################################################################
-
-MACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
-
- IF(NOT ${use64BitOptions})
- MESSAGE(FATAL_ERROR "SET_COMPILER_SPECIFIC_FLAGS: use64BitOptions must be ON for msvc10_64")
- ENDIF()
-
- ###############################################################################################################
- ## USE_UNSECURE_STL_VECTORS_RELEASE ?
- ###############################################################################################################
- OPTION(USE_UNSECURE_STL_VECTORS_RELEASE "_SECURE_SCL=0" OFF)
- IF(USE_UNSECURE_STL_VECTORS_RELEASE)
- # More MSVC specific compilation flags
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SECURE_SCL=0")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_SCL_SECURE_NO_WARNINGS")
- ENDIF()
-
- ###############################################################################################################
- ## Flags
- ###############################################################################################################
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-D_CRT_SECURE_NO_DEPRECATE")
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4996") #deprecated strcpy...
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/wd4800") #forcing value to bool 'true' or 'false' (performance warning)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/bigobj") #ansonsten funzt mit boost das compilieren unter windows nimmer
-
-#folgendes kann man mittlerweile weglassen..
-#unser project kompilert einwandfrei durch!
-
-#hack (solange CMAke OMPILER_FLAGS_<CONFIG> nicht supported
-#foreach(flag_var
-# CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-# CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-# if(${flag_var} MATCHES "/MD")
-# string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-# endif(${flag_var} MATCHES "/MD")
-#endforeach(flag_var)
-
-# IF(${build_type} MATCHES BINARY)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MTd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MT" )
-# ELSEIF(${build_type} MATCHES STATIC)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MTd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MT" )
-# ELSEIF(${build_type} MATCHES SHARED)
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_DEBUG "/MDd" )
-# LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS_RELEASE "/MD" )
-# ELSE()
-# MESSAGE(FATAL_ERROR "build_type=${build_type} doesn't match BINARY, SHARED or STATIC")
-# ENDIF()
-
- ###############################################################################################################
- ## OpenMP support
- ###############################################################################################################
- IF(USE_OPENMP)
- LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "/openmp")
- ENDIF()
-
- ###############################################################################################################
- ## boost + rcf extensions
- ###############################################################################################################
- IF(NEED_BOOST)
- IF(BOOST_VERSION)
- STRING(REGEX REPLACE "(.*)\\.(.*)\\.(.*)" "\\2" BoostMinorVersion "${BOOST_VERSION}")
- IF(NOT BoostMinorVersion LESS 35 )
-
- #IF(NOT ${build_type} MATCHES SHARED)
- #LIST(APPEND CAB_COMPILER_ADDITIONAL_LINK_PROPS "/NODEFAULTLIB:\"MSVCRT\"" )
- #ENDIF()
- ENDIF()
- ENDIF()
- ENDIF()
-
-ENDMACRO(SET_COMPILER_SPECIFIC_FLAGS_INTERN build_type use64BitOptions)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3cb629f54c750f3ecc9466777f9a3019b571a07c..01f46ac17ebe0a821ee6ba80489985591e604495 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.13..3.18 FATAL_ERROR)
project(VirtualFluids CXX)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -51,13 +51,7 @@ endif()
# MACROS
#################################################################################
include(CMakePrintHelpers)
-include(${VF_CMAKE_DIR}/CMakeCABMacros.cmake)
-include(${VF_CMAKE_DIR}/FileUtilities.cmake)
include(${VF_CMAKE_DIR}/VirtualFluidsMacros.cmake)
-include(${VF_CMAKE_DIR}/3rd.cmake)
-
-include(${VF_CMAKE_DIR}/CMakeMacros_old/general/FindCompiler.cmake)
-configure_file(src/basics/VirtualFluidsDefinitions.in.h ${CMAKE_BINARY_DIR}/VirtualFluidsDefinitions.h)
#################################################################################
# COMMON LIBRARIES
diff --git a/apps/cpu/LidDrivenCavity/CMakeLists.txt b/apps/cpu/LidDrivenCavity/CMakeLists.txt
index a2518ab60534f36f566b7ae1b93012471f466520..9527e73eab5b2bcfe7f874f640bb3cada7edc016 100644
--- a/apps/cpu/LidDrivenCavity/CMakeLists.txt
+++ b/apps/cpu/LidDrivenCavity/CMakeLists.txt
@@ -1,6 +1,4 @@
PROJECT(LidDrivenCavity)
-INCLUDE(${APPS_ROOT}/IncludsList.cmake)
-
-vf_add_library(BUILDTYPE binary DEPENDS VirtualFluidsCore VirtualFluidsBasic FILES LidDrivenCavity.cpp)
+vf_add_library(NAME LidDrivenCavityCPU BUILDTYPE binary DEPENDS VirtualFluidsCore basics muparser FILES LidDrivenCavity.cpp)
diff --git a/apps/cpu/LidDrivenCavity/LidDrivenCavity.cpp b/apps/cpu/LidDrivenCavity/LidDrivenCavity.cpp
index 6eb64ffe289c6815f88b3b63b5a6aecc7b5e5026..bde6df56d697f197c2f0e486647a09f0c06ba20b 100644
--- a/apps/cpu/LidDrivenCavity/LidDrivenCavity.cpp
+++ b/apps/cpu/LidDrivenCavity/LidDrivenCavity.cpp
@@ -10,8 +10,8 @@
// \ \| | | | __ __ __ __ ______ _______
// \ | | |_____ | | | | | | | | | _ \ / _____)
// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ \
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
//
// This file is part of VirtualFluids. VirtualFluids is free software: you can
// redistribute it and/or modify it under the terms of the GNU General Public
@@ -26,7 +26,7 @@
// You should have received a copy of the GNU General Public License along
// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
-//! \file ldc.cpp
+//! \file LidDrivenCavity.cpp
//! \ingroup Applications
//! \author Konstantin Kutscher
//=======================================================================================
@@ -44,7 +44,9 @@ int main(int argc, char* argv[])
//////////////////////////////////////////////////////////////////////////
// Simulation parameters
//////////////////////////////////////////////////////////////////////////
- string path = "d:/temp/LidDrivenCavityClean";
+
+ // set your output path here
+ string path = "./output";
const double L = 1.0;
const double Re = 1000.0;
@@ -52,11 +54,11 @@ int main(int argc, char* argv[])
const double dt = 0.5e-3;
const unsigned int nx = 64;
- const double timeStepOut = 10000;
- const double timeStepEnd = 250000;
+ const double timeStepOut = 1000;
+ const double timeStepEnd = 25000;
// Number of OpenMP threads
- int numOfThreads = 1;
+ int numOfThreads = 4;
//////////////////////////////////////////////////////////////////////////
@@ -84,13 +86,16 @@ int main(int argc, char* argv[])
// set grid spacing
grid->setDeltaX(dx);
// set block size for three dimensions
- grid->setBlockNX(64,64,64);
+ int blockSize = nx / 2;
+ grid->setBlockNX(blockSize,blockSize,blockSize);
// Create simulation bounding box
SPtr<GbObject3D> gridCube(new GbCuboid3D(g_minX1, g_minX2, g_minX3, g_maxX1, g_maxX2, g_maxX3));
GbSystem3D::writeGeoObject(gridCube.get(), path + "/geo/gridCube", WbWriterVtkXmlBinary::getInstance());
- UBLOG(logINFO, "Lid Driven Cavity");
+ UBLOG(logINFO, "Lid Driven Cavity:");
+ UBLOG(logINFO, "Domain size = " << nx << " x "<< nx << " x "<< nx);
+ UBLOG(logINFO, "Block size = " << blockSize << " x "<< blockSize << " x "<< blockSize);
UBLOG(logINFO, "velocity = " << velocity << " m/s");
UBLOG(logINFO, "velocityLB = " << velocityLB);
UBLOG(logINFO, "viscosityLB = " << viscosityLB);
@@ -209,8 +214,9 @@ int main(int argc, char* argv[])
SPtr<CoProcessor> nupsCoProcessor(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
// OpenMP threads control
+#ifdef _OPENMP
omp_set_num_threads(numOfThreads);
-
+#endif
// Create simulation
SPtr<Calculator> calculator(new BasicCalculator(grid, visSch, (int)timeStepEnd));
// Add coprocessors objects to simulation
diff --git a/apps/cpu/LidDrivenCavityCPU/CMakeLists.txt b/apps/cpu/LidDrivenCavityCPU/CMakeLists.txt
deleted file mode 100644
index dbcc5519841fc61e1ae5b454134aa352be4ba9a0..0000000000000000000000000000000000000000
--- a/apps/cpu/LidDrivenCavityCPU/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-PROJECT(LidDrivenCavity)
-
-vf_add_library(BUILDTYPE binary DEPENDS VirtualFluidsCore basics FILES LidDrivenCavity.cpp)
-
-vf_get_library_name (library_name)
-target_include_directories(${library_name} PRIVATE ${APPS_ROOT_CPU})
\ No newline at end of file
diff --git a/cpu.cmake b/cpu.cmake
index 1b8d3b383be9c11fb17886396ae0d2ff5f78bd46..0f8c9a5ac6e3d98a29049be69390b4a1ca365c4f 100644
--- a/cpu.cmake
+++ b/cpu.cmake
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
-
#workaround for machine with mpi compiler wrapper
#it most define before project
@@ -26,63 +24,24 @@ 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_GCC OFF CACHE BOOL "include gcc compiler support") #TODO: why do we need to set this manually?
+
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
-#include("CMake/FileUtilities.cmake")
-#include("CMake/VirtualFluidsMacros.cmake")
-
#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)
ENDIF()
#SET(MPI_CXX_LINK_FLAGS -mpe=mpilog)
-#SET(BOOST_USE_MULTITHREAD ON)
-#SET(Boost_USE_STATIC_LIBS ON)
-#SET(Boost_DEBUG TRUE)
-
-#SET(bv ${BOOST_VERSION}) #hack for find boost, after next command ${BOOST_VERSION} would be set to 0
-#FIND_PACKAGE(Boost ${bv} COMPONENTS system date_time thread serialization chrono regex)
-#FIND_PACKAGE(Boost ${BOOST_VERSION} COMPONENTS system date_time thread serialization chrono regex)
-#FIND_PACKAGE(Boost ${bv} COMPONENTS system thread serialization date_time)
-#SET(BOOST_VERSION ${bv})
-#IF(${USE_PYTHON})
-# FIND_PACKAGE(Boost ${BOOST_VERSION} COMPONENTS system date_time thread serialization chrono regex python)
-#ELSE(${USE_PYTHON})
-# FIND_PACKAGE(Boost ${BOOST_VERSION} COMPONENTS system date_time thread serialization chrono regex)
-#ENDIF()
-
-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)
FIND_PACKAGE(VTK REQUIRED)
INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
- MESSAGE("VTK_INCLUDE_DIRS = " ${VTK_INCLUDE_DIRS})
ENDIF()
IF(${USE_CATALYST})
@@ -90,67 +49,32 @@ IF(${USE_CATALYST})
include("${PARAVIEW_USE_FILE}")
ENDIF()
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DCAB_BOOST)
-LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DNOMINMAX)
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DBOOST_SIGNALS_NO_DEPRECATION_WARNING)
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DCAB_RUBY)
-#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -mpe=mpilog)
-#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)
+ list(APPEND VF_COMPILER_DEFINITION VF_METIS)
ENDIF()
IF(${USE_MPI})
- LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_MPI)
+ list(APPEND VF_COMPILER_DEFINITION VF_MPI)
ENDIF()
-# IF(${USE_FETOL})
-# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_FETOL)
-# ENDIF()
IF(${USE_VTK})
- LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_VTK)
+ list(APPEND VF_COMPILER_DEFINITION VF_VTK)
ENDIF()
IF(${USE_CATALYST})
- LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_CATALYST)
+ list(APPEND VF_COMPILER_DEFINITION VF_CATALYST)
ENDIF()
IF(${USE_BOOST})
- LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_BOOST)
+ list(APPEND VF_COMPILER_DEFINITION VF_BOOST)
ENDIF()
IF(${USE_HLRN_LUSTRE})
- LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DHLRN_LUSTRE)
+ list(APPEND VF_COMPILER_DEFINITION HLRN_LUSTRE)
ENDIF()
-IF(${USE_INTEL})
- SET(CAB_ADDITIONAL_LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS} -parallel)
+# workaround itanium processoren
+IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ia64")
+ LIST(APPEND VF_COMPILER_DEFINITION _M_IA64)
ENDIF()
-IF(${USE_GCC})
- SET(CAB_ADDITIONAL_LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS} -lgomp)
-ENDIF()
-
-
-# IF(${USE_PYTHON})
-# FIND_PACKAGE(PythonLibs)
-# INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
-# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_PYTHON)
-# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DBOOST_PYTHON_STATIC_LIB)
-# add_subdirectory(python)
-# ENDIF()
-
-# IF(${USE_INTEL})
-# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DMPICH_IGNORE_CXX_SEEK)
-# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DMPICH_SKIP_MPICXX)
-# ENDIF()
-
-
-#IF(${USE_DEM_COUPLING})
-# add_subdirectory(Plugins/dem_coupling)
-#ENDIF()
add_subdirectory(${VF_THIRD_DIR}/MuParser)
diff --git a/gpu.cmake b/gpu.cmake
index 78d21ec9503a1684e8a9d811d8fd8f3568f9e6b8..b1c5bf6dfef1156bff2439a73e2e25886b115f77 100644
--- a/gpu.cmake
+++ b/gpu.cmake
@@ -1,9 +1,15 @@
-cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
if(UNIX)
set(CMAKE_CXX_STANDARD 14)
endif()
+#############################################################
+### CUDAPATH ###
+#############################################################
+
+# if CMake cannot find CUDA by itself, set the correct paths manually:
+#SET(CUDA_CUT_INCLUDE_DIR "/cluster/cuda/9.0/include;/cluster/cuda/9.0/samples/common/inc" CACHE PATH "CUDA_CUT_INCLUDE_DIR")
+#SET(CUDA_SAMPLE_INCLUDE_DIR "/cluster/cuda/9.0/samples/common/inc" CACHE PATH "CUDA_CUT_INCLUDE_DIR")
#############################################################
### PROJECT SETTINGS ###
@@ -11,13 +17,6 @@ endif()
project(VirtualFluidsGPU)
-IF(MSVC)
- ADD_DEFINITIONS ( "-DNOMINMAX" ) # Disable Min/Max-Macros
- ADD_DEFINITIONS ( "-D_CRT_SECURE_NO_WARNINGS" ) # disable warnings promoting Microsoft's security enhanced CRT
- ADD_DEFINITIONS ( "-D_SCL_SECURE_NO_WARNINGS" ) # disable warnings triggered by Microsoft's checked iterators
- SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MP" ) # enable multi-threaded compiling
- SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj" ) # enable big object files (fatal error C1128)
-ENDIF(MSVC)
#############################################################
### OPTIONS ###
@@ -31,7 +30,7 @@ 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 )
+ list(APPEND VF_COMPILER_DEFINITION VF_DOUBLE_ACCURACY)
ENDIF()
#############################################################
diff --git a/src/basics/Core/DataTypes.h b/src/basics/Core/DataTypes.h
index b65f3344c2788ee3e2af04bf3b2813f5a055c52d..67a17fa765514c41247c480709864b4dae1b28ba 100644
--- a/src/basics/Core/DataTypes.h
+++ b/src/basics/Core/DataTypes.h
@@ -3,7 +3,6 @@
#include <string>
-#include "VirtualFluidsDefinitions.h"
#ifdef VF_DOUBLE_ACCURACY
typedef double real;
diff --git a/src/basics/Core/RealConstants.h b/src/basics/Core/RealConstants.h
index a555d7ee27ba5427ac673473def7ed9b57f0d817..b63ff444f5d86dd67accaf83611ebeb6410f036b 100644
--- a/src/basics/Core/RealConstants.h
+++ b/src/basics/Core/RealConstants.h
@@ -1,7 +1,7 @@
#ifndef REAL_CONSTANT_H
#define REAL_CONSTANT_H
-#include "VirtualFluidsDefinitions.h"
+
#ifdef VF_DOUBLE_ACCURACY
#define c1o2 0.5
diff --git a/src/basics/Core/Timer/Timer.h b/src/basics/Core/Timer/Timer.h
index 53c79e76102c922bc1bca4a28ec79c77c2351bcd..9607cc5f9a72873e1da226b4d071e000777073a1 100644
--- a/src/basics/Core/Timer/Timer.h
+++ b/src/basics/Core/Timer/Timer.h
@@ -1,7 +1,6 @@
#ifndef TIMER_H
#define TIMER_H
-//#include "VirtualFluidsDefinitions.h"
#include "basics_export.h"
#include "DataTypes.h"
diff --git a/src/basics/Core/Timer/TimerImp.h b/src/basics/Core/Timer/TimerImp.h
index d45691079efb5688a4574f17e157fdf7710c608a..20a11968005f88bebbc1e481149a6c9d939306a8 100644
--- a/src/basics/Core/Timer/TimerImp.h
+++ b/src/basics/Core/Timer/TimerImp.h
@@ -5,7 +5,6 @@
#include <chrono>
-//#include "VirtualFluidsDefinitions.h"
#include "DataTypes.h"
diff --git a/src/basics/VirtualFluidsDefinitions.in.h b/src/basics/VirtualFluidsDefinitions.in.h
deleted file mode 100644
index 587a0a215d3d7e8886e1809f05568671f18f29d6..0000000000000000000000000000000000000000
--- a/src/basics/VirtualFluidsDefinitions.in.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef VIRTUAL_FLUIDS_DEFINITIONS_H
-#define VIRTUAL_FLUIDS_DEFINITIONS_H
-
-#cmakedefine BUILD_SHARED_LIBS
-
-// disable warnings
-#pragma warning(disable: 4251)// occurs normally while exporting standard library: "needs to have dll-interface to be"
-#pragma warning(disable: 4275) // on dll-interface class <classname> used as base for dll-interface class <classname>
-
-
-// double or single precision
-#cmakedefine VF_DOUBLE_ACCURACY
-
-// External libraries
-#cmakedefine VF_BUILD_WITH_MPI
-#cmakedefine VF_BUILD_WITH_METIS
-#cmakedefine VF_BUILD_WITH_CUDA
-
-// Compiler
-#cmakedefine VF_CXX_COMPILER_IS_GNU
-#cmakedefine VF_CXX_COMPILER_IS_INTEL
-#cmakedefine VF_CXX_COMPILER_IS_IBM
-#cmakedefine VF_CXX_COMPILER_IS_MSVC
-#cmakedefine VF_CXX_COMPILER_IS_CLANG
-
-#endif
diff --git a/src/basics/geometry3d/CoordinateTransformation3D.h b/src/basics/geometry3d/CoordinateTransformation3D.h
index 362da6b624a32688841c223b14c5344ae9df5bb9..112f78789d2dda0f5db279a1ca83d82ff6d844d6 100644
--- a/src/basics/geometry3d/CoordinateTransformation3D.h
+++ b/src/basics/geometry3d/CoordinateTransformation3D.h
@@ -120,11 +120,11 @@ private:
bool active;
bool transformation;
- friend class MPIIOCoProcessor;
- friend class MPIIORestartCoProcessor;
- friend class MPIIOMigrationCoProcessor;
- friend class MPIIOMigrationBECoProcessor;
- friend class CheckpointConverter;
+ friend class MPIIOCoProcessor;
+ friend class MPIIORestartCoProcessor;
+ friend class MPIIOMigrationCoProcessor;
+ friend class MPIIOMigrationBECoProcessor;
+ friend class CheckpointConverter;
};
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/apps/cpu/VirtualFluids.h b/src/cpu/VirtualFluids.h
similarity index 83%
rename from apps/cpu/VirtualFluids.h
rename to src/cpu/VirtualFluids.h
index fe92dd803bf8b5d43d5c24d43d9e5acab3bfb3ea..83ebf04945f08639d519a51270d92132cfc59893 100644
--- a/apps/cpu/VirtualFluids.h
+++ b/src/cpu/VirtualFluids.h
@@ -1,16 +1,44 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ \
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids 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 General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file VirtualFluids.h
+//! \ingroup Applications
+//! \author Konstantin Kutscher
+//=======================================================================================
+
#ifndef VirtualFluids_h__
#define VirtualFluids_h__
//VirtualFluids header files
-
-#if defined VF_FETOL
-#define WIN32_LEAN_AND_MEAN
-#include <JM.h>
-#endif
#ifdef _OPENMP
#include <omp.h>
-#endif
+#endif
#include <basics/PointerDefinitions.h>
@@ -268,11 +296,4 @@
#include <Visitors/RefineCrossAndInsideGbObjectHelper.h>
#include <RefineAroundGbObjectHelper.h>
-#if defined VF_FETOL
- #include <FETOL/FETOLCalculator.h>
- #include <FETOL/FETOLCommunicator.h>
- #include <FETOL/FETOLSetConnectorsBlockVisitor.h>
- #include <FETOL/FETOLTransmitterBondPool.h>
-#endif
-
#endif // VirtualFluids_h__
diff --git a/src/cpu/VirtualFluidsCore/CMakeLists.txt b/src/cpu/VirtualFluidsCore/CMakeLists.txt
index fbe516b816de68464a7c2cf616c6fd7d94c64fcc..13fea30bbda58f102768c85d22cdaf0b55a6b199 100644
--- a/src/cpu/VirtualFluidsCore/CMakeLists.txt
+++ b/src/cpu/VirtualFluidsCore/CMakeLists.txt
@@ -1,20 +1,4 @@
-IF(${USE_GCC})
- SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} rt)
- SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} gomp)
-ENDIF()
-
-IF(${USE_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})
@@ -33,25 +17,6 @@ IF(${USE_CATALYST})
ENDIF()
-IF(${USE_PYTHON})
- SET(LINK_LIBRARY optimized ${PYTHON_LIBRARY} debug ${PYTHON_LIBRARY})
- 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)
ENDIF()
@@ -84,10 +49,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.cpp b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b3a3c989b5ad867eafb30bc8eba25421a34e8082
--- /dev/null
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp
@@ -0,0 +1,648 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids 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 General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file CumulantK17LBMKernel.cpp
+//! \ingroup LBM
+//! \author Konstantin Kutscher, Martin Geier
+//=======================================================================================
+
+#include "CumulantK17LBMKernel.h"
+#include "D3Q27System.h"
+#include "D3Q27EsoTwist3DSplittedVector.h"
+#include <math.h>
+#include "DataSet3D.h"
+#include "LBMKernel.h"
+#include "Block3D.h"
+#include "BCArray3D.h"
+
+#define PROOF_CORRECTNESS
+
+using namespace UbMath;
+
+//////////////////////////////////////////////////////////////////////////
+CumulantK17LBMKernel::CumulantK17LBMKernel()
+{
+ this->compressible = true;
+}
+//////////////////////////////////////////////////////////////////////////
+CumulantK17LBMKernel::~CumulantK17LBMKernel(void)
+{
+
+}
+//////////////////////////////////////////////////////////////////////////
+void CumulantK17LBMKernel::initDataSet()
+{
+ SPtr<DistributionArray3D> d(new D3Q27EsoTwist3DSplittedVector(nx[0] + 2, nx[1] + 2, nx[2] + 2, -999.9));
+ dataSet->setFdistributions(d);
+}
+//////////////////////////////////////////////////////////////////////////
+SPtr<LBMKernel> CumulantK17LBMKernel::clone()
+{
+ SPtr<LBMKernel> kernel(new CumulantK17LBMKernel());
+ kernel->setNX(nx);
+ std::dynamic_pointer_cast<CumulantK17LBMKernel>(kernel)->initDataSet();
+ kernel->setCollisionFactor(this->collFactor);
+ kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setWithForcing(withForcing);
+ kernel->setForcingX1(muForcingX1);
+ kernel->setForcingX2(muForcingX2);
+ kernel->setForcingX3(muForcingX3);
+ kernel->setIndex(ix1, ix2, ix3);
+ kernel->setDeltaT(deltaT);
+ kernel->setBlock(block.lock());
+
+ return kernel;
+}
+//////////////////////////////////////////////////////////////////////////
+void CumulantK17LBMKernel::calculate(int step)
+{
+ //////////////////////////////////////////////////////////////////////////
+ //! Cumulant K17 Kernel is based on
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //! and
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.07.004"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.07.004 ]</b></a>
+ //!
+ //! The cumulant kernel is executed in the following steps
+ //!
+ ////////////////////////////////////////////////////////////////////////////////
+ //! - Get node index coordinates from thredIdx, blockIdx, blockDim and gridDim.
+ //!
+ using namespace D3Q27System;
+ using namespace std;
+
+ //initializing of forcing stuff
+ if (withForcing)
+ {
+ muForcingX1.DefineVar("x1", &muX1); muForcingX1.DefineVar("x2", &muX2); muForcingX1.DefineVar("x3", &muX3);
+ muForcingX2.DefineVar("x1", &muX1); muForcingX2.DefineVar("x2", &muX2); muForcingX2.DefineVar("x3", &muX3);
+ muForcingX3.DefineVar("x1", &muX1); muForcingX3.DefineVar("x2", &muX2); muForcingX3.DefineVar("x3", &muX3);
+
+ muDeltaT = deltaT;
+
+ muForcingX1.DefineVar("dt", &muDeltaT);
+ muForcingX2.DefineVar("dt", &muDeltaT);
+ muForcingX3.DefineVar("dt", &muDeltaT);
+
+ muNu = (1.0 / 3.0) * (1.0 / collFactor - 1.0 / 2.0);
+
+ muForcingX1.DefineVar("nu", &muNu);
+ muForcingX2.DefineVar("nu", &muNu);
+ muForcingX3.DefineVar("nu", &muNu);
+
+ LBMReal forcingX1 = 0;
+ LBMReal forcingX2 = 0;
+ LBMReal forcingX3 = 0;
+ }
+ /////////////////////////////////////
+
+ localDistributions = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getLocalDistributions();
+ nonLocalDistributions = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
+ restDistributions = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
+
+ SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+
+ const int bcArrayMaxX1 = (int)bcArray->getNX1();
+ const int bcArrayMaxX2 = (int)bcArray->getNX2();
+ const int bcArrayMaxX3 = (int)bcArray->getNX3();
+
+ int minX1 = ghostLayerWidth;
+ int minX2 = ghostLayerWidth;
+ int minX3 = ghostLayerWidth;
+ int maxX1 = bcArrayMaxX1 - ghostLayerWidth;
+ int maxX2 = bcArrayMaxX2 - ghostLayerWidth;
+ int maxX3 = bcArrayMaxX3 - ghostLayerWidth;
+
+ LBMReal omega = collFactor;
+
+ for (int x3 = minX3; x3 < maxX3; x3++)
+ {
+ for (int x2 = minX2; x2 < maxX2; x2++)
+ {
+ for (int x1 = minX1; x1 < maxX1; x1++)
+ {
+ if (!bcArray->isSolid(x1, x2, x3) && !bcArray->isUndefined(x1, x2, x3))
+ {
+ int x1p = x1 + 1;
+ int x2p = x2 + 1;
+ int x3p = x3 + 1;
+ //////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+ //! - Read distributions: style of reading and writing the distributions from/to stored arrays dependent on timestep is based on the esoteric twist algorithm
+ //! <a href="https://doi.org/10.3390/computation5020019"><b>[ M. Geier et al. (2017), DOI:10.3390/computation5020019 ]</b></a>
+ //!
+ ////////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
+
+ //E N T
+ //c c c
+ //////////
+ //W S B
+ //a a a
+
+ //Rest is b
+
+ //mfxyz
+ //a - negative
+ //b - null
+ //c - positive
+
+ // a b c
+ //-1 0 1
+
+ LBMReal mfcbb = (*this->localDistributions)(D3Q27System::ET_E, x1, x2, x3);
+ LBMReal mfbcb = (*this->localDistributions)(D3Q27System::ET_N, x1, x2, x3);
+ LBMReal mfbbc = (*this->localDistributions)(D3Q27System::ET_T, x1, x2, x3);
+ LBMReal mfccb = (*this->localDistributions)(D3Q27System::ET_NE, x1, x2, x3);
+ LBMReal mfacb = (*this->localDistributions)(D3Q27System::ET_NW, x1p, x2, x3);
+ LBMReal mfcbc = (*this->localDistributions)(D3Q27System::ET_TE, x1, x2, x3);
+ LBMReal mfabc = (*this->localDistributions)(D3Q27System::ET_TW, x1p, x2, x3);
+ LBMReal mfbcc = (*this->localDistributions)(D3Q27System::ET_TN, x1, x2, x3);
+ LBMReal mfbac = (*this->localDistributions)(D3Q27System::ET_TS, x1, x2p, x3);
+ LBMReal mfccc = (*this->localDistributions)(D3Q27System::ET_TNE, x1, x2, x3);
+ LBMReal mfacc = (*this->localDistributions)(D3Q27System::ET_TNW, x1p, x2, x3);
+ LBMReal mfcac = (*this->localDistributions)(D3Q27System::ET_TSE, x1, x2p, x3);
+ LBMReal mfaac = (*this->localDistributions)(D3Q27System::ET_TSW, x1p, x2p, x3);
+
+ LBMReal mfabb = (*this->nonLocalDistributions)(D3Q27System::ET_W, x1p, x2, x3);
+ LBMReal mfbab = (*this->nonLocalDistributions)(D3Q27System::ET_S, x1, x2p, x3);
+ LBMReal mfbba = (*this->nonLocalDistributions)(D3Q27System::ET_B, x1, x2, x3p);
+ LBMReal mfaab = (*this->nonLocalDistributions)(D3Q27System::ET_SW, x1p, x2p, x3);
+ LBMReal mfcab = (*this->nonLocalDistributions)(D3Q27System::ET_SE, x1, x2p, x3);
+ LBMReal mfaba = (*this->nonLocalDistributions)(D3Q27System::ET_BW, x1p, x2, x3p);
+ LBMReal mfcba = (*this->nonLocalDistributions)(D3Q27System::ET_BE, x1, x2, x3p);
+ LBMReal mfbaa = (*this->nonLocalDistributions)(D3Q27System::ET_BS, x1, x2p, x3p);
+ LBMReal mfbca = (*this->nonLocalDistributions)(D3Q27System::ET_BN, x1, x2, x3p);
+ LBMReal mfaaa = (*this->nonLocalDistributions)(D3Q27System::ET_BSW, x1p, x2p, x3p);
+ LBMReal mfcaa = (*this->nonLocalDistributions)(D3Q27System::ET_BSE, x1, x2p, x3p);
+ LBMReal mfaca = (*this->nonLocalDistributions)(D3Q27System::ET_BNW, x1p, x2, x3p);
+ LBMReal mfcca = (*this->nonLocalDistributions)(D3Q27System::ET_BNE, x1, x2, x3p);
+
+ LBMReal mfbbb = (*this->restDistributions)(x1, x2, x3);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Calculate density and velocity using pyramid summation for low round-off errors as in Eq. (J1)-(J3)
+ //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015), DOI:10.1016/j.camwa.2015.05.001 ]</b></a>
+ //!
+ LBMReal drho = ((((mfccc + mfaaa) + (mfaca + mfcac)) + ((mfacc + mfcaa) + (mfaac + mfcca))) +
+ (((mfbac + mfbca) + (mfbaa + mfbcc)) + ((mfabc + mfcba) + (mfaba + mfcbc)) + ((mfacb + mfcab) + (mfaab + mfccb))) +
+ ((mfabb + mfcbb) + (mfbab + mfbcb)) + (mfbba + mfbbc)) + mfbbb;
+
+ LBMReal rho = c1 + drho;
+ LBMReal OOrho = c1 / rho;
+ ////////////////////////////////////////////////////////////////////////////////////
+ LBMReal vvx = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) +
+ (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) +
+ (mfcbb - mfabb)) / rho;
+ LBMReal vvy = ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) +
+ (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) +
+ (mfbcb - mfbab)) / rho;
+ LBMReal vvz = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfacc - mfcaa) + (mfaac - mfcca))) +
+ (((mfbac - mfbca) + (mfbcc - mfbaa)) + ((mfabc - mfcba) + (mfcbc - mfaba))) +
+ (mfbbc - mfbba)) / rho;
+ ////////////////////////////////////////////////////////////////////////////////////
+ //forcing
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ if (withForcing)
+ {
+ muX1 = static_cast<double>(x1 - 1 + ix1 * maxX1);
+ muX2 = static_cast<double>(x2 - 1 + ix2 * maxX2);
+ muX3 = static_cast<double>(x3 - 1 + ix3 * maxX3);
+
+ forcingX1 = muForcingX1.Eval();
+ forcingX2 = muForcingX2.Eval();
+ forcingX3 = muForcingX3.Eval();
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Add half of the acceleration (body force) to the velocity as in Eq. (42)
+ //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015), DOI:10.1016/j.camwa.2015.05.001 ]</b></a>
+ //!
+ vvx += forcingX1 * deltaT * c1o2; // X
+ vvy += forcingX2 * deltaT * c1o2; // Y
+ vvz += forcingX3 * deltaT * c1o2; // Z
+ }
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ LBMReal oMdrho = c1;
+ ////////////////////////////////////////////////////////////////////////////////////
+ // calculate the square of velocities for this lattice node
+ LBMReal vx2 = vvx * vvx;
+ LBMReal vy2 = vvy * vvy;
+ LBMReal vz2 = vvz * vvz;
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Set relaxation limiters for third order cumulants to default value \f$ \lambda=0.001 \f$ according to section 6 in
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //!
+ LBMReal wadjust;
+ LBMReal qudricLimitP = c1o100;
+ LBMReal qudricLimitM = c1o100;
+ LBMReal qudricLimitD = c1o100;
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Chimera transform from well conditioned distributions to central moments as defined in Appendix J in
+ //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015), DOI:10.1016/j.camwa.2015.05.001 ]</b></a>
+ //! see also Eq. (6)-(14) in
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //!
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Z - Dir
+ forwardInverseChimeraWithK(mfaaa, mfaab, mfaac, vvz, vz2, c36, c1o36);
+ forwardInverseChimeraWithK(mfaba, mfabb, mfabc, vvz, vz2, c9, c1o9);
+ forwardInverseChimeraWithK(mfaca, mfacb, mfacc, vvz, vz2, c36, c1o36);
+ forwardInverseChimeraWithK(mfbaa, mfbab, mfbac, vvz, vz2, c9, c1o9);
+ forwardInverseChimeraWithK(mfbba, mfbbb, mfbbc, vvz, vz2, c9o4, c4o9);
+ forwardInverseChimeraWithK(mfbca, mfbcb, mfbcc, vvz, vz2, c9, c1o9);
+ forwardInverseChimeraWithK(mfcaa, mfcab, mfcac, vvz, vz2, c36, c1o36);
+ forwardInverseChimeraWithK(mfcba, mfcbb, mfcbc, vvz, vz2, c9, c1o9);
+ forwardInverseChimeraWithK(mfcca, mfccb, mfccc, vvz, vz2, c36, c1o36);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Y - Dir
+ forwardInverseChimeraWithK(mfaaa, mfaba, mfaca, vvy, vy2, c6, c1o6);
+ forwardChimera(mfaab, mfabb, mfacb, vvy, vy2);
+ forwardInverseChimeraWithK(mfaac, mfabc, mfacc, vvy, vy2, c18, c1o18);
+ forwardInverseChimeraWithK(mfbaa, mfbba, mfbca, vvy, vy2, c3o2, c2o3);
+ forwardChimera(mfbab, mfbbb, mfbcb, vvy, vy2);
+ forwardInverseChimeraWithK(mfbac, mfbbc, mfbcc, vvy, vy2, c9o2, c2o9);
+ forwardInverseChimeraWithK(mfcaa, mfcba, mfcca, vvy, vy2, c6, c1o6);
+ forwardChimera(mfcab, mfcbb, mfccb, vvy, vy2);
+ forwardInverseChimeraWithK(mfcac, mfcbc, mfccc, vvy, vy2, c18, c1o18);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // X - Dir
+ forwardInverseChimeraWithK(mfaaa, mfbaa, mfcaa, vvx, vx2, c1, c1);
+ forwardChimera(mfaba, mfbba, mfcba, vvx, vx2);
+ forwardInverseChimeraWithK(mfaca, mfbca, mfcca, vvx, vx2, c3, c1o3);
+ forwardChimera(mfaab, mfbab, mfcab, vvx, vx2);
+ forwardChimera(mfabb, mfbbb, mfcbb, vvx, vx2);
+ forwardChimera(mfacb, mfbcb, mfccb, vvx, vx2);
+ forwardInverseChimeraWithK(mfaac, mfbac, mfcac, vvx, vx2, c3, c1o3);
+ forwardChimera(mfabc, mfbbc, mfcbc, vvx, vx2);
+ forwardInverseChimeraWithK(mfacc, mfbcc, mfccc, vvx, vx2, c9, c1o9);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Setting relaxation rates for non-hydrodynamic cumulants (default values). Variable names and equations according to
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //! => [NAME IN PAPER]=[NAME IN CODE]=[DEFAULT VALUE].
+ //! - Trace of second order cumulants \f$ C_{200}+C_{020}+C_{002} \f$ used to adjust bulk viscosity:\f$\omega_2=OxxPyyPzz=1.0 \f$.
+ //! - Third order cumulants \f$ C_{120}+C_{102} \f$, \f$ C_{210}+C_{012} \f$, \f$ C_{201}+C_{021} \f$: \f$\omega_3=OxyyPxzz\f$ set according to Eq. (111) with simplifications assuming \f$\omega_2=1.0\f$.
+ //! - Third order cumulants \f$ C_{120}-C_{102} \f$, \f$ C_{210}-C_{012} \f$, \f$ C_{201}-C_{021} \f$: \f$\omega_4 = OxyyMxzz\f$ set according to Eq. (112) with simplifications assuming \f$\omega_2 = 1.0\f$.
+ //! - Third order cumulants \f$ C_{111} \f$: \f$\omega_5 = Oxyz\f$ set according to Eq. (113) with simplifications assuming \f$\omega_2 = 1.0\f$ (modify for different bulk viscosity).
+ //! - Fourth order cumulants \f$ C_{220} \f$, \f$ C_{202} \f$, \f$ C_{022} \f$, \f$ C_{211} \f$, \f$ C_{121} \f$, \f$ C_{112} \f$: for simplification all set to the same default value \f$ \omega_6=\omega_7=\omega_8=O4=1.0 \f$.
+ //! - Fifth order cumulants \f$ C_{221}\f$, \f$C_{212}\f$, \f$C_{122}\f$: \f$\omega_9=O5=1.0\f$.
+ //! - Sixth order cumulant \f$ C_{222}\f$: \f$\omega_{10}=O6=1.0\f$.
+ //!
+ ////////////////////////////////////////////////////////////
+ //2.
+ LBMReal OxxPyyPzz = c1;
+ ////////////////////////////////////////////////////////////
+ //3.
+ LBMReal OxyyPxzz = c8 * (-c2 + omega) * ( c1 + c2*omega) / (-c8 - c14*omega + c7*omega*omega);
+ LBMReal OxyyMxzz = c8 * (-c2 + omega) * (-c7 + c4*omega) / (c56 - c50*omega + c9*omega*omega);
+ LBMReal Oxyz = c24 * (-c2 + omega) * (-c2 - c7*omega + c3*omega*omega) / (c48 + c152*omega - c130*omega*omega + c29*omega*omega*omega);
+ ////////////////////////////////////////////////////////////
+ //4.
+ LBMReal O4 = c1;
+ ////////////////////////////////////////////////////////////
+ //5.
+ LBMReal O5 = c1;
+ ////////////////////////////////////////////////////////////
+ //6.
+ LBMReal O6 = c1;
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - A and B: parameters for fourth order convergence of the diffusion term according to Eq. (114) and (115)
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //! with simplifications assuming \f$\omega_2 = 1.0\f$ (modify for different bulk viscosity).
+ //!
+ LBMReal A = (c4 + c2*omega - c3*omega*omega) / (c2 - c7*omega + c5*omega*omega);
+ LBMReal B = (c4 + c28*omega - c14*omega*omega) / (c6 - c21*omega + c15*omega*omega);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Compute cumulants from central moments according to Eq. (20)-(23) in
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //!
+ ////////////////////////////////////////////////////////////
+ //4.
+ LBMReal CUMcbb = mfcbb - ((mfcaa + c1o3) * mfabb + c2 * mfbba * mfbab) * OOrho;
+ LBMReal CUMbcb = mfbcb - ((mfaca + c1o3) * mfbab + c2 * mfbba * mfabb) * OOrho;
+ LBMReal CUMbbc = mfbbc - ((mfaac + c1o3) * mfbba + c2 * mfbab * mfabb) * OOrho;
+
+ LBMReal CUMcca = mfcca - (((mfcaa * mfaca + c2 * mfbba * mfbba) + c1o3 * (mfcaa + mfaca)) * OOrho - c1o9 * (drho * OOrho));
+ LBMReal CUMcac = mfcac - (((mfcaa * mfaac + c2 * mfbab * mfbab) + c1o3 * (mfcaa + mfaac)) * OOrho - c1o9 * (drho * OOrho));
+ LBMReal CUMacc = mfacc - (((mfaac * mfaca + c2 * mfabb * mfabb) + c1o3 * (mfaac + mfaca)) * OOrho - c1o9 * (drho * OOrho));
+ ////////////////////////////////////////////////////////////
+ //5.
+ LBMReal CUMbcc = mfbcc - ((mfaac * mfbca + mfaca * mfbac + c4 * mfabb * mfbbb + c2 * (mfbab * mfacb + mfbba * mfabc)) + c1o3 * (mfbca + mfbac)) * OOrho;
+ LBMReal CUMcbc = mfcbc - ((mfaac * mfcba + mfcaa * mfabc + c4 * mfbab * mfbbb + c2 * (mfabb * mfcab + mfbba * mfbac)) + c1o3 * (mfcba + mfabc)) * OOrho;
+ LBMReal CUMccb = mfccb - ((mfcaa * mfacb + mfaca * mfcab + c4 * mfbba * mfbbb + c2 * (mfbab * mfbca + mfabb * mfcba)) + c1o3 * (mfacb + mfcab)) * OOrho;
+ ////////////////////////////////////////////////////////////
+ //6.
+ LBMReal CUMccc = mfccc + ((-c4 * mfbbb * mfbbb
+ - (mfcaa * mfacc + mfaca * mfcac + mfaac * mfcca)
+ - c4 * (mfabb * mfcbb + mfbab * mfbcb + mfbba * mfbbc)
+ - c2 * (mfbca * mfbac + mfcba * mfabc + mfcab * mfacb)) * OOrho
+ + (c4 * (mfbab * mfbab * mfaca + mfabb * mfabb * mfcaa + mfbba * mfbba * mfaac)
+ + c2 * (mfcaa * mfaca * mfaac)
+ + c16 * mfbba * mfbab * mfabb) * OOrho * OOrho
+ - c1o3 * (mfacc + mfcac + mfcca) * OOrho
+ - c1o9 * (mfcaa + mfaca + mfaac) * OOrho
+ + (c2 * (mfbab * mfbab + mfabb * mfabb + mfbba * mfbba)
+ + (mfaac * mfaca + mfaac * mfcaa + mfaca * mfcaa) + c1o3 * (mfaac + mfaca + mfcaa)) * OOrho * OOrho * c2o3
+ + c1o27 * ((drho * drho - drho) * OOrho * OOrho));
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Compute linear combinations of second and third order cumulants
+ //!
+ ////////////////////////////////////////////////////////////
+ //2.
+ LBMReal mxxPyyPzz = mfcaa + mfaca + mfaac;
+ LBMReal mxxMyy = mfcaa - mfaca;
+ LBMReal mxxMzz = mfcaa - mfaac;
+ ////////////////////////////////////////////////////////////
+ //3.
+ LBMReal mxxyPyzz = mfcba + mfabc;
+ LBMReal mxxyMyzz = mfcba - mfabc;
+
+ LBMReal mxxzPyyz = mfcab + mfacb;
+ LBMReal mxxzMyyz = mfcab - mfacb;
+
+ LBMReal mxyyPxzz = mfbca + mfbac;
+ LBMReal mxyyMxzz = mfbca - mfbac;
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //incl. correction
+ ////////////////////////////////////////////////////////////
+ //! - Compute velocity gradients from second order cumulants according to Eq. (27)-(32)
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //! Further explanations of the correction in viscosity in Appendix H of
+ //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015), DOI:10.1016/j.camwa.2015.05.001 ]</b></a>
+ //! Note that the division by rho is omitted here as we need rho times the gradients later.
+ //!
+ LBMReal Dxy = -c3 * omega * mfbba;
+ LBMReal Dxz = -c3 * omega * mfbab;
+ LBMReal Dyz = -c3 * omega * mfabb;
+ LBMReal dxux = c1o2 * (-omega) * (mxxMyy + mxxMzz) + c1o2 * OxxPyyPzz * (mfaaa - mxxPyyPzz);
+ LBMReal dyuy = dxux + omega * c3o2 * mxxMyy;
+ LBMReal dzuz = dxux + omega * c3o2 * mxxMzz;
+ ////////////////////////////////////////////////////////////
+ //! - Relaxation of second order cumulants with correction terms according to Eq. (33)-(35) in
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //!
+ mxxPyyPzz += OxxPyyPzz * (mfaaa - mxxPyyPzz) - c3 * (c1 - c1o2 * OxxPyyPzz) * (vx2 * dxux + vy2 * dyuy + vz2 * dzuz);
+ mxxMyy += omega * (-mxxMyy) - c3 * (c1 + c1o2 * (-omega)) * (vx2 * dxux - vy2 * dyuy);
+ mxxMzz += omega * (-mxxMzz) - c3 * (c1 + c1o2 * (-omega)) * (vx2 * dxux - vz2 * dzuz);
+
+ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ ////no correction
+ //mxxPyyPzz += OxxPyyPzz*(mfaaa - mxxPyyPzz);
+ //mxxMyy += -(-omega) * (-mxxMyy);
+ //mxxMzz += -(-omega) * (-mxxMzz);
+ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ mfabb += omega * (-mfabb);
+ mfbab += omega * (-mfbab);
+ mfbba += omega * (-mfbba);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //relax
+ //////////////////////////////////////////////////////////////////////////
+ // incl. limiter
+ //! - Relaxation of third order cumulants including limiter according to Eq. (116)-(123)
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //!
+ wadjust = Oxyz + (c1 - Oxyz) * abs(mfbbb) / (abs(mfbbb) + qudricLimitD);
+ mfbbb += wadjust * (-mfbbb);
+ wadjust = OxyyPxzz + (c1 - OxyyPxzz) * abs(mxxyPyzz) / (abs(mxxyPyzz) + qudricLimitP);
+ mxxyPyzz += wadjust * (-mxxyPyzz);
+ wadjust = OxyyMxzz + (c1 - OxyyMxzz) * abs(mxxyMyzz) / (abs(mxxyMyzz) + qudricLimitM);
+ mxxyMyzz += wadjust * (-mxxyMyzz);
+ wadjust = OxyyPxzz + (c1 - OxyyPxzz) * abs(mxxzPyyz) / (abs(mxxzPyyz) + qudricLimitP);
+ mxxzPyyz += wadjust * (-mxxzPyyz);
+ wadjust = OxyyMxzz + (c1 - OxyyMxzz) * abs(mxxzMyyz) / (abs(mxxzMyyz) + qudricLimitM);
+ mxxzMyyz += wadjust * (-mxxzMyyz);
+ wadjust = OxyyPxzz + (c1 - OxyyPxzz) * abs(mxyyPxzz) / (abs(mxyyPxzz) + qudricLimitP);
+ mxyyPxzz += wadjust * (-mxyyPxzz);
+ wadjust = OxyyMxzz + (c1 - OxyyMxzz) * abs(mxyyMxzz) / (abs(mxyyMxzz) + qudricLimitM);
+ mxyyMxzz += wadjust * (-mxyyMxzz);
+ //////////////////////////////////////////////////////////////////////////
+ // no limiter
+ //mfbbb += OxyyMxzz * (-mfbbb);
+ //mxxyPyzz += OxyyPxzz * (-mxxyPyzz);
+ //mxxyMyzz += OxyyMxzz * (-mxxyMyzz);
+ //mxxzPyyz += OxyyPxzz * (-mxxzPyyz);
+ //mxxzMyyz += OxyyMxzz * (-mxxzMyyz);
+ //mxyyPxzz += OxyyPxzz * (-mxyyPxzz);
+ //mxyyMxzz += OxyyMxzz * (-mxyyMxzz);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Compute inverse linear combinations of second and third order cumulants
+ //!
+ mfcaa = c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz);
+ mfaca = c1o3 * (-c2 * mxxMyy + mxxMzz + mxxPyyPzz);
+ mfaac = c1o3 * (mxxMyy - c2 * mxxMzz + mxxPyyPzz);
+
+ mfcba = (mxxyMyzz + mxxyPyzz) * c1o2;
+ mfabc = (-mxxyMyzz + mxxyPyzz) * c1o2;
+ mfcab = (mxxzMyyz + mxxzPyyz) * c1o2;
+ mfacb = (-mxxzMyyz + mxxzPyyz) * c1o2;
+ mfbca = (mxyyMxzz + mxyyPxzz) * c1o2;
+ mfbac = (-mxyyMxzz + mxyyPxzz) * c1o2;
+ //////////////////////////////////////////////////////////////////////////
+
+ //////////////////////////////////////////////////////////////////////////
+ //4.
+ // no limiter
+ //! - Relax fourth order cumulants to modified equilibrium for fourth order convergence of diffusion according to Eq. (43)-(48)
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //!
+ CUMacc = -O4 * (c1 / omega - c1o2) * (dyuy + dzuz) * c2o3 * A + (c1 - O4) * (CUMacc);
+ CUMcac = -O4 * (c1 / omega - c1o2) * (dxux + dzuz) * c2o3 * A + (c1 - O4) * (CUMcac);
+ CUMcca = -O4 * (c1 / omega - c1o2) * (dyuy + dxux) * c2o3 * A + (c1 - O4) * (CUMcca);
+ CUMbbc = -O4 * (c1 / omega - c1o2) * Dxy * c1o3 * B + (c1 - O4) * (CUMbbc);
+ CUMbcb = -O4 * (c1 / omega - c1o2) * Dxz * c1o3 * B + (c1 - O4) * (CUMbcb);
+ CUMcbb = -O4 * (c1 / omega - c1o2) * Dyz * c1o3 * B + (c1 - O4) * (CUMcbb);
+
+ //////////////////////////////////////////////////////////////////////////
+ //5.
+ CUMbcc += O5 * (-CUMbcc);
+ CUMcbc += O5 * (-CUMcbc);
+ CUMccb += O5 * (-CUMccb);
+
+ //////////////////////////////////////////////////////////////////////////
+ //6.
+ CUMccc += O6 * (-CUMccc);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Compute central moments from post collision cumulants according to Eq. (53)-(56) in
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //!
+
+ //////////////////////////////////////////////////////////////////////////
+ //4.
+ mfcbb = CUMcbb + c1o3 * ((c3 * mfcaa + c1) * mfabb + c6 * mfbba * mfbab) * OOrho;
+ mfbcb = CUMbcb + c1o3 * ((c3 * mfaca + c1) * mfbab + c6 * mfbba * mfabb) * OOrho;
+ mfbbc = CUMbbc + c1o3 * ((c3 * mfaac + c1) * mfbba + c6 * mfbab * mfabb) * OOrho;
+
+ mfcca = CUMcca + (((mfcaa * mfaca + c2 * mfbba * mfbba) * c9 + c3 * (mfcaa + mfaca)) * OOrho - (drho * OOrho)) * c1o9;
+ mfcac = CUMcac + (((mfcaa * mfaac + c2 * mfbab * mfbab) * c9 + c3 * (mfcaa + mfaac)) * OOrho - (drho * OOrho)) * c1o9;
+ mfacc = CUMacc + (((mfaac * mfaca + c2 * mfabb * mfabb) * c9 + c3 * (mfaac + mfaca)) * OOrho - (drho * OOrho)) * c1o9;
+
+ //////////////////////////////////////////////////////////////////////////
+ //5.
+ mfbcc = CUMbcc + c1o3 * (c3 * (mfaac * mfbca + mfaca * mfbac + c4 * mfabb * mfbbb + c2 * (mfbab * mfacb + mfbba * mfabc)) + (mfbca + mfbac)) * OOrho;
+ mfcbc = CUMcbc + c1o3 * (c3 * (mfaac * mfcba + mfcaa * mfabc + c4 * mfbab * mfbbb + c2 * (mfabb * mfcab + mfbba * mfbac)) + (mfcba + mfabc)) * OOrho;
+ mfccb = CUMccb + c1o3 * (c3 * (mfcaa * mfacb + mfaca * mfcab + c4 * mfbba * mfbbb + c2 * (mfbab * mfbca + mfabb * mfcba)) + (mfacb + mfcab)) * OOrho;
+
+ //////////////////////////////////////////////////////////////////////////
+ //6.
+ mfccc = CUMccc - ((-c4 * mfbbb * mfbbb
+ - (mfcaa * mfacc + mfaca * mfcac + mfaac * mfcca)
+ - c4 * (mfabb * mfcbb + mfbab * mfbcb + mfbba * mfbbc)
+ - c2 * (mfbca * mfbac + mfcba * mfabc + mfcab * mfacb)) * OOrho
+ + (c4 * (mfbab * mfbab * mfaca + mfabb * mfabb * mfcaa + mfbba * mfbba * mfaac)
+ + c2 * (mfcaa * mfaca * mfaac)
+ + c16 * mfbba * mfbab * mfabb) * OOrho * OOrho
+ - c1o3 * (mfacc + mfcac + mfcca) * OOrho
+ - c1o9 * (mfcaa + mfaca + mfaac) * OOrho
+ + (c2 * (mfbab * mfbab + mfabb * mfabb + mfbba * mfbba)
+ + (mfaac * mfaca + mfaac * mfcaa + mfaca * mfcaa) + c1o3 * (mfaac + mfaca + mfcaa)) * OOrho * OOrho * c2o3
+ + c1o27 * ((drho * drho - drho) * OOrho * OOrho));
+
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Add acceleration (body force) to first order cumulants according to Eq. (85)-(87) in
+ //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015), DOI:10.1016/j.camwa.2015.05.001 ]</b></a>
+ //!
+ mfbaa = -mfbaa;
+ mfaba = -mfaba;
+ mfaab = -mfaab;
+ ////////////////////////////////////////////////////////////////////////////////////
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Chimera transform from central moments to well conditioned distributions as defined in Appendix J in
+ //! <a href="https://doi.org/10.1016/j.camwa.2015.05.001"><b>[ M. Geier et al. (2015), DOI:10.1016/j.camwa.2015.05.001 ]</b></a>
+ //! see also Eq. (88)-(96) in
+ //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+ //!
+ ////////////////////////////////////////////////////////////////////////////////////
+ // X - Dir
+ backwardInverseChimeraWithK(mfaaa, mfbaa, mfcaa, vvx, vx2, c1, c1);
+ backwardChimera(mfaba, mfbba, mfcba, vvx, vx2);
+ backwardInverseChimeraWithK(mfaca, mfbca, mfcca, vvx, vx2, c3, c1o3);
+ backwardChimera(mfaab, mfbab, mfcab, vvx, vx2);
+ backwardChimera(mfabb, mfbbb, mfcbb, vvx, vx2);
+ backwardChimera(mfacb, mfbcb, mfccb, vvx, vx2);
+ backwardInverseChimeraWithK(mfaac, mfbac, mfcac, vvx, vx2, c3, c1o3);
+ backwardChimera(mfabc, mfbbc, mfcbc, vvx, vx2);
+ backwardInverseChimeraWithK(mfacc, mfbcc, mfccc, vvx, vx2, c9, c1o9);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Y - Dir
+ backwardInverseChimeraWithK(mfaaa, mfaba, mfaca, vvy, vy2, c6, c1o6);
+ backwardChimera(mfaab, mfabb, mfacb, vvy, vy2);
+ backwardInverseChimeraWithK(mfaac, mfabc, mfacc, vvy, vy2, c18, c1o18);
+ backwardInverseChimeraWithK(mfbaa, mfbba, mfbca, vvy, vy2, c3o2, c2o3);
+ backwardChimera(mfbab, mfbbb, mfbcb, vvy, vy2);
+ backwardInverseChimeraWithK(mfbac, mfbbc, mfbcc, vvy, vy2, c9o2, c2o9);
+ backwardInverseChimeraWithK(mfcaa, mfcba, mfcca, vvy, vy2, c6, c1o6);
+ backwardChimera(mfcab, mfcbb, mfccb, vvy, vy2);
+ backwardInverseChimeraWithK(mfcac, mfcbc, mfccc, vvy, vy2, c18, c1o18);
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Z - Dir
+ backwardInverseChimeraWithK(mfaaa, mfaab, mfaac, vvz, vz2, c36, c1o36);
+ backwardInverseChimeraWithK(mfaba, mfabb, mfabc, vvz, vz2, c9, c1o9);
+ backwardInverseChimeraWithK(mfaca, mfacb, mfacc, vvz, vz2, c36, c1o36);
+ backwardInverseChimeraWithK(mfbaa, mfbab, mfbac, vvz, vz2, c9, c1o9);
+ backwardInverseChimeraWithK(mfbba, mfbbb, mfbbc, vvz, vz2, c9o4, c4o9);
+ backwardInverseChimeraWithK(mfbca, mfbcb, mfbcc, vvz, vz2, c9, c1o9);
+ backwardInverseChimeraWithK(mfcaa, mfcab, mfcac, vvz, vz2, c36, c1o36);
+ backwardInverseChimeraWithK(mfcba, mfcbb, mfcbc, vvz, vz2, c9, c1o9);
+ backwardInverseChimeraWithK(mfcca, mfccb, mfccc, vvz, vz2, c36, c1o36);
+ ////////////////////////////////////////////////////////////////////////////////////
+
+ //////////////////////////////////////////////////////////////////////////
+ //proof correctness
+ //////////////////////////////////////////////////////////////////////////
+#ifdef PROOF_CORRECTNESS
+ LBMReal drho_post = (mfaaa + mfaac + mfaca + mfcaa + mfacc + mfcac + mfccc + mfcca)
+ + (mfaab + mfacb + mfcab + mfccb) + (mfaba + mfabc + mfcba + mfcbc) + (mfbaa + mfbac + mfbca + mfbcc)
+ + (mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc) + mfbbb;
+ LBMReal dif = drho - drho_post;
+#ifdef SINGLEPRECISION
+ if (dif > 10.0E-7 || dif < -10.0E-7)
+#else
+ if (dif > 10.0E-15 || dif < -10.0E-15)
+#endif
+ {
+ UB_THROW(UbException(UB_EXARGS, "rho=" + UbSystem::toString(drho) + ", rho_post=" + UbSystem::toString(drho_post)
+ + " dif=" + UbSystem::toString(dif)
+ + " rho is not correct for node " + UbSystem::toString(x1) + "," + UbSystem::toString(x2) + "," + UbSystem::toString(x3)
+ + " in " + block.lock()->toString() + " step = " + UbSystem::toString(step)));
+ }
+#endif
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - Write distributions: style of reading and writing the distributions from/to stored arrays dependent on timestep is based on the esoteric twist algorithm
+ //! <a href="https://doi.org/10.3390/computation5020019"><b>[ M. Geier et al. (2017), DOI:10.3390/computation5020019 ]</b></a>
+ //!
+ (*this->localDistributions)(D3Q27System::ET_E, x1, x2, x3) = mfabb;
+ (*this->localDistributions)(D3Q27System::ET_N, x1, x2, x3) = mfbab;
+ (*this->localDistributions)(D3Q27System::ET_T, x1, x2, x3) = mfbba;
+ (*this->localDistributions)(D3Q27System::ET_NE, x1, x2, x3) = mfaab;
+ (*this->localDistributions)(D3Q27System::ET_NW, x1p, x2, x3) = mfcab;
+ (*this->localDistributions)(D3Q27System::ET_TE, x1, x2, x3) = mfaba;
+ (*this->localDistributions)(D3Q27System::ET_TW, x1p, x2, x3) = mfcba;
+ (*this->localDistributions)(D3Q27System::ET_TN, x1, x2, x3) = mfbaa;
+ (*this->localDistributions)(D3Q27System::ET_TS, x1, x2p, x3) = mfbca;
+ (*this->localDistributions)(D3Q27System::ET_TNE, x1, x2, x3) = mfaaa;
+ (*this->localDistributions)(D3Q27System::ET_TNW, x1p, x2, x3) = mfcaa;
+ (*this->localDistributions)(D3Q27System::ET_TSE, x1, x2p, x3) = mfaca;
+ (*this->localDistributions)(D3Q27System::ET_TSW, x1p, x2p, x3) = mfcca;
+
+ (*this->nonLocalDistributions)(D3Q27System::ET_W, x1p, x2, x3) = mfcbb;
+ (*this->nonLocalDistributions)(D3Q27System::ET_S, x1, x2p, x3) = mfbcb;
+ (*this->nonLocalDistributions)(D3Q27System::ET_B, x1, x2, x3p) = mfbbc;
+ (*this->nonLocalDistributions)(D3Q27System::ET_SW, x1p, x2p, x3) = mfccb;
+ (*this->nonLocalDistributions)(D3Q27System::ET_SE, x1, x2p, x3) = mfacb;
+ (*this->nonLocalDistributions)(D3Q27System::ET_BW, x1p, x2, x3p) = mfcbc;
+ (*this->nonLocalDistributions)(D3Q27System::ET_BE, x1, x2, x3p) = mfabc;
+ (*this->nonLocalDistributions)(D3Q27System::ET_BS, x1, x2p, x3p) = mfbcc;
+ (*this->nonLocalDistributions)(D3Q27System::ET_BN, x1, x2, x3p) = mfbac;
+ (*this->nonLocalDistributions)(D3Q27System::ET_BSW, x1p, x2p, x3p) = mfccc;
+ (*this->nonLocalDistributions)(D3Q27System::ET_BSE, x1, x2p, x3p) = mfacc;
+ (*this->nonLocalDistributions)(D3Q27System::ET_BNW, x1p, x2, x3p) = mfcac;
+ (*this->nonLocalDistributions)(D3Q27System::ET_BNE, x1, x2, x3p) = mfaac;
+
+ (*this->restDistributions)(x1, x2, x3) = mfbbb;
+ //////////////////////////////////////////////////////////////////////////
+
+ }
+ }
+ }
+ }
+}
+//////////////////////////////////////////////////////////////////////////
+
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h
new file mode 100644
index 0000000000000000000000000000000000000000..1958b39d812695033ec395964236b1c7f9ce2e84
--- /dev/null
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h
@@ -0,0 +1,147 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids 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 General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file CumulantK17LBMKernel.h
+//! \ingroup LBM
+//! \author Konstantin Kutscher, Martin Geier
+//=======================================================================================
+
+#ifndef CumulantK17LBMKernel_h__
+#define CumulantK17LBMKernel_h__
+
+#include "LBMKernel.h"
+#include "BCProcessor.h"
+#include "D3Q27System.h"
+#include "basics/utilities/UbTiming.h"
+#include "basics/container/CbArray4D.h"
+#include "basics/container/CbArray3D.h"
+
+//! \brief Compressible cumulant LBM kernel.
+//! \details LBM implementation that use Cascaded Cumulant Lattice Boltzmann method for D3Q27 model
+//!
+//! The model is publisched in
+//! <a href="http://dx.doi.org/10.1016/j.jcp.2017.05.040"><b>[ Geier et al., (2017), 10.1016/j.jcp.2017.05.040]</b></a>,
+//! <a href="http://dx.doi.org/10.1016/j.jcp.2017.07.004"><b>[ Geier et al., (2017), 10.1016/j.jcp.2017.07.004]</b></a>
+//!
+class CumulantK17LBMKernel : public LBMKernel
+{
+public:
+ CumulantK17LBMKernel();
+ 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);
+ inline void backwardInverseChimeraWithK(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2, LBMReal Kinverse, LBMReal K);
+ inline void forwardChimera(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2);
+ inline void backwardChimera(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2);
+
+ virtual void initDataSet();
+ LBMReal f[D3Q27System::ENDF + 1];
+
+ CbArray4D<LBMReal, IndexerX4X3X2X1>::CbArray4DPtr localDistributions;
+ CbArray4D<LBMReal, IndexerX4X3X2X1>::CbArray4DPtr nonLocalDistributions;
+ CbArray3D<LBMReal, IndexerX3X2X1>::CbArray3DPtr restDistributions;
+
+ mu::value_type muX1, muX2, muX3;
+ mu::value_type muDeltaT;
+ mu::value_type muNu;
+ LBMReal forcingX1;
+ LBMReal forcingX2;
+ LBMReal forcingX3;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//! \brief forward chimera transformation \ref forwardInverseChimeraWithK
+//! Transformation from distributions to central moments according to Eq. (6)-(14) in
+//! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+//! Modified for lower round-off errors.
+////////////////////////////////////////////////////////////////////////////////
+inline void CumulantK17LBMKernel::forwardInverseChimeraWithK(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2, LBMReal Kinverse, LBMReal K)
+{
+ using namespace UbMath;
+ LBMReal m2 = mfa + mfc;
+ LBMReal m1 = mfc - mfa;
+ LBMReal m0 = m2 + mfb;
+ mfa = m0;
+ m0 *= Kinverse;
+ m0 += c1;
+ mfb = (m1 * Kinverse - m0 * vv) * K;
+ mfc = ((m2 - c2 * m1 * vv) * Kinverse + v2 * m0) * K;
+}
+////////////////////////////////////////////////////////////////////////////////
+//! \brief backward chimera transformation \ref backwardInverseChimeraWithK
+//! Transformation from central moments to distributions according to Eq. (57)-(65) in
+//! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+//! Modified for lower round-off errors.
+////////////////////////////////////////////////////////////////////////////////
+inline void CumulantK17LBMKernel::backwardInverseChimeraWithK(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2, LBMReal Kinverse, LBMReal K)
+{
+ using namespace UbMath;
+ LBMReal m0 = (((mfc - mfb) * c1o2 + mfb * vv) * Kinverse + (mfa * Kinverse + c1) * (v2 - vv) * c1o2) * K;
+ LBMReal m1 = (((mfa - mfc) - c2 * mfb * vv) * Kinverse + (mfa * Kinverse + c1) * (-v2)) * K;
+ mfc = (((mfc + mfb) * c1o2 + mfb * vv) * Kinverse + (mfa * Kinverse + c1) * (v2 + vv) * c1o2) * K;
+ mfa = m0;
+ mfb = m1;
+}
+////////////////////////////////////////////////////////////////////////////////
+//! \brief forward chimera transformation \ref forwardChimera
+//! Transformation from distributions to central moments according to Eq. (6)-(14) in
+//! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+//! for \f$ K_{abc}=0 \f$. This is to avoid unnessary floating point operations.
+//! Modified for lower round-off errors.
+////////////////////////////////////////////////////////////////////////////////
+inline void CumulantK17LBMKernel::forwardChimera(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2)
+{
+ using namespace UbMath;
+ LBMReal m1 = (mfa + mfc) + mfb;
+ LBMReal m2 = mfc - mfa;
+ mfc = (mfc + mfa) + (v2 * m1 - c2 * vv * m2);
+ mfb = m2 - vv * m1;
+ mfa = m1;
+}
+////////////////////////////////////////////////////////////////////////////////
+//! \brief backward chimera transformation \ref backwardChimera
+//! Transformation from central moments to distributions according to Eq. (57)-(65) in
+//! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+//! for \f$ K_{abc}=0 \f$. This is to avoid unnessary floating point operations.
+//! Modified for lower round-off errors.
+////////////////////////////////////////////////////////////////////////////////
+inline void CumulantK17LBMKernel::backwardChimera(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2)
+{
+ using namespace UbMath;
+ LBMReal ma = (mfc + mfa * (v2 - vv)) * c1o2 + mfb * (vv - c1o2);
+ LBMReal mb = ((mfa - mfc) - mfa * v2) - c2 * mfb * vv;
+ mfc = (mfc + mfa * (v2 + vv)) * c1o2 + mfb * (vv + c1o2);
+ mfb = mb;
+ mfa = ma;
+}
+
+#endif // CumulantK17LBMKernel_h__
\ No newline at end of file
diff --git a/src/gpu/GksGpu/Analyzer/ConvergenceAnalyzer.h b/src/gpu/GksGpu/Analyzer/ConvergenceAnalyzer.h
index b6697557ae3172efee19c63ea6523a6b9e532126..52b1896a20430ea45c6ddf3f513c0902e521a825 100644
--- a/src/gpu/GksGpu/Analyzer/ConvergenceAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/ConvergenceAnalyzer.h
@@ -3,7 +3,7 @@
#include <vector>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/CupsAnalyzer.cpp b/src/gpu/GksGpu/Analyzer/CupsAnalyzer.cpp
index d1a1e5e7c22a241507d5e0fcd87b778d9ce4bb17..1d23a82bef8ea9c3e22eef18db57a4365f603eb3 100644
--- a/src/gpu/GksGpu/Analyzer/CupsAnalyzer.cpp
+++ b/src/gpu/GksGpu/Analyzer/CupsAnalyzer.cpp
@@ -6,7 +6,7 @@
#include "Core/Logger/Logger.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "DataBase/DataBase.h"
diff --git a/src/gpu/GksGpu/Analyzer/CupsAnalyzer.h b/src/gpu/GksGpu/Analyzer/CupsAnalyzer.h
index b4c2e087e2c99ea2747cbe2280698b22af70da23..095e795501adf019bb9eb1e54dda3329b98bb9d8 100644
--- a/src/gpu/GksGpu/Analyzer/CupsAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/CupsAnalyzer.h
@@ -3,7 +3,7 @@
#include <string>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.h b/src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.h
index 409f742c63a27e138def496e202292096bfda44a..43acf5b51f06a7182d4c212811fcce56b3f7ae3d 100644
--- a/src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.h
@@ -4,7 +4,7 @@
#include <vector>
#include <string>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.h b/src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.h
index 0bca4db1ae5302224e53296df3cf87bda2416820..e64c24310411095fe09960b9d2ca0550fc7d6cbf 100644
--- a/src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.h
@@ -4,7 +4,7 @@
#include <vector>
#include <string>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/KineticEnergyAnalyzer.h b/src/gpu/GksGpu/Analyzer/KineticEnergyAnalyzer.h
index 213c061782d6c5f70e7f4618ae76c662be0073e2..ee69b40988f8105535e5ec77d6c2d1fadb9172e1 100644
--- a/src/gpu/GksGpu/Analyzer/KineticEnergyAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/KineticEnergyAnalyzer.h
@@ -4,7 +4,7 @@
#include <vector>
#include <string>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/PointTimeSeriesAnalyzer.h b/src/gpu/GksGpu/Analyzer/PointTimeSeriesAnalyzer.h
index 3c53979037cb10115e94c7a1d2f5f81754c3dc00..658c7a9d0f0b7932c57f5387646d6177d905f497 100644
--- a/src/gpu/GksGpu/Analyzer/PointTimeSeriesAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/PointTimeSeriesAnalyzer.h
@@ -5,7 +5,7 @@
#include <string>
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/PointTimeSeriesCollector.h b/src/gpu/GksGpu/Analyzer/PointTimeSeriesCollector.h
index 3d7b57c9f4c1d09b09688e82e88b607b16ff16b2..6725e7658b59cfe61aa28fbec1e54fe154f2318e 100644
--- a/src/gpu/GksGpu/Analyzer/PointTimeSeriesCollector.h
+++ b/src/gpu/GksGpu/Analyzer/PointTimeSeriesCollector.h
@@ -6,7 +6,7 @@
#include <string>
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.h b/src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.h
index 57e1bc89a6e506b80648d5c40ab53d6b1047d3df..1f9f3d7338733d48ca4ffb237f09f864566896a4 100644
--- a/src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.h
+++ b/src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.h
@@ -5,7 +5,7 @@
#include <string>
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/AdiabaticWall.h b/src/gpu/GksGpu/BoundaryConditions/AdiabaticWall.h
index c35e08c7d4b0fcd0186e607941811622685d32eb..88519dc3d145f6c09e8b9cc5135803c53245a378 100644
--- a/src/gpu/GksGpu/BoundaryConditions/AdiabaticWall.h
+++ b/src/gpu/GksGpu/BoundaryConditions/AdiabaticWall.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/BoundaryCondition.h b/src/gpu/GksGpu/BoundaryConditions/BoundaryCondition.h
index 3d79879f060fc6ed06e95c84d8f6a410d31ab1dc..fe4078af95904fa5e1580b54f3aa2edbb006bd3d 100644
--- a/src/gpu/GksGpu/BoundaryConditions/BoundaryCondition.h
+++ b/src/gpu/GksGpu/BoundaryConditions/BoundaryCondition.h
@@ -6,7 +6,7 @@
#include <memory>
#include <vector>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/ConcreteHeatFlux.h b/src/gpu/GksGpu/BoundaryConditions/ConcreteHeatFlux.h
index 14c1f2519d1015a0a06956931255e07a2e0c0cc0..b8ff0d316a0dc5d126afc277cde662d8c89eab8d 100644
--- a/src/gpu/GksGpu/BoundaryConditions/ConcreteHeatFlux.h
+++ b/src/gpu/GksGpu/BoundaryConditions/ConcreteHeatFlux.h
@@ -5,7 +5,7 @@
#include <thrust/device_vector.h>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.h b/src/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.h
index 7441f17a293c411b7b01e206aa27f013baa71891..70d5f11f2fb6b5ce03195c416dca4035b9e89055 100644
--- a/src/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.h
+++ b/src/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Extrapolation.h b/src/gpu/GksGpu/BoundaryConditions/Extrapolation.h
index 5b7f63ef6bcb0e2f449695fe561081b5bd971409..4353a5e58e947d248c9b87f7838dab45f986e5f5 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Extrapolation.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Extrapolation.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/HeatFlux.h b/src/gpu/GksGpu/BoundaryConditions/HeatFlux.h
index f5e10aa35e788b75f2bf77e3d76fca29e0f585b3..701f9f4db8593d9f27771d12ac451db13a42f625 100644
--- a/src/gpu/GksGpu/BoundaryConditions/HeatFlux.h
+++ b/src/gpu/GksGpu/BoundaryConditions/HeatFlux.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Inflow.h b/src/gpu/GksGpu/BoundaryConditions/Inflow.h
index e6b23a58ac7e7fe45e57f0056416743d039b789c..b1036c4187ce3d040f8ebf2f51a5fbed1ecb76cc 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Inflow.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Inflow.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/InflowComplete.h b/src/gpu/GksGpu/BoundaryConditions/InflowComplete.h
index 778856d22878b41567f2bd2a6e171f92ee453ea4..6d402d150a10a05666f44ab5c73c068fab507736 100644
--- a/src/gpu/GksGpu/BoundaryConditions/InflowComplete.h
+++ b/src/gpu/GksGpu/BoundaryConditions/InflowComplete.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/IsothermalWall.h b/src/gpu/GksGpu/BoundaryConditions/IsothermalWall.h
index 7717ebd50991404277e8cbdddc0955fb8a18661a..57bafca6bf7190553aa80dacfc41b8207eeef099 100644
--- a/src/gpu/GksGpu/BoundaryConditions/IsothermalWall.h
+++ b/src/gpu/GksGpu/BoundaryConditions/IsothermalWall.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/MassCompensation.h b/src/gpu/GksGpu/BoundaryConditions/MassCompensation.h
index 48349c58d335736043bbd80ac24eb8c5f2fccbe2..6b2c47206718e10f5664f1b7275ce4393d0e3774 100644
--- a/src/gpu/GksGpu/BoundaryConditions/MassCompensation.h
+++ b/src/gpu/GksGpu/BoundaryConditions/MassCompensation.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Open.h b/src/gpu/GksGpu/BoundaryConditions/Open.h
index d3f489ed83796fa981909f3def9b5014f4ba549c..16cf9736b9ee4b2851d56547a523cc948ec7c64b 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Open.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Open.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h b/src/gpu/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h
index a5a64d9ecd37ba31ab250938f0826e4b995cb737..0c46b12a085c9e8f755e2170274466e907710d86 100644
--- a/src/gpu/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h
+++ b/src/gpu/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Periodic.h b/src/gpu/GksGpu/BoundaryConditions/Periodic.h
index e8ab6e145d48e728fbc2675a16950094b8d1d0f1..3d6755f9dd9f3578a717e794f39bc105f8c0a345 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Periodic.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Periodic.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Pressure.h b/src/gpu/GksGpu/BoundaryConditions/Pressure.h
index 459b8d26a2e95d1d42ecc85c7b9d9190145f7803..4413a2d0c1a241ce900d9a1166382c586baad89f 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Pressure.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Pressure.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Pressure2.h b/src/gpu/GksGpu/BoundaryConditions/Pressure2.h
index d61c84ae9cf28a846f0a5295c5a3eea6905a56d2..18dc531a5240af42b84ef484980f54b5b47a9d82 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Pressure2.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Pressure2.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/SalinasVazquez.h b/src/gpu/GksGpu/BoundaryConditions/SalinasVazquez.h
index 4d3dbd7b6bf2668bcaf9dc84cbb6865c191eee0c..5769b157e987ffe280da40919ce80e0f6e5de9ed 100644
--- a/src/gpu/GksGpu/BoundaryConditions/SalinasVazquez.h
+++ b/src/gpu/GksGpu/BoundaryConditions/SalinasVazquez.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/BoundaryConditions/Symmetry.h b/src/gpu/GksGpu/BoundaryConditions/Symmetry.h
index 3132628b72858e496a74efc9276074f9f37e94b4..6fd73fa3894fa500d21b4b5cb7e2f19a8b6fb61b 100644
--- a/src/gpu/GksGpu/BoundaryConditions/Symmetry.h
+++ b/src/gpu/GksGpu/BoundaryConditions/Symmetry.h
@@ -3,7 +3,7 @@
#include <memory>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/CellUpdate/CellUpdate.h b/src/gpu/GksGpu/CellUpdate/CellUpdate.h
index de4d5494a6c114b4dd5e6a178e32f6545de446be..de8a0b86ca5de9501046ffaa1235c70122bf91e8 100644
--- a/src/gpu/GksGpu/CellUpdate/CellUpdate.h
+++ b/src/gpu/GksGpu/CellUpdate/CellUpdate.h
@@ -1,7 +1,7 @@
#ifndef CellUpdate_H
#define CellUpdate_H
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Communication/Communicator.h b/src/gpu/GksGpu/Communication/Communicator.h
index 87a72a37f379741652e44e01e9cf3216ca930827..4b883563705324c862cc6778480b6b09ba285587 100644
--- a/src/gpu/GksGpu/Communication/Communicator.h
+++ b/src/gpu/GksGpu/Communication/Communicator.h
@@ -6,7 +6,7 @@
#include <mpi.h>
//#include <mutex>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Communication/MpiUtility.h b/src/gpu/GksGpu/Communication/MpiUtility.h
index 96484a2aabaac887ee4497944e143da162e72853..f2aa1a8be1d18f99cfd29d91b2bcb31edc0a661f 100644
--- a/src/gpu/GksGpu/Communication/MpiUtility.h
+++ b/src/gpu/GksGpu/Communication/MpiUtility.h
@@ -3,7 +3,7 @@
#include <mpi.h>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/CudaUtility/CudaUtility.h b/src/gpu/GksGpu/CudaUtility/CudaUtility.h
index b9008cd73869b4a7379b479656ffd0eec0cc9f6b..fa312e9d41879703d04a03092e79401abc132c86 100644
--- a/src/gpu/GksGpu/CudaUtility/CudaUtility.h
+++ b/src/gpu/GksGpu/CudaUtility/CudaUtility.h
@@ -4,7 +4,7 @@
#include <cuda.h>
#include <cuda_runtime.h>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/DataBase/DataBase.h b/src/gpu/GksGpu/DataBase/DataBase.h
index ca485d47b2058824f661ef1ad2f5461ecbf57851..02475ae98ca5bb5d799098791342802cf6cde7b0 100644
--- a/src/gpu/GksGpu/DataBase/DataBase.h
+++ b/src/gpu/GksGpu/DataBase/DataBase.h
@@ -11,7 +11,7 @@
#include "Core/VectorTypes.h"
#include "Core/ArrayTypes.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Definitions/AccumulatorDataType.h"
diff --git a/src/gpu/GksGpu/DataBase/DataBaseAllocator.h b/src/gpu/GksGpu/DataBase/DataBaseAllocator.h
index 04daba9dc09e1947bba713ba2ae7fd08ff691c9c..e50c58f13a8c2134311f28a904e14ac64ca473d5 100644
--- a/src/gpu/GksGpu/DataBase/DataBaseAllocator.h
+++ b/src/gpu/GksGpu/DataBase/DataBaseAllocator.h
@@ -7,7 +7,7 @@
#include "Core/DataTypes.h"
#include "PointerDefinitions.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
class GksMeshAdapter;
diff --git a/src/gpu/GksGpu/DataBase/DataBaseAllocatorCPU.h b/src/gpu/GksGpu/DataBase/DataBaseAllocatorCPU.h
index 16b2c8096dfcbcda1cd804b7ba02efceee7ca09d..420223338912f152a44ed92c7140afb587f4ec95 100644
--- a/src/gpu/GksGpu/DataBase/DataBaseAllocatorCPU.h
+++ b/src/gpu/GksGpu/DataBase/DataBaseAllocatorCPU.h
@@ -6,7 +6,7 @@
#include "DataBaseAllocator.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
namespace GksGpu {
diff --git a/src/gpu/GksGpu/DataBase/DataBaseAllocatorGPU.h b/src/gpu/GksGpu/DataBase/DataBaseAllocatorGPU.h
index 8c05836db164df22d84130afd01029b174ee9fb7..4ed547e223c36248cd323ced4ecca637fcdce9a8 100644
--- a/src/gpu/GksGpu/DataBase/DataBaseAllocatorGPU.h
+++ b/src/gpu/GksGpu/DataBase/DataBaseAllocatorGPU.h
@@ -6,7 +6,7 @@
#include "DataBaseAllocator.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
namespace GksGpu {
diff --git a/src/gpu/GksGpu/DataBase/DataBaseStruct.h b/src/gpu/GksGpu/DataBase/DataBaseStruct.h
index 8e6e9fd9b03a46d55140e193bb491b8c89d32783..3fb5a50a0c396f92d49ebf29fd197067ccda6500 100644
--- a/src/gpu/GksGpu/DataBase/DataBaseStruct.h
+++ b/src/gpu/GksGpu/DataBase/DataBaseStruct.h
@@ -3,7 +3,7 @@
#include "Core/DataTypes.h"
-#include <VirtualFluidsDefinitions.h>
+
namespace GksGpu{
diff --git a/src/gpu/GksGpu/FluxComputation/ApplyFlux.cuh b/src/gpu/GksGpu/FluxComputation/ApplyFlux.cuh
index ed9abe98fb96f6947629e3e368e6a08d45297f68..0a938799d240d42615f8c478a0c949526adf9463 100644
--- a/src/gpu/GksGpu/FluxComputation/ApplyFlux.cuh
+++ b/src/gpu/GksGpu/FluxComputation/ApplyFlux.cuh
@@ -1,7 +1,7 @@
#ifndef ApplyFlux_CUH
#define ApplyFlux_CUH
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/AssembleFlux.cuh b/src/gpu/GksGpu/FluxComputation/AssembleFlux.cuh
index 59522e2a1dfd30433440fe1c6a1a7bd7efd4e7d0..3e00c3ae33d6083d37d4cf334dd51d575f4fc0db 100644
--- a/src/gpu/GksGpu/FluxComputation/AssembleFlux.cuh
+++ b/src/gpu/GksGpu/FluxComputation/AssembleFlux.cuh
@@ -1,7 +1,7 @@
#ifndef AssembleFlux_CUH
#define AssembleFlux_CUH
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/ExpansionCoefficients.cuh b/src/gpu/GksGpu/FluxComputation/ExpansionCoefficients.cuh
index 21aa4dc522be689dc2e523088e9fd6036c535af4..69c00acdda7d0f35ac3433af177471db083853b9 100644
--- a/src/gpu/GksGpu/FluxComputation/ExpansionCoefficients.cuh
+++ b/src/gpu/GksGpu/FluxComputation/ExpansionCoefficients.cuh
@@ -1,7 +1,7 @@
#ifndef ExpansionCoefficients_CUH
#define ExpansionCoefficients_CUH
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/FluxComputation.h b/src/gpu/GksGpu/FluxComputation/FluxComputation.h
index 7913828effca6ccc5d1458f955e39aab06276b7c..0fe86577dbe9901ac513cce802667db4b3db2ee7 100644
--- a/src/gpu/GksGpu/FluxComputation/FluxComputation.h
+++ b/src/gpu/GksGpu/FluxComputation/FluxComputation.h
@@ -1,7 +1,7 @@
#ifndef FluxComputation_H
#define FluxComputation_H
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/FluxComputation/Moments.cuh b/src/gpu/GksGpu/FluxComputation/Moments.cuh
index c43d28e4e2a1f89290326dab1a6ff667fa14cb8a..8ba25dbef215bdff85c8618cff5e9da047b364f2 100644
--- a/src/gpu/GksGpu/FluxComputation/Moments.cuh
+++ b/src/gpu/GksGpu/FluxComputation/Moments.cuh
@@ -1,7 +1,7 @@
#ifndef Moments_CUH
#define Moments_CUH
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/Reconstruction.cuh b/src/gpu/GksGpu/FluxComputation/Reconstruction.cuh
index 565fd80dcf9b9c2ae366765efba6b23907f5b20d..74134aba8b2f6e453b6e6095d887ec086836c1e3 100644
--- a/src/gpu/GksGpu/FluxComputation/Reconstruction.cuh
+++ b/src/gpu/GksGpu/FluxComputation/Reconstruction.cuh
@@ -1,7 +1,7 @@
#ifndef Reconstruction_CUH
#define Reconstruction_CUH
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/Smagorinsky.cuh b/src/gpu/GksGpu/FluxComputation/Smagorinsky.cuh
index 62e52bebeb2971011439dd0d4a8ce54b4b6eb34b..8a03ae722e62f338eed7672d362cf0aaa28d6d7a 100644
--- a/src/gpu/GksGpu/FluxComputation/Smagorinsky.cuh
+++ b/src/gpu/GksGpu/FluxComputation/Smagorinsky.cuh
@@ -3,7 +3,7 @@
#include <cmath>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/SutherlandsLaw.cuh b/src/gpu/GksGpu/FluxComputation/SutherlandsLaw.cuh
index 99ade55c4b3a2cf4f799e2a5d2d4363ad7029a85..5af3ca3889fc73f4230bdcfb18a7cf13a3c0d82b 100644
--- a/src/gpu/GksGpu/FluxComputation/SutherlandsLaw.cuh
+++ b/src/gpu/GksGpu/FluxComputation/SutherlandsLaw.cuh
@@ -3,7 +3,7 @@
#include <cmath>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/FluxComputation/Transformation.cuh b/src/gpu/GksGpu/FluxComputation/Transformation.cuh
index bb41a5db31d69a21666a0171737d1d001ce30a95..d8ffb91fab35c23b8925fc55f3531c4a83c53dbe 100644
--- a/src/gpu/GksGpu/FluxComputation/Transformation.cuh
+++ b/src/gpu/GksGpu/FluxComputation/Transformation.cuh
@@ -1,7 +1,7 @@
#ifndef Transformation_CUH
#define Transformation_CUH
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/GksGpu/Initializer/Initializer.h b/src/gpu/GksGpu/Initializer/Initializer.h
index 1d04b25baa26fc045dc70bb5f38d44359cff1e26..badac795fedf7bc6df82c6a34139c7c427c051aa 100644
--- a/src/gpu/GksGpu/Initializer/Initializer.h
+++ b/src/gpu/GksGpu/Initializer/Initializer.h
@@ -5,7 +5,7 @@
#include <memory>
#include <functional>
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Interface/Interface.h b/src/gpu/GksGpu/Interface/Interface.h
index a5c66b60d7b147f6f38444a45ed53938e40fb151..5aa99bd99db520818a18aa638c8061995b58aa6e 100644
--- a/src/gpu/GksGpu/Interface/Interface.h
+++ b/src/gpu/GksGpu/Interface/Interface.h
@@ -1,7 +1,7 @@
#ifndef FineToCoarse_H
#define FineToCoarse_H
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/Output/VtkWriter.cpp b/src/gpu/GksGpu/Output/VtkWriter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a1a0ab9f62f275107e790a34c407c83adc09ab2d
--- /dev/null
+++ b/src/gpu/GksGpu/Output/VtkWriter.cpp
@@ -0,0 +1,146 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids 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 General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file VtkWriter.cpp
+//! \ingroup Output
+//! \author Stephan Lenz
+//=======================================================================================
+#include "VtkWriter.h"
+
+#include <vector>
+#include <memory>
+
+#include "Core/Logger/Logger.h"
+
+#include "basics/utilities/UbTuple.h"
+#include "basics/writer/WbWriterVtkXmlBinary.h"
+
+#include "DataBase/DataBase.h"
+#include "Parameters/Parameters.h"
+
+#include "FlowStateData/FlowStateData.cuh"
+#include "FlowStateData/FlowStateDataConversion.cuh"
+#include "FlowStateData/AccessDeviceData.cuh"
+
+void VtkWriter::write(std::shared_ptr<DataBase> dataBase, Parameters parameters, std::string filename)
+{
+ *logging::out << logging::Logger::INFO_INTERMEDIATE << "Write " << filename << ".vtu" << " ... \n";
+
+ //////////////////////////////////////////////////////////////////////////
+
+ std::vector< UbTupleFloat3 > nodes;
+ std::vector< UbTupleInt8 > cells;
+
+ nodes.resize( dataBase->numberOfNodes );
+ cells.resize( dataBase->numberOfCells );
+
+ for( uint nodeIdx = 0; nodeIdx < dataBase->numberOfNodes; nodeIdx++ )
+ {
+ Vec3& node = dataBase->nodeCoordinates[ nodeIdx ];
+
+ nodes[nodeIdx] = makeUbTuple( node.x, node.y, node.z );
+ }
+
+ for( uint cellIdx = 0; cellIdx < dataBase->numberOfCells; cellIdx++ )
+ {
+ cells[cellIdx] = makeUbTuple( (int)dataBase->cellToNode[ cellIdx ][ 0 ],
+ (int)dataBase->cellToNode[ cellIdx ][ 1 ],
+ (int)dataBase->cellToNode[ cellIdx ][ 2 ],
+ (int)dataBase->cellToNode[ cellIdx ][ 3 ],
+ (int)dataBase->cellToNode[ cellIdx ][ 4 ],
+ (int)dataBase->cellToNode[ cellIdx ][ 5 ],
+ (int)dataBase->cellToNode[ cellIdx ][ 6 ],
+ (int)dataBase->cellToNode[ cellIdx ][ 7 ] );
+ }
+
+ //////////////////////////////////////////////////////////////////////////
+
+ std::vector< std::string > cellDataNames;
+ cellDataNames.push_back("Press"); // 0
+ cellDataNames.push_back("Rho"); // 1
+ cellDataNames.push_back("Vx"); // 2
+ cellDataNames.push_back("Vy"); // 3
+ cellDataNames.push_back("Vz"); // 4
+ cellDataNames.push_back("Temperature"); // 5
+ cellDataNames.push_back("Geometry"); // 6
+#ifdef USE_PASSIVE_SCALAR
+ cellDataNames.push_back("S_1"); // 7
+ cellDataNames.push_back("S_2"); // 8
+#endif
+
+ //////////////////////////////////////////////////////////////////////////
+
+ std::vector< std::vector< double > > cellData(cellDataNames.size());
+
+ for( auto& i : cellData ) i.resize( dataBase->numberOfCells );
+
+ for( uint cellIdx = 0; cellIdx < dataBase->numberOfCells; cellIdx++ )
+ {
+ ConservedVariables cons;
+
+ cons.rho = dataBase->dataHost[ RHO__(cellIdx, dataBase->numberOfCells) ];
+ cons.rhoU = dataBase->dataHost[ RHO_U(cellIdx, dataBase->numberOfCells) ];
+ cons.rhoV = dataBase->dataHost[ RHO_V(cellIdx, dataBase->numberOfCells) ];
+ cons.rhoW = dataBase->dataHost[ RHO_W(cellIdx, dataBase->numberOfCells) ];
+ cons.rhoE = dataBase->dataHost[ RHO_E(cellIdx, dataBase->numberOfCells) ];
+#ifdef USE_PASSIVE_SCALAR
+ cons.rhoS_1 = dataBase->dataHost[ RHO_S_1(cellIdx, dataBase->numberOfCells) ];
+ cons.rhoS_2 = dataBase->dataHost[ RHO_S_2(cellIdx, dataBase->numberOfCells) ];
+#endif // USE_PASSIVE_SCALAR
+
+ PrimitiveVariables prim = toPrimitiveVariables(cons, parameters.K);
+
+ real p = 0.5 * prim.rho / prim.lambda;
+
+#ifdef USE_PASSIVE_SCALAR
+ real T = getT(prim);
+#else // USE_PASSIVE_SCALAR
+ real T = 1.0 / prim.lambda;
+#endif // USE_PASSIVE_SCALAR
+
+ cellData[0][cellIdx] = p;
+ cellData[1][cellIdx] = prim.rho;
+ cellData[2][cellIdx] = prim.U;
+ cellData[3][cellIdx] = prim.V;
+ cellData[4][cellIdx] = prim.W;
+ cellData[5][cellIdx] = T;
+ cellData[6][cellIdx] = dataBase->isGhostCell(cellIdx);
+#ifdef USE_PASSIVE_SCALAR
+ cellData[7][cellIdx] = prim.S_1;
+ cellData[8][cellIdx] = prim.S_2;
+#endif
+ }
+
+ //////////////////////////////////////////////////////////////////////////
+
+ WbWriterVtkXmlBinary::getInstance()->writeOctsWithCellData(filename, nodes, cells, cellDataNames, cellData);
+
+ //////////////////////////////////////////////////////////////////////////
+
+ *logging::out << logging::Logger::INFO_INTERMEDIATE << "done!\n";
+}
diff --git a/src/gpu/GksGpu/Output/VtkWriter.h b/src/gpu/GksGpu/Output/VtkWriter.h
new file mode 100644
index 0000000000000000000000000000000000000000..0596fc7bd164050236b8db54a31ab7689a84d01f
--- /dev/null
+++ b/src/gpu/GksGpu/Output/VtkWriter.h
@@ -0,0 +1,52 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids 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 General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file VtkWriter.h
+//! \ingroup Output
+//! \author Stephan Lenz
+//=======================================================================================
+#ifndef VTK_WRITER_H
+#define VTK_WRITER_H
+
+#include <memory>
+#include <string>
+
+#include "GksGpu_export.h"
+
+struct DataBase;
+struct Parameters;
+
+class GKSGPU_EXPORT VtkWriter
+{
+public:
+ static void write( std::shared_ptr<DataBase> dataBase,
+ Parameters parameters,
+ std::string filename );
+};
+
+#endif
\ No newline at end of file
diff --git a/src/gpu/GksGpu/Parameters/Parameters.h b/src/gpu/GksGpu/Parameters/Parameters.h
index 42950d3ebcb6697d4d68aa42ed31c5d8494a5059..ab7bdb4c61909f3f08b2857e62b458d14d589280 100644
--- a/src/gpu/GksGpu/Parameters/Parameters.h
+++ b/src/gpu/GksGpu/Parameters/Parameters.h
@@ -4,7 +4,7 @@
#include "Core/DataTypes.h"
#include "Core/VectorTypes.h"
-#include <VirtualFluidsDefinitions.h>
+
#include "GksGpu_export.h"
namespace GksGpu {
diff --git a/src/gpu/GksGpu/Restart/Restart.h b/src/gpu/GksGpu/Restart/Restart.h
index f607cf355b2f6dc711ac96c79caa31904d4e8c60..235a4334373be3f0b6c788ba5f89d226e5c77f17 100644
--- a/src/gpu/GksGpu/Restart/Restart.h
+++ b/src/gpu/GksGpu/Restart/Restart.h
@@ -4,7 +4,7 @@
#include <string>
#include <memory>
-#include <VirtualFluidsDefinitions.h>
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksGpu/TimeStepping/NestedTimeStep.h b/src/gpu/GksGpu/TimeStepping/NestedTimeStep.h
index a5704b4cc3d0dae3688959d8bf5dd38f445305c1..315db1778b79237cafa9f52ba53b26065d5f97a5 100644
--- a/src/gpu/GksGpu/TimeStepping/NestedTimeStep.h
+++ b/src/gpu/GksGpu/TimeStepping/NestedTimeStep.h
@@ -1,7 +1,7 @@
#ifndef NestedTimeStep_H
#define NestedTimeStep_H
-#include "VirtualFluidsDefinitions.h"
+
#include "GksGpu_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GksMeshAdapter/GksMeshAdapter.h b/src/gpu/GksMeshAdapter/GksMeshAdapter.h
index b314f1dbe0dcfcd7d42b6cb8aa4dd5f72f837dca..ede88301f7133fdb6685d94906960eec955ad449 100644
--- a/src/gpu/GksMeshAdapter/GksMeshAdapter.h
+++ b/src/gpu/GksMeshAdapter/GksMeshAdapter.h
@@ -11,7 +11,7 @@
#include "MeshCell.h"
#include "MeshFace.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksMeshAdapter_export.h"
diff --git a/src/gpu/GksVtkAdapter/VTKAdapter.h b/src/gpu/GksVtkAdapter/VTKAdapter.h
index ccefbd0b88eb7436e3ddbbc8a7998cc33d773ed4..5f3209a04e0d7942f890f2186779e75c6f14683f 100644
--- a/src/gpu/GksVtkAdapter/VTKAdapter.h
+++ b/src/gpu/GksVtkAdapter/VTKAdapter.h
@@ -22,7 +22,7 @@
#include "PointerDefinitions.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "DataBase/DataBase.h"
#include "Parameters/Parameters.h"
diff --git a/src/gpu/GksVtkAdapter/VTKInterface.h b/src/gpu/GksVtkAdapter/VTKInterface.h
index 17f878b8cd54c67dfbed71ddfb4b26028f4226cc..0120a7ad19d059a830530857b3ae118b4a50d224 100644
--- a/src/gpu/GksVtkAdapter/VTKInterface.h
+++ b/src/gpu/GksVtkAdapter/VTKInterface.h
@@ -3,7 +3,7 @@
#include "GksGpu/Parameters/Parameters.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "GksVtkAdapter_export.h"
namespace GksGpu{
diff --git a/src/gpu/GridGenerator/StreetPointFinder/JunctionReader.h b/src/gpu/GridGenerator/StreetPointFinder/JunctionReader.h
index 7d7d2bbb1359c728c99d00304497c5ef5fc60596..7f17697625f7ef0b5e136ef073ea91840d0b10ec 100644
--- a/src/gpu/GridGenerator/StreetPointFinder/JunctionReader.h
+++ b/src/gpu/GridGenerator/StreetPointFinder/JunctionReader.h
@@ -10,7 +10,7 @@
#include "StreetPointFinder.h"
-#include <VirtualFluidsDefinitions.h>
+
struct GRIDGENERATOR_EXPORT JunctionReaderData
{
diff --git a/src/gpu/GridGenerator/StreetPointFinder/SinkReader.h b/src/gpu/GridGenerator/StreetPointFinder/SinkReader.h
index d6f71f4b5f05d2c5e1d387d3462324aa90cdb03f..115aea55257f8a2086098699e3d8fc24a8a1d1b5 100644
--- a/src/gpu/GridGenerator/StreetPointFinder/SinkReader.h
+++ b/src/gpu/GridGenerator/StreetPointFinder/SinkReader.h
@@ -10,7 +10,7 @@
#include "StreetPointFinder.h"
-#include <VirtualFluidsDefinitions.h>
+
struct GRIDGENERATOR_EXPORT SinkReaderData{
uint sinkIndex;
diff --git a/src/gpu/GridGenerator/StreetPointFinder/SourceReader.h b/src/gpu/GridGenerator/StreetPointFinder/SourceReader.h
index 4ada88fb80ae8bc967aa99c86231f60525115bbb..db95259ea91a60fc2c9ef1721272a4915374e646 100644
--- a/src/gpu/GridGenerator/StreetPointFinder/SourceReader.h
+++ b/src/gpu/GridGenerator/StreetPointFinder/SourceReader.h
@@ -8,7 +8,7 @@
#include "StreetPointFinder.h"
-#include <VirtualFluidsDefinitions.h>
+
struct GRIDGENERATOR_EXPORT SourceReaderData {
unsigned int sourceIndex;
diff --git a/src/gpu/GridGenerator/StreetPointFinder/StreetPointFinder.h b/src/gpu/GridGenerator/StreetPointFinder/StreetPointFinder.h
index 5c552d51572008615294f7fde583863b7b1a4523..73d1e0de07c34188d879323a3a762a82f2ed4543 100644
--- a/src/gpu/GridGenerator/StreetPointFinder/StreetPointFinder.h
+++ b/src/gpu/GridGenerator/StreetPointFinder/StreetPointFinder.h
@@ -9,7 +9,7 @@
#include "PointerDefinitions.h"
#include "Core/DataTypes.h"
-#include <VirtualFluidsDefinitions.h>
+
class Grid;
diff --git a/src/gpu/GridGenerator/geometries/Object.h b/src/gpu/GridGenerator/geometries/Object.h
index 3635a24d469f85debe099a125a1350482164af83..e26ff324f27cf68a3d86afb35720af7c32671688 100644
--- a/src/gpu/GridGenerator/geometries/Object.h
+++ b/src/gpu/GridGenerator/geometries/Object.h
@@ -7,7 +7,7 @@
#ifndef OBJECT_H
#define OBJECT_H
#include "GridGenerator_export.h"
-#include <VirtualFluidsDefinitions.h>
+
#include "grid/Cell.h"
#include "global.h"
diff --git a/src/gpu/GridGenerator/global.h b/src/gpu/GridGenerator/global.h
index 517d905ff6dc64cdb9b9d2d2824da873788b00ac..3378265eaa60cd713f4d932f59eaa04f680b4543 100644
--- a/src/gpu/GridGenerator/global.h
+++ b/src/gpu/GridGenerator/global.h
@@ -7,7 +7,7 @@
#define DIMENSION 3
#define MASTERRANK 0
-#include "VirtualFluidsDefinitions.h"
+
#include "GridGenerator_export.h"
#include "PointerDefinitions.h"
diff --git a/src/gpu/GridGenerator/utilities/math/Math.cu b/src/gpu/GridGenerator/utilities/math/Math.cu
index 308bae6b101cac96b23c9299a0e2611c6b0748c9..ef05bf52b5535682b65261d377f7efdb02af59e3 100644
--- a/src/gpu/GridGenerator/utilities/math/Math.cu
+++ b/src/gpu/GridGenerator/utilities/math/Math.cu
@@ -2,7 +2,7 @@
#include <cmath>
-#include "VirtualFluidsDefinitions.h"
+
HOSTDEVICE bool vf::Math::equal(const real& val1, const real& val2, real maxRelDiff)
{
diff --git a/src/gpu/Traffic/GPU/TrafficTimestep.h b/src/gpu/Traffic/GPU/TrafficTimestep.h
index d6355afb9ff95b02f74aaf5880a5ebd8ab004677..113cc3d11260d7e89231e50951e75e43e17faf33 100644
--- a/src/gpu/Traffic/GPU/TrafficTimestep.h
+++ b/src/gpu/Traffic/GPU/TrafficTimestep.h
@@ -7,7 +7,7 @@
#include <thrust/device_vector.h>
#include <curand_kernel.h>
-#include <VirtualFluidsDefinitions.h>
+
#include "PointerDefinitions.h"
#include "Core/DataTypes.h"
#include "Traffic_export.h"
diff --git a/src/gpu/Traffic/Junction/Junction.h b/src/gpu/Traffic/Junction/Junction.h
index 6ec6e2f5f84fb5e415543d4b030f29b326eda7ef..68da2bb1063c30e2259925dca6b6aeaec994107d 100644
--- a/src/gpu/Traffic/Junction/Junction.h
+++ b/src/gpu/Traffic/Junction/Junction.h
@@ -1,7 +1,7 @@
#pragma once
#include <vector>
-#include <VirtualFluidsDefinitions.h>
+
#include "Core/DataTypes.h"
#include "JunctionData.h"
diff --git a/src/gpu/Traffic/Junction/JunctionData.h b/src/gpu/Traffic/Junction/JunctionData.h
index fde3d50e24ab7154810ccc9d4e18588cbcf8f350..3b72b1ef5db4d60515a2634586e6096aa115731a 100644
--- a/src/gpu/Traffic/Junction/JunctionData.h
+++ b/src/gpu/Traffic/Junction/JunctionData.h
@@ -1,5 +1,5 @@
#pragma once
-#include <VirtualFluidsDefinitions.h>
+
#include <vector>
#include <memory>
diff --git a/src/gpu/Traffic/Junction/JunctionRandom.h b/src/gpu/Traffic/Junction/JunctionRandom.h
index e006aad4897b54bc52f1ec2d669e1fc90777c26f..21ce459685ec6cb09fe5b9d12f2a7e923cb63748 100644
--- a/src/gpu/Traffic/Junction/JunctionRandom.h
+++ b/src/gpu/Traffic/Junction/JunctionRandom.h
@@ -2,7 +2,7 @@
#include <random>
#include <vector>
-#include <VirtualFluidsDefinitions.h>
+
#include "Core/DataTypes.h"
#include "Junction.h"
diff --git a/src/gpu/Traffic/Output/CarDisplay.h b/src/gpu/Traffic/Output/CarDisplay.h
index 78386d42b2bcea71100b6ec14fe754f49eaf02cc..336160139220424346a0f4faf2fd269b01840ac1 100644
--- a/src/gpu/Traffic/Output/CarDisplay.h
+++ b/src/gpu/Traffic/Output/CarDisplay.h
@@ -1,5 +1,5 @@
#pragma once
-#include <VirtualFluidsDefinitions.h>
+
#include <vector>
#include <memory>
diff --git a/src/gpu/Traffic/Output/ConcentrationOutwriter.h b/src/gpu/Traffic/Output/ConcentrationOutwriter.h
index 35fc8e27432d78873eb005db806b82c3bb696335..9589e5f4b6751899e20106cfa41cb4cd29b11205 100644
--- a/src/gpu/Traffic/Output/ConcentrationOutwriter.h
+++ b/src/gpu/Traffic/Output/ConcentrationOutwriter.h
@@ -2,7 +2,7 @@
#include <vector>
-#include <VirtualFluidsDefinitions.h>
+
#include "Core/DataTypes.h"
#include "Traffic_export.h"
diff --git a/src/gpu/Traffic/RoadNetwork/RoadNetworkData.h b/src/gpu/Traffic/RoadNetwork/RoadNetworkData.h
index 352cd5fc76918716b47a4e253144480e4deb5469..3839c53c8449b6c52bfaf7cf0e026559ee5aa9d7 100644
--- a/src/gpu/Traffic/RoadNetwork/RoadNetworkData.h
+++ b/src/gpu/Traffic/RoadNetwork/RoadNetworkData.h
@@ -2,7 +2,7 @@
#include <memory>
#include <vector>
-#include <VirtualFluidsDefinitions.h>
+
#include "Source/Source.h"
#include "Sink/Sink.h"
diff --git a/src/gpu/Traffic/Sink/SinkData.h b/src/gpu/Traffic/Sink/SinkData.h
index f035fa3151e7a394c51a6842cf2f35571698ede8..9603c816ae0733e7f73e4b70c165ba06f5a40e9f 100644
--- a/src/gpu/Traffic/Sink/SinkData.h
+++ b/src/gpu/Traffic/Sink/SinkData.h
@@ -1,6 +1,6 @@
#pragma once
-#include <VirtualFluidsDefinitions.h>
+
#include "Core/DataTypes.h"
#include "Traffic_export.h"
diff --git a/src/gpu/Traffic/Source/Source.h b/src/gpu/Traffic/Source/Source.h
index b4cad3a5c12d6c7f62fa17150316b542c52ccf77..3c786b7ee7e1e1a2c0ec38c5a42da293b927f9a1 100644
--- a/src/gpu/Traffic/Source/Source.h
+++ b/src/gpu/Traffic/Source/Source.h
@@ -1,5 +1,5 @@
#pragma once
-#include <VirtualFluidsDefinitions.h>
+
#include "SourceData.h"
#include "Traffic_export.h"
diff --git a/src/gpu/Traffic/Source/SourceData.h b/src/gpu/Traffic/Source/SourceData.h
index e19dca7b1251bb2c11987f537842a8e1a4d6373b..e71ec4b5c91581f364a60074f60e1d574fe7d832 100644
--- a/src/gpu/Traffic/Source/SourceData.h
+++ b/src/gpu/Traffic/Source/SourceData.h
@@ -1,5 +1,5 @@
#pragma once
-#include <VirtualFluidsDefinitions.h>
+
#include "Core/DataTypes.h"
#include <memory>
diff --git a/src/gpu/Traffic/Source/SourceRandom.h b/src/gpu/Traffic/Source/SourceRandom.h
index bed2077495c4bcf6ff4cde25826209047f8f1de4..5acf83fd788223c011717130d82c1867b5501757 100644
--- a/src/gpu/Traffic/Source/SourceRandom.h
+++ b/src/gpu/Traffic/Source/SourceRandom.h
@@ -1,5 +1,5 @@
#pragma once
-#include <VirtualFluidsDefinitions.h>
+
#include <random>
diff --git a/src/gpu/Traffic/TrafficMovement.h b/src/gpu/Traffic/TrafficMovement.h
index bdc2c8690521d4fc673d0650a484de35f0aee0f9..8655e8af0fb1e8aba747cac837ce88e17e3fe0b8 100644
--- a/src/gpu/Traffic/TrafficMovement.h
+++ b/src/gpu/Traffic/TrafficMovement.h
@@ -4,7 +4,7 @@
#include <random>
#include <memory>
-#include <VirtualFluidsDefinitions.h>
+
#include "Core/DataTypes.h"
#include "RoadNetwork/RoadNetworkData.h"
diff --git a/src/gpu/Traffic/TrafficMovementFactory - Kopie.h b/src/gpu/Traffic/TrafficMovementFactory - Kopie.h
index d813f367d01e560981a831dae7dc8465089e9012..ba27cf68e34dff215984835a097829240c349a2d 100644
--- a/src/gpu/Traffic/TrafficMovementFactory - Kopie.h
+++ b/src/gpu/Traffic/TrafficMovementFactory - Kopie.h
@@ -1,6 +1,6 @@
# pragma once
-#include <VirtualFluidsDefinitions.h>
+
#include "Core/DataTypes.h"
#include <vector>
diff --git a/src/gpu/Traffic/TrafficMovementFactory.h b/src/gpu/Traffic/TrafficMovementFactory.h
index afa709ab0a515bd0c0eccd17a575d7774e6dfae0..c934d276073afe9c6bec69786a48148470e69b61 100644
--- a/src/gpu/Traffic/TrafficMovementFactory.h
+++ b/src/gpu/Traffic/TrafficMovementFactory.h
@@ -1,6 +1,6 @@
# pragma once
-#include <VirtualFluidsDefinitions.h>
+
#include "Core/DataTypes.h"
#include <vector>
diff --git a/src/gpu/Traffic/TrafficMovementFactoryTestRoads.h b/src/gpu/Traffic/TrafficMovementFactoryTestRoads.h
index afb3854f8e6ff67ba1fe47fe37a9d1de5c548ac4..faafcf89f7911a0589369bca0dfb60ae431d6e03 100644
--- a/src/gpu/Traffic/TrafficMovementFactoryTestRoads.h
+++ b/src/gpu/Traffic/TrafficMovementFactoryTestRoads.h
@@ -1,6 +1,6 @@
# pragma once
-#include <VirtualFluidsDefinitions.h>
+
#include <vector>
#include <memory>
diff --git a/src/gpu/Traffic/Utilities/ConsoleColor.cpp b/src/gpu/Traffic/Utilities/ConsoleColor.cpp
index d8db3d4407ef422199974b08e5cf5447fde556d2..f015fe18fefa656c1495d285b5b928ebcfe26965 100644
--- a/src/gpu/Traffic/Utilities/ConsoleColor.cpp
+++ b/src/gpu/Traffic/Utilities/ConsoleColor.cpp
@@ -2,7 +2,7 @@
-#include <VirtualFluidsDefinitions.h>
+
#include "Core/DataTypes.h"
diff --git a/src/gpu/Traffic/Utilities/Logger.h b/src/gpu/Traffic/Utilities/Logger.h
index 3e97cd35af7fed176a77f239bd8a76ef1008e436..a10a567ac5f0e986fafab735e36019698feaf395 100644
--- a/src/gpu/Traffic/Utilities/Logger.h
+++ b/src/gpu/Traffic/Utilities/Logger.h
@@ -1,6 +1,6 @@
#pragma once
-#include <VirtualFluidsDefinitions.h>
+
#include "Core/DataTypes.h"
#include <string>
diff --git a/src/gpu/Traffic/Utilities/RandomHelper.h b/src/gpu/Traffic/Utilities/RandomHelper.h
index 4e0ae40aea18d797c93e2cfb097f2cd588c2416b..869e93ed3e3e2b013a1c79090dc02ccaf6e23897 100644
--- a/src/gpu/Traffic/Utilities/RandomHelper.h
+++ b/src/gpu/Traffic/Utilities/RandomHelper.h
@@ -1,7 +1,7 @@
#pragma once
#include <random>
-#include <VirtualFluidsDefinitions.h>
+
#include "Traffic_export.h"
class TRAFFIC_EXPORT RandomHelper
diff --git a/src/gpu/Traffic/Utilities/VectorHelper.h b/src/gpu/Traffic/Utilities/VectorHelper.h
index 0a76fefd9a9b3525ff7093b04f7fe31ece1eacd0..eccc2b385ea72b3804a5d5aacc03e239e571808c 100644
--- a/src/gpu/Traffic/Utilities/VectorHelper.h
+++ b/src/gpu/Traffic/Utilities/VectorHelper.h
@@ -2,7 +2,7 @@
#include <vector>
-#include <VirtualFluidsDefinitions.h>
+
#include "Core/DataTypes.h"
#include "Traffic_export.h"
diff --git a/src/gpu/Traffic/Utilities/invalidInput_error.h b/src/gpu/Traffic/Utilities/invalidInput_error.h
index e8e7c7c5ae53e22f6ac4be1f4ca73567b7882336..d3ce3654588328d68f66f398f002f74125d1ea25 100644
--- a/src/gpu/Traffic/Utilities/invalidInput_error.h
+++ b/src/gpu/Traffic/Utilities/invalidInput_error.h
@@ -1,5 +1,5 @@
#pragma once
-#include <VirtualFluidsDefinitions.h>
+
// using standard exceptions
#include <stdexcept>
diff --git a/src/gpu/VirtualFluids_GPU/Communication/Communicator.h b/src/gpu/VirtualFluids_GPU/Communication/Communicator.h
index 341d3980b7699f548f2aa708487855e101c93aef..b584bc88081727ad1e298796ed45f1b05039c4f9 100644
--- a/src/gpu/VirtualFluids_GPU/Communication/Communicator.h
+++ b/src/gpu/VirtualFluids_GPU/Communication/Communicator.h
@@ -3,7 +3,7 @@
#include <vector>
-#include <VirtualFluidsDefinitions.h>
+
#include <mpi.h>
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
index 1f33ad0374cc61a1f9d6317724dfcd1a95d1dcc3..70a2a8ec629809689096ce0b33a197924cf000a2 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
@@ -5,7 +5,7 @@
#include <vector>
#include <memory>
-#include <VirtualFluidsDefinitions.h>
+
#include "PointerDefinitions.h"
#include "VirtualFluids_GPU_export.h"
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
index 9d1ce935226bb135e3c579a8afb141fb608a2c80..22f5db4f16e3b23a8d35be9587bff4ba5d4bf03b 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
@@ -1,7 +1,7 @@
#ifndef GridReaderFiles_H
#define GridReaderFiles_H
-#include <VirtualFluidsDefinitions.h>
+
#include "../GridProvider.h"
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
index d2ebcf217268de1254088628a5aa2069f67a9e21..66b07deda5d8e21874fd6e1993eed66d91a2884c 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
@@ -2,7 +2,7 @@
#define GridReaderGenerator_H
#include "../GridProvider.h"
-#include <VirtualFluidsDefinitions.h>
+
#include <vector>
#include <string>
#include <memory>
diff --git a/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.h b/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.h
index 05b5d79068cdde66f6615b470e0863a9350817e1..27915f1acdfc9bfecc291442727647dc4abda206 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.h
+++ b/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.h
@@ -4,7 +4,7 @@
#include <vector>
#include <string>
-#include "VirtualFluidsDefinitions.h"
+
#include "PointerDefinitions.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.h b/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.h
index 1269167f5873497808162afa2d7761ecb5a1ef93..ca5a97aaef3432dfef78a1ce8822e85dca115207 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.h
+++ b/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.h
@@ -4,7 +4,7 @@
#include <vector>
#include <string>
-#include "VirtualFluidsDefinitions.h"
+
#include "PointerDefinitions.h"
#include "Core/DataTypes.h"
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
index 8a92184e504e008fccb488a192f59b67d4e1604d..afecb7afd5b0ec241de1b408612fe734db3a560c 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
@@ -5,7 +5,7 @@
#include <vector>
#include <PointerDefinitions.h>
-#include <VirtualFluidsDefinitions.h>
+
#include "Output/LogWriter.hpp"
#include "GPU/KineticEnergyAnalyzer.h"
diff --git a/src/gpu/VirtualFluids_GPU/Output/FileWriter.h b/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
index 2aedd4b79030b528e2cad0fa6a59d5cf864b6404..863d3a116ee2b98d954da256f0df70200d444617 100644
--- a/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
+++ b/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
@@ -5,7 +5,7 @@
#include <vector>
#include <string>
-#include <VirtualFluidsDefinitions.h>
+
#include "DataWriter.h"
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
index 1a6aaa776d50de6f43ad3a85da77da37edb36568..c053add832331ad9f89d1657a33b8486a38739e6 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
@@ -23,7 +23,7 @@
#include <curand.h>
#include <curand_kernel.h>
#include "PointerDefinitions.h"
-#include "VirtualFluidsDefinitions.h"
+
#include "VirtualFluids_GPU_export.h"
#include "Kernel/Utilities/KernelType.h"