From 38789743be14b4c84cb286929d4e09eede1f4ef6 Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-bs.de>
Date: Mon, 8 Nov 2021 16:39:09 +0100
Subject: [PATCH] Remove flag for useMultiGPU and use getNumProcesses() instead
---
apps/gpu/LBM/MusselOyster/MusselOyster.cpp | 6 ++----
apps/gpu/LBM/MusselOyster/configPhoenix1GPU.txt | 2 +-
apps/gpu/LBM/MusselOyster/configPhoenix2GPU.txt | 2 +-
apps/gpu/LBM/MusselOyster/configPhoenix4GPU.txt | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
index 294da3ddd..8f544a362 100644
--- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
+++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
@@ -117,7 +117,6 @@ void multipleLevel(const std::string& configPath)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool useGridGenerator = true;
- bool useMultiGPU = true;
bool useStreams = true;
bool useLevels = true;
para->useReducedCommunicationAfterFtoC = true;
@@ -144,7 +143,6 @@ void multipleLevel(const std::string& configPath)
*logging::out << logging::Logger::INFO_HIGH << "viscosity real [m^2/s] = " << viscosityLB * para->getViscosityRatio() << "\n";
*logging::out << logging::Logger::INFO_HIGH << "dxGrid = " << dxGrid << "\n";
*logging::out << logging::Logger::INFO_HIGH << "useGridGenerator = " << useGridGenerator << "\n";
- *logging::out << logging::Logger::INFO_HIGH << "useMultiGPU = " << useMultiGPU << "\n";
*logging::out << logging::Logger::INFO_HIGH << "useStreams = " << useStreams << "\n";
@@ -173,7 +171,7 @@ void multipleLevel(const std::string& configPath)
para->setMainKernel("CumulantK17CompChimStream");
*logging::out << logging::Logger::INFO_HIGH << "Kernel: " << para->getMainKernel() << "\n";
- // if (useMultiGPU) {
+ // if (para->getNumprocs() > 1) {
// para->setDevices(std::vector<uint>{ (uint)0, (uint)1 });
// para->setMaxDev(2);
// } else
@@ -213,7 +211,7 @@ void multipleLevel(const std::string& configPath)
bivalveRef_1_STL = TriangularMesh::make(stlPath + bivalveType + "_Level1.stl");
- if (useMultiGPU) {
+ if (para->getNumprocs() > 1) {
const uint generatePart = vf::gpu::Communicator::getInstanz()->getPID();
real overlap = (real)8.0 * dxGrid;
diff --git a/apps/gpu/LBM/MusselOyster/configPhoenix1GPU.txt b/apps/gpu/LBM/MusselOyster/configPhoenix1GPU.txt
index bb905cf4f..ff581337a 100644
--- a/apps/gpu/LBM/MusselOyster/configPhoenix1GPU.txt
+++ b/apps/gpu/LBM/MusselOyster/configPhoenix1GPU.txt
@@ -31,6 +31,6 @@ GridPath=/work/y0078217/Grids/GridMusselOyster/MUSSEL1GPU
##################################################
#simulation parameter
##################################################
-TimeEnd=100000
+TimeEnd=10000
TimeOut=1000
#TimeStartOut=0
\ No newline at end of file
diff --git a/apps/gpu/LBM/MusselOyster/configPhoenix2GPU.txt b/apps/gpu/LBM/MusselOyster/configPhoenix2GPU.txt
index 9cafddea7..8ec2cd734 100644
--- a/apps/gpu/LBM/MusselOyster/configPhoenix2GPU.txt
+++ b/apps/gpu/LBM/MusselOyster/configPhoenix2GPU.txt
@@ -31,6 +31,6 @@ GridPath=/work/y0078217/Grids/GridMusselOyster/MUSSEL2GPU
##################################################
#simulation parameter
##################################################
-TimeEnd=100000
+TimeEnd=10000
TimeOut=1000
#TimeStartOut=0
\ No newline at end of file
diff --git a/apps/gpu/LBM/MusselOyster/configPhoenix4GPU.txt b/apps/gpu/LBM/MusselOyster/configPhoenix4GPU.txt
index 0495f23b0..576d270f7 100644
--- a/apps/gpu/LBM/MusselOyster/configPhoenix4GPU.txt
+++ b/apps/gpu/LBM/MusselOyster/configPhoenix4GPU.txt
@@ -31,6 +31,6 @@ GridPath=/work/y0078217/Grids/GridMusselOyster/MUSSEL4GPU
##################################################
#simulation parameter
##################################################
-TimeEnd=100000
+TimeEnd=10000
TimeOut=1000
#TimeStartOut=0
\ No newline at end of file
--
GitLab