From 8dc306bf5134f9265e63aeaf3938797bf2c657ec Mon Sep 17 00:00:00 2001
From: Aileen Brendel <aileen.brendel@tu-bs.de>
Date: Fri, 6 Dec 2019 10:39:44 +0100
Subject: [PATCH] adds string includes
---
CMakeLists.txt | 6 ++++--
MachineFiles/ELENDUR | 12 ++++++++++++
src/Core/DataTypes.h | 2 ++
.../StreetPointFinder/StreetPointFinder.h | 1 +
.../Utilities/Mapper/ADKernelMapper/ADKernelMapper.h | 1 +
.../Utilities/Mapper/KernelMapper/KernelMapper.h | 1 +
src/VirtualFluids_GPU/LBM/Simulation.cpp | 3 +--
src/VirtualFluids_GPU/Output/DataWriter.h | 1 +
.../Utilities/EnumMapper/EnumMapperImp.h | 1 +
9 files changed, 24 insertions(+), 4 deletions(-)
create mode 100644 MachineFiles/ELENDUR
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d35d7436..9b4fde456 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,8 +105,10 @@ ELSE(MSVC)
SET( CMAKE_CXX_FLAGS "-include ${CMAKE_BINARY_DIR}/VirtualFluidsDefinitions.h ${CMAKE_CXX_FLAGS}" )
ENDIF(MSVC)
-# only use this with device of CC larger than 6.0
-set(CMAKE_CUDA_FLAGS " -arch=sm_60" CACHE STRING "" FORCE)
+IF( VF.BUILD_VF_GKS )
+ # only use this with device of CC larger than 6.0
+ set(CMAKE_CUDA_FLAGS " -arch=sm_60" CACHE STRING "" FORCE)
+ENDIF()
set(CMAKE_CUDA_FLAGS_DEBUG " -G" CACHE STRING "" FORCE)
diff --git a/MachineFiles/ELENDUR b/MachineFiles/ELENDUR
new file mode 100644
index 000000000..3b7fee443
--- /dev/null
+++ b/MachineFiles/ELENDUR
@@ -0,0 +1,12 @@
+#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 "D:\\boost_1_65_1" CACHE PATH "BOOST_ROOT")
+SET(BOOST_LIBRARYDIR "D:\\boost_1_65_1\\stageMSVC64\\lib" CACHE PATH "BOOST_LIBRARYDIR")
+
+SET(VTK_DIR "D:/VTK-8.2.0/bin" CACHE PATH "VTK directory override" FORCE)
diff --git a/src/Core/DataTypes.h b/src/Core/DataTypes.h
index 0b7cd94ba..b65f3344c 100644
--- a/src/Core/DataTypes.h
+++ b/src/Core/DataTypes.h
@@ -1,6 +1,8 @@
#ifndef DATATYPES_H
#define DATATYPES_H
+#include <string>
+
#include "VirtualFluidsDefinitions.h"
#ifdef VF_DOUBLE_ACCURACY
diff --git a/src/GridGenerator/StreetPointFinder/StreetPointFinder.h b/src/GridGenerator/StreetPointFinder/StreetPointFinder.h
index a4b0b22e6..b90840b8e 100644
--- a/src/GridGenerator/StreetPointFinder/StreetPointFinder.h
+++ b/src/GridGenerator/StreetPointFinder/StreetPointFinder.h
@@ -2,6 +2,7 @@
#define StreetPointFinder_H
#include <vector>
+#include <string>
#include "Core/PointerDefinitions.h"
#include "Core/DataTypes.h"
diff --git a/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/ADKernelMapper/ADKernelMapper.h b/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/ADKernelMapper/ADKernelMapper.h
index f33453770..b6a75a573 100644
--- a/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/ADKernelMapper/ADKernelMapper.h
+++ b/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/ADKernelMapper/ADKernelMapper.h
@@ -5,6 +5,7 @@
#include "Kernel//Utilities/KernelType.h"
#include <memory>
+#include <string>
class VF_PUBLIC ADKernelMapper
{
diff --git a/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h b/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h
index dc413f63b..b9b1ec5fd 100644
--- a/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h
+++ b/src/VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h
@@ -5,6 +5,7 @@
#include "Kernel//Utilities/KernelType.h"
#include <memory>
+#include <string>
class VF_PUBLIC KernelMapper
{
diff --git a/src/VirtualFluids_GPU/LBM/Simulation.cpp b/src/VirtualFluids_GPU/LBM/Simulation.cpp
index c5528a14b..a342bacfc 100644
--- a/src/VirtualFluids_GPU/LBM/Simulation.cpp
+++ b/src/VirtualFluids_GPU/LBM/Simulation.cpp
@@ -168,7 +168,6 @@ void Simulation::init(SPtr<Parameter> para, SPtr<GridProvider> gridProvider, std
std::vector<PreProcessorType> preProTypes = kernels.at(0)->getPreProcessorTypes();
preProcessor = preProcessorFactory->makePreProcessor(preProTypes, para);
-
//////////////////////////////////////////////////////////////////////////
//Particles preprocessing
//////////////////////////////////////////////////////////////////////////
@@ -212,9 +211,9 @@ void Simulation::init(SPtr<Parameter> para, SPtr<GridProvider> gridProvider, std
//////////////////////////////////////////////////////////////////////////
//Median
//////////////////////////////////////////////////////////////////////////
- output << "alloc Calculation for Mean Valus " << "\n";
if (para->getCalcMedian())
{
+ output << "alloc Calculation for Mean Valus " << "\n";
if (para->getDiffOn()) allocMedianAD(para.get(), cudaManager.get());
else allocMedian(para.get(), cudaManager.get());
}
diff --git a/src/VirtualFluids_GPU/Output/DataWriter.h b/src/VirtualFluids_GPU/Output/DataWriter.h
index b1972f00c..a7d3a26fb 100644
--- a/src/VirtualFluids_GPU/Output/DataWriter.h
+++ b/src/VirtualFluids_GPU/Output/DataWriter.h
@@ -4,6 +4,7 @@
#include <memory>
#include <vector>
+#include <string>
class Parameter;
diff --git a/src/VirtualFluids_GPU/Utilities/EnumMapper/EnumMapperImp.h b/src/VirtualFluids_GPU/Utilities/EnumMapper/EnumMapperImp.h
index 0fb7bbf1f..72fb1462f 100644
--- a/src/VirtualFluids_GPU/Utilities/EnumMapper/EnumMapperImp.h
+++ b/src/VirtualFluids_GPU/Utilities/EnumMapper/EnumMapperImp.h
@@ -2,6 +2,7 @@
#define ENUM_MAPPER_IMP_H
#include <map>
+#include <string>
template <typename T>
--
GitLab