From ab10a0ebc8fdfcc2e537758b75c7b65f01c6f003 Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-braunschweig.de>
Date: Fri, 3 Sep 2021 17:26:06 +0200
Subject: [PATCH] Refactor UpdateGrid27
---
.../VirtualFluids_GPU/Calculation/UpdateGrid27.cpp | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
index 4b180fb65..d91cd5500 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
@@ -27,18 +27,14 @@ void updateGrid27(Parameter* para,
//////////////////////////////////////////////////////////////////////////
int borderStreamIndex = 1;
- int bulkStreamIndex = 0;
-
- if (para->getUseStreams()) {
- // launch border kernel
- collisionUsingIndex(para, pm, level, t, kernels, para->getParD(level)->fluidNodeIndicesBorder,
- para->getParD(level)->numberOffluidNodesBorder, borderStreamIndex);
- } else
- collision(para, pm, level, t, kernels);
+ int bulkStreamIndex = 0;
//////////////////////////////////////////////////////////////////////////
if (para->getUseStreams() && para->getNumprocs() > 1) {
+ // launch border kernel
+ collisionUsingIndex(para, pm, level, t, kernels, para->getParD(level)->fluidNodeIndicesBorder,
+ para->getParD(level)->numberOffluidNodesBorder, borderStreamIndex);
//prepare exchange and trigger bulk kernel when finished
prepareExchangeMultiGPU(para, level, borderStreamIndex);
if (para->getUseStreams())
@@ -51,6 +47,7 @@ void updateGrid27(Parameter* para,
exchangeMultiGPU(para, comm, cudaManager, level, borderStreamIndex);
} else {
+ collision(para, pm, level, t, kernels);
prepareExchangeMultiGPU(para, level, -1);
exchangeMultiGPU(para, comm, cudaManager, level, -1);
}
--
GitLab