From 6a0d473866e399ad78ceab5062fa38ff9d71cdf3 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Fri, 14 Apr 2023 09:21:18 +0000
Subject: [PATCH] Adjust include style.
---
apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp | 2 +-
apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp | 2 +-
apps/gpu/LBM/MusselOyster/MusselOyster.cpp | 2 +-
apps/gpu/LBM/SphereScaling/SphereScaling.cpp | 2 +-
apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp | 2 +-
apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp | 7 ++++---
.../VirtualFluids_GPU/Calculation/CollisisionStrategy.cpp | 2 +-
.../VirtualFluids_GPU/Calculation/RefinementStrategy.cpp | 2 +-
src/gpu/VirtualFluids_GPU/FindQ/FindQ.cpp | 2 +-
.../KernelManager/GridScalingKernelManager.h | 2 +-
src/gpu/VirtualFluids_GPU/Output/QDebugVtkWriter.hpp | 2 +-
src/gpu/VirtualFluids_GPU/Output/Timer.h | 2 +-
.../PreCollisionInteractor/ActuatorFarm.cu | 2 +-
13 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp b/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp
index fab96e5c1..f553c255b 100644
--- a/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp
+++ b/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp
@@ -49,7 +49,7 @@
#include "PointerDefinitions.h"
#include "config/ConfigurationFile.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
//////////////////////////////////////////////////////////////////////////
diff --git a/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp b/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
index cb94de0fd..4883cbcaa 100755
--- a/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
+++ b/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
@@ -17,7 +17,7 @@
#include "basics/StringUtilities/StringUtil.h"
#include "basics/config/ConfigurationFile.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
//////////////////////////////////////////////////////////////////////////
diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
index 75f01705f..48fa21471 100644
--- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
+++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
@@ -18,7 +18,7 @@
#include "basics/StringUtilities/StringUtil.h"
#include "basics/config/ConfigurationFile.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
//////////////////////////////////////////////////////////////////////////
diff --git a/apps/gpu/LBM/SphereScaling/SphereScaling.cpp b/apps/gpu/LBM/SphereScaling/SphereScaling.cpp
index 0033783e7..d67ea9175 100755
--- a/apps/gpu/LBM/SphereScaling/SphereScaling.cpp
+++ b/apps/gpu/LBM/SphereScaling/SphereScaling.cpp
@@ -18,7 +18,7 @@
#include "basics/StringUtilities/StringUtil.h"
#include "basics/config/ConfigurationFile.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
//////////////////////////////////////////////////////////////////////////
diff --git a/apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp b/apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp
index a5f1e77db..e7117b482 100644
--- a/apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp
+++ b/apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp
@@ -347,7 +347,7 @@ int main( int argc, char* argv[])
}
catch (const std::bad_alloc& e)
{
- std::cout << e.what() << std::flush;
+ std::cout << "Bad alloc: " << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (const std::exception& e)
diff --git a/apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp b/apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp
index 543cab2f5..93ff9de0f 100644
--- a/apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp
+++ b/apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp
@@ -808,16 +808,17 @@ int main( int argc, char* argv[])
}
catch (const std::bad_alloc& e)
{
-
+ std::cout << "Bad alloc: " << e.what() << std::flush;
}
catch (const std::exception& e)
{
-
+ std::cout << e.what() << std::flush;
}
catch (...)
{
-
+ std::cout << "unknown exeption" << std::endl;
}
+
}
MPI_Finalize();
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/CollisisionStrategy.cpp b/src/gpu/VirtualFluids_GPU/Calculation/CollisisionStrategy.cpp
index 49543f37d..334212f90 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/CollisisionStrategy.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/CollisisionStrategy.cpp
@@ -1,7 +1,7 @@
#include "CollisionStrategy.h"
#include "Parameter/CudaStreamManager.h"
#include "Parameter/Parameter.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
std::function<void(UpdateGrid27 *updateGrid, Parameter *para, int level, unsigned int t)>
getFunctionForCollisionAndExchange(const bool useStreams, const int numberOfMpiProcesses,
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/RefinementStrategy.cpp b/src/gpu/VirtualFluids_GPU/Calculation/RefinementStrategy.cpp
index f1c9bb8e5..9428b0798 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/RefinementStrategy.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/RefinementStrategy.cpp
@@ -1,7 +1,7 @@
#include "RefinementStrategy.h"
#include "Parameter/CudaStreamManager.h"
#include "Parameter/Parameter.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
std::function<void(UpdateGrid27 *updateGrid, Parameter *para, int level)>
getFunctionForRefinementAndExchange(const bool useStreams, const int numberOfMpiProcesses, const int maxLevel,
diff --git a/src/gpu/VirtualFluids_GPU/FindQ/FindQ.cpp b/src/gpu/VirtualFluids_GPU/FindQ/FindQ.cpp
index 19be37ed5..bc12456ce 100644
--- a/src/gpu/VirtualFluids_GPU/FindQ/FindQ.cpp
+++ b/src/gpu/VirtualFluids_GPU/FindQ/FindQ.cpp
@@ -1,5 +1,5 @@
#include "FindQ/FindQ.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
#include "lbm/constants/D3Q27.h"
using namespace vf::lbm::dir;
diff --git a/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManager.h b/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManager.h
index ef1e175ed..0c2480150 100644
--- a/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManager.h
+++ b/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManager.h
@@ -36,7 +36,7 @@
#include "LBM/LB.h"
#include "PointerDefinitions.h"
#include "VirtualFluids_GPU_export.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
#include <functional>
#include <memory>
#include <stdexcept>
diff --git a/src/gpu/VirtualFluids_GPU/Output/QDebugVtkWriter.hpp b/src/gpu/VirtualFluids_GPU/Output/QDebugVtkWriter.hpp
index 89e923e7f..d075c78e5 100644
--- a/src/gpu/VirtualFluids_GPU/Output/QDebugVtkWriter.hpp
+++ b/src/gpu/VirtualFluids_GPU/Output/QDebugVtkWriter.hpp
@@ -8,7 +8,7 @@
#include "basics/utilities/UbSystem.h"
#include "basics/writer/WbWriterVtkXmlBinary.h"
#include "lbm/constants/D3Q27.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
#include "gpu/GridGenerator/grid/NodeValues.h"
#include "gpu/VirtualFluids_GPU/Communication/Communicator.h"
diff --git a/src/gpu/VirtualFluids_GPU/Output/Timer.h b/src/gpu/VirtualFluids_GPU/Output/Timer.h
index 237069c2c..55ada64ad 100644
--- a/src/gpu/VirtualFluids_GPU/Output/Timer.h
+++ b/src/gpu/VirtualFluids_GPU/Output/Timer.h
@@ -4,7 +4,7 @@
#include "DataTypes.h"
#include "Parameter/Parameter.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
namespace vf::gpu{
class Communicator;
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu
index b8e5a66a4..bcdd63657 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu
@@ -45,7 +45,7 @@
#include "DataStructureInitializer/GridProvider.h"
#include "GPU/CudaMemoryManager.h"
#include "basics/constants/NumericConstants.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
using namespace vf::basics::constant;
--
GitLab