From 1f82ae55c45d3d02e3c6a409c38f7c96bf13aa0e Mon Sep 17 00:00:00 2001
From: "Lenz@Phoenix" <lenz@irmb.tu-bs.de>
Date: Tue, 10 Dec 2019 09:59:18 +0100
Subject: [PATCH] smaller changes for compatibility with linux
---
src/VirtualFluids_GPU/Calculation/ForceCalculations.cpp | 2 +-
.../Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp | 6 +++---
src/VirtualFluids_GPU/LBM/Simulation.h | 2 +-
.../PreProcessorFactory/PreProcessorFactoryImp.cpp | 2 +-
.../Utilities/EnumMapper/EnumMapperImp.h | 9 +++++----
targets/libs/VirtualFluids_GPU/CMakeLists.txt | 7 ++++---
6 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/VirtualFluids_GPU/Calculation/ForceCalculations.cpp b/src/VirtualFluids_GPU/Calculation/ForceCalculations.cpp
index d9ce12db8..6cd73abf1 100644
--- a/src/VirtualFluids_GPU/Calculation/ForceCalculations.cpp
+++ b/src/VirtualFluids_GPU/Calculation/ForceCalculations.cpp
@@ -7,7 +7,7 @@
#include <stdio.h>
#include <fstream>
#include <sstream>
-#include "utilities/StringUtil.hpp"
+#include "Utilities/StringUtil.hpp"
#include "GPU/CudaMemoryManager.h"
using namespace std;
diff --git a/src/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp b/src/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
index 1ce6ad1c0..b6cd8b1b6 100644
--- a/src/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
+++ b/src/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
@@ -208,7 +208,7 @@ std::shared_ptr<Kernel> KernelFactoryImp::makeKernel(std::shared_ptr<Parameter>
return newKernel;
}
else
- throw std::exception("KernelFactory does not know the KernelType.");
+ throw std::runtime_error("KernelFactory does not know the KernelType.");
}
@@ -245,10 +245,10 @@ std::shared_ptr<ADKernel> KernelFactoryImp::makeAdvDifKernel(std::shared_ptr<Par
return newKernel;
}
else
- throw std::exception("KernelFactory does not know the KernelType.");
+ throw std::runtime_error("KernelFactory does not know the KernelType.");
}
KernelFactoryImp::KernelFactoryImp()
{
-}
\ No newline at end of file
+}
diff --git a/src/VirtualFluids_GPU/LBM/Simulation.h b/src/VirtualFluids_GPU/LBM/Simulation.h
index 8de2cfae4..925c465b3 100644
--- a/src/VirtualFluids_GPU/LBM/Simulation.h
+++ b/src/VirtualFluids_GPU/LBM/Simulation.h
@@ -3,7 +3,7 @@
#include <memory>
#include <vector>
-#include <core/PointerDefinitions.h>
+#include <Core/PointerDefinitions.h>
#include <VirtualFluidsDefinitions.h>
diff --git a/src/VirtualFluids_GPU/PreProcessor/PreProcessorFactory/PreProcessorFactoryImp.cpp b/src/VirtualFluids_GPU/PreProcessor/PreProcessorFactory/PreProcessorFactoryImp.cpp
index a6016a076..ced53f8e2 100644
--- a/src/VirtualFluids_GPU/PreProcessor/PreProcessorFactory/PreProcessorFactoryImp.cpp
+++ b/src/VirtualFluids_GPU/PreProcessor/PreProcessorFactory/PreProcessorFactoryImp.cpp
@@ -61,5 +61,5 @@ std::shared_ptr<PreProcessorStrategy> PreProcessorFactoryImp::makePreProcessorSt
default:
break;
}
- throw std::exception("PreProcessorFactory does not know the PreProcessorType.");
+ throw std::runtime_error("PreProcessorFactory does not know the PreProcessorType.");
}
diff --git a/src/VirtualFluids_GPU/Utilities/EnumMapper/EnumMapperImp.h b/src/VirtualFluids_GPU/Utilities/EnumMapper/EnumMapperImp.h
index dee184df3..dc60c0694 100644
--- a/src/VirtualFluids_GPU/Utilities/EnumMapper/EnumMapperImp.h
+++ b/src/VirtualFluids_GPU/Utilities/EnumMapper/EnumMapperImp.h
@@ -3,6 +3,7 @@
#include <map>
#include <string>
+#include <exception>
template <typename T>
class EnumMapperImp
@@ -22,10 +23,10 @@ private:
template<typename T>
inline std::string EnumMapperImp<T>::getString(T enumeration)
{
- std::map< T, std::string>::iterator it;
+ typename std::map< T, std::string>::iterator it;
it = enumMap.find(enumeration);
if (it == enumMap.end()) {
- throw std::exception("Enumeration is not registered.");
+ throw std::runtime_error("Enumeration is not registered.");
}
else
return it->second;
@@ -34,10 +35,10 @@ inline std::string EnumMapperImp<T>::getString(T enumeration)
template<typename T>
inline T EnumMapperImp<T>::getEnum(std::string name)
{
- std::map< std::string, T>::iterator it;
+ typename std::map< std::string, T>::iterator it;
it = stringMap.find(name);
if (it == stringMap.end()) {
- throw std::exception("String is not registered.");
+ throw std::runtime_error("String is not registered.");
}
else
return it->second;
diff --git a/targets/libs/VirtualFluids_GPU/CMakeLists.txt b/targets/libs/VirtualFluids_GPU/CMakeLists.txt
index c350a2be2..a21a91764 100644
--- a/targets/libs/VirtualFluids_GPU/CMakeLists.txt
+++ b/targets/libs/VirtualFluids_GPU/CMakeLists.txt
@@ -5,7 +5,8 @@ set(linkDirectories "")
IF(MSVC)
set(libsToLink ws2_32 GridGenerator VirtualFluidsBasics Core Traffic) # ws_32 throws an error on Phoenix
ELSE(MSVC)
- set(libsToLink GridGenerator VirtualFluidsBasics Core Traffic)
+ #set(libsToLink GridGenerator VirtualFluidsBasics Core Traffic)
+ set(libsToLink GridGenerator VirtualFluidsBasics Core)
ENDIF(MSVC)
set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
@@ -13,8 +14,8 @@ set(includeDirectories ${CMAKE_SOURCE_DIR}/src/${targetName}
${CMAKE_SOURCE_DIR}/src/GridGenerator
${CMAKE_SOURCE_DIR}/src/VirtualFluidsBasics
${CMAKE_SOURCE_DIR}/src/Core
- ${CMAKE_SOURCE_DIR}/src/Traffic
- )
+ ${CMAKE_SOURCE_DIR}/src/Traffic
+ )
#glob files and save in MY_SRCS
include(CMakePackage.cmake)
--
GitLab