Skip to content
Snippets Groups Projects
Commit f7ff35b6 authored by Anna Wellmann's avatar Anna Wellmann
Browse files

Rename variable and fix warnings in pipeline

bulkOnly --> split domain
parent fa149556
No related branches found
No related tags found
1 merge request!104Add Communication Hiding to GPU version
......@@ -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";
}
......
......@@ -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
......
......@@ -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
......
......@@ -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;
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment