adds options for building VF_GPU and VF_GKS

CMakeLists.txt

@@ -44,7 +44,8 @@ include(${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/general/FileUtilities.cmake)
 #############################################################
 ###                   PROJECT SETTINGS                    ###
 #############################################################
-project(HULC)
+
+project(VirtualFluidsGpuCodes)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -76,7 +77,8 @@ ENDIF(MSVC)
 ###                         OPTIONS                       ###
 #############################################################
 option(BUILD_SHARED_LIBS        "Build shared libraries"  ON )
-option(HULC.BUILD_GPU_CODE      "Build gpu VirtualFluids" ON )
+option(HULC.BUILD_VF_GPU        "Build VirtualFluids GPU" ON )
+option(HULC.BUILD_VF_GKS        "Build VirtualFluids GKS" ON )
 option(HULC.BUILD_JSONCPP       "Builds json cpp "        ON )
 option(HULC.BUILD_NUMERIC_TESTS "Build numeric tests"     OFF)
 
@@ -84,10 +86,8 @@ option(VF_DOUBLE_ACCURACY       "Build shared libraries"  OFF)
 
 #############################################################
 
-if(HULC.BUILD_GPU_CODE)
-  #SET(CMAKE_CUDA_COMPILER $ENV{CUDA_PATH_V9_0}/bin/nvcc.exe)
-  enable_language(CUDA)
-endif()
+enable_language(CUDA)
+
 sharedLibs()
 
 #############################################################
@@ -100,16 +100,50 @@ ELSE(MSVC)
   SET( CMAKE_CXX_FLAGS "-include ${CMAKE_BINARY_DIR}/VirtualFluidsDefinitions.h ${CMAKE_CXX_FLAGS}" )
 ENDIF(MSVC)
 
+
+##########################################################################################################################
+###                  Subdirectories                                                                                    ###
+##########################################################################################################################
+
+#############################################################
+###                  Core                                 ###
+#############################################################
+
+add_subdirectory(targets/libs/VirtualFluidsBasics)
+add_subdirectory(targets/libs/Core)
+
+add_subdirectory(targets/libs/GridGenerator)
+
 #############################################################
 ###                  Virtual Fluids GPU                   ###
 #############################################################
-IF (HULC.BUILD_GPU_CODE)
- add_subdirectory(targets/libs/VirtualFluids_GPU)
- add_subdirectory(targets/libs/GridGenerator)
+
+IF (HULC.BUILD_VF_GPU)
+    add_subdirectory(3rdParty/metis/metis-5.1.0)
+	
+    add_subdirectory(targets/libs/VirtualFluids_GPU)
+
+    add_subdirectory(targets/apps/LBM/lbmTest)
+    add_subdirectory(targets/apps/LBM/metisTest)
 ELSE()
   MESSAGE( STATUS "exclude Virtual Fluids GPU." )
 ENDIF()
 
+#############################################################
+###                  Virtual Fluids GKS                   ###
+#############################################################
+
+IF (HULC.BUILD_VF_GKS)
+    add_subdirectory(targets/libs/GksMeshAdapter)
+    add_subdirectory(targets/libs/GksVtkAdapter)
+	
+    add_subdirectory(targets/libs/GksGpu)
+
+	add_subdirectory(targets/apps/GKS/gksTest)
+ELSE()
+  MESSAGE( STATUS "exclude Virtual Fluids GKS." )
+ENDIF()
+
 #############################################################
 ###                     JSONCPP                           ###
 #############################################################
@@ -121,25 +155,10 @@ ELSE()
 ENDIF()
 
 #############################################################
-###                   SUBDIRECTORIES                      ###
+###                   Numeric Tests                       ###
 #############################################################
 
-add_subdirectory(3rdParty/metis/metis-5.1.0)
-add_subdirectory(targets/libs/VirtualFluidsBasics)
-add_subdirectory(targets/libs/Core)
-
-add_subdirectory(targets/libs/GksMeshAdapter)
-add_subdirectory(targets/libs/GksVtkAdapter)
-add_subdirectory(targets/libs/GksGpu)
-
 if(HULC.BUILD_NUMERIC_TESTS)
  	add_subdirectory(3rdParty/fftw/fftw-3.3.7)
 	add_subdirectory(targets/tests/TestingHULC)
 endif()
-
-
-
-add_subdirectory(targets/apps/LBM/lbmTest)
-add_subdirectory(targets/apps/LBM/metisTest)
-
-add_subdirectory(targets/apps/GKS/gksTest)

CMakeMacros/Environment/MachineFiles/.gitignore

-*
-!*/
-!.gitignore
-!computerName
\ No newline at end of file
+#*
+#!*/
+#!.gitignore
+#!computerName
\ No newline at end of file

CMakeMacros/Environment/MachineFiles/LEGOLAS

+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(VTK_DIR "C:/lib/VTK-8.1.0./bin" CACHE PATH "VTK directory override" FORCE)

CMakeMacros/Environment/MachineFiles/TESLA03

+#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:\\Program Files\\boost\\boost_1_63_0"  CACHE PATH "BOOST_ROOT")
+SET(BOOST_LIBRARYDIR  "C:\\Program Files\\boost\\boost_1_63_0\\stage\\x64\\lib" CACHE PATH "BOOST_LIBRARYDIR")

CMakeMacros/Environment/MachineFiles/login01

+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")
+
+SET(VTK_DIR "/cluster/lib/vtk/8.1.0/lib/cmake/vtk-8.1" CACHE PATH "VTK directory override" FORCE)
+
+SET(CUDA_CUT_INCLUDE_DIR "/cluster/cuda/9.0/include" CACHE PATH "CUDA_CUT_INCLUDE_DIR")
+
+SET(CUDA_SAMPLE_INCLUDE_DIR "/cluster/cuda/9.0/samples/common/inc" CACHE PATH "CUDA_CUT_INCLUDE_DIR")
\ No newline at end of file

CMakeMacros/Environment/MachineFiles/login02

+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")
+
+SET(VTK_DIR "/cluster/lib/vtk/8.1.0/lib/cmake/vtk-8.1" CACHE PATH "VTK directory override" FORCE)
+
+SET(CUDA_CUT_INCLUDE_DIR "/cluster/cuda/9.0/include" CACHE PATH "CUDA_CUT_INCLUDE_DIR")
+
+SET(CUDA_SAMPLE_INCLUDE_DIR "/cluster/cuda/9.0/samples/common/inc" CACHE PATH "CUDA_CUT_INCLUDE_DIR")
\ No newline at end of file