From f7ff35b646d91a62a865f4d50c9a99654c389843 Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-braunschweig.de>
Date: Fri, 6 Aug 2021 10:01:57 +0200
Subject: [PATCH] Rename variable and fix warnings in pipeline
bulkOnly --> split domain
---
.../grid/GridBuilder/MultipleGridBuilder.cpp | 4 ++--
.../GridGenerator/grid/GridBuilder/MultipleGridBuilder.h | 2 +-
src/gpu/GridGenerator/grid/GridImp.cu | 8 ++++----
src/gpu/GridGenerator/grid/GridImp.h | 2 +-
src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
index 21570f15d..fb9f2624d 100644
--- a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
+++ b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
@@ -600,11 +600,11 @@ void MultipleGridBuilder::findCommunicationIndices(int direction, LbmOrGks lbmOr
*logging::out << logging::Logger::INFO_HIGH << "Done with findCommunicationIndices()\n";
}
-void MultipleGridBuilder::findFluidNodes(bool onlyBulk)
+void MultipleGridBuilder::findFluidNodes(bool splitDomain)
{
*logging::out << logging::Logger::INFO_HIGH << "Start findFluidNodes()\n";
for (uint i = 0; i < grids.size(); i++)
- grids[i]->findFluidNodeIndices(onlyBulk);
+ grids[i]->findFluidNodeIndices(splitDomain);
*logging::out << logging::Logger::INFO_HIGH << "Done with findFluidNodes()\n";
}
diff --git a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.h b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.h
index ad72e1adb..499f8542e 100644
--- a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.h
+++ b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.h
@@ -86,7 +86,7 @@ public:
GRIDGENERATOR_EXPORT void findCommunicationIndices( int direction, LbmOrGks lbmOrGks );
// needed for CUDA Streams MultiGPU
- void findFluidNodes(bool onlyBulk);
+ void findFluidNodes(bool splitDomain);
};
#endif
diff --git a/src/gpu/GridGenerator/grid/GridImp.cu b/src/gpu/GridGenerator/grid/GridImp.cu
index 991ebc722..ee54a8b02 100644
--- a/src/gpu/GridGenerator/grid/GridImp.cu
+++ b/src/gpu/GridGenerator/grid/GridImp.cu
@@ -858,7 +858,7 @@ CUDA_HOST void GridImp::updateSparseIndices()
sparseSize = size - removedNodes;
}
-CUDA_HOST void GridImp::findFluidNodeIndices(bool onlyBulk)
+CUDA_HOST void GridImp::findFluidNodeIndices(bool splitDomain)
{
this->fluidNodeIndices.clear();
for (uint index = 0; index < this->size; index++) {
@@ -867,10 +867,10 @@ CUDA_HOST void GridImp::findFluidNodeIndices(bool onlyBulk)
continue;
// + 1 for numbering shift between GridGenerator and VF_GPU
- // When onlyBulk: push indices of fluid nodes in bulk to "fluidNodeIndices" and push indices of special fluid nodes (not in bulk) to fluidNodeIndicesBorder
- // When not onlyBulk: push indices of all fluid nodes to "fluidNodeIndices"
+ // When splitDomain: push indices of fluid nodes in bulk to "fluidNodeIndices" and push indices of special fluid nodes (not in bulk) to fluidNodeIndicesBorder
+ // When not splitDomain: push indices of all fluid nodes to "fluidNodeIndices"
if (this->field.isFluid(index)) {
- if (onlyBulk)
+ if (splitDomain)
if (this->field.isFluidNodeOfSpecialInterest(index))
this->fluidNodeIndicesBorder.push_back((uint)sparseIndex + 1);
else
diff --git a/src/gpu/GridGenerator/grid/GridImp.h b/src/gpu/GridGenerator/grid/GridImp.h
index ffdb60665..fb7ab02a0 100644
--- a/src/gpu/GridGenerator/grid/GridImp.h
+++ b/src/gpu/GridGenerator/grid/GridImp.h
@@ -316,7 +316,7 @@ public:
void repairCommunicationInices(int direction) override;
- void findFluidNodeIndices(bool onlyBulk) override;
+ void findFluidNodeIndices(bool splitDomain) override;
uint getNumberOfFluidNodes() const override;
CUDA_HOST void getFluidNodeIndices(uint *fluidNodeIndices) const override;
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
index 0f91ad960..34c45493d 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
@@ -1161,7 +1161,7 @@ void Simulation::free()
para->terminateStreams();
//CudaFreeHostMemory
- for (int lev = para->getCoarse(); lev <= para->getFine(); lev++)
+ for (int lev = para->getCoarse(); lev <= para->getFine(); lev++)
{
//para->cudaFreeFull(lev);
cudaManager->cudaFreeCoord(lev);
--
GitLab