From b6e290689d22cae0c08e1c805cf3498b91ee164d Mon Sep 17 00:00:00 2001 From: Anna Wellmann <a.wellmann@tu-bs.de> Date: Tue, 7 Jun 2022 12:56:38 +0000 Subject: [PATCH] Remove redundant static from anonymous namespace --- .../Parameter/EdgeNodeFinder.cpp | 15 ++++++++------- .../VirtualFluids_GPU/Parameter/EdgeNodeFinder.h | 9 +++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/gpu/VirtualFluids_GPU/Parameter/EdgeNodeFinder.cpp b/src/gpu/VirtualFluids_GPU/Parameter/EdgeNodeFinder.cpp index 937ad1edd..06a408fd6 100644 --- a/src/gpu/VirtualFluids_GPU/Parameter/EdgeNodeFinder.cpp +++ b/src/gpu/VirtualFluids_GPU/Parameter/EdgeNodeFinder.cpp @@ -22,8 +22,8 @@ void findEdgeNodesXY(int level, SPtr<Parameter> parameter) for (uint i = 0; i < (unsigned int)(parameter->getNumberOfProcessNeighborsX(level, "recv")); i++) { for (int j = 0; j < parameter->getParH(level)->recvProcessNeighborX[i].numberOfNodes; j++) { int nodeIndex = parameter->getParH(level)->recvProcessNeighborX[i].index[j]; - bool foundIndex = - findIndexInSendNodes(nodeIndex, parameter->getParH(level)->sendProcessNeighborY, indexOfProcessNeighborSend, indexInSendBuffer); + bool foundIndex = findIndexInSendNodes(nodeIndex, parameter->getParH(level)->sendProcessNeighborY, + indexOfProcessNeighborSend, indexInSendBuffer); if (foundIndex) { parameter->getParH(level)->edgeNodesXtoY.emplace_back(i, j, indexOfProcessNeighborSend, indexInSendBuffer); @@ -39,8 +39,8 @@ void findEdgeNodesXZ(int level, SPtr<Parameter> parameter) for (uint i = 0; i < (unsigned int)(parameter->getNumberOfProcessNeighborsX(level, "recv")); i++) { for (int j = 0; j < parameter->getParH(level)->recvProcessNeighborX[i].numberOfNodes; j++) { int nodeIndex = parameter->getParH(level)->recvProcessNeighborX[i].index[j]; - bool foundIndex = - findIndexInSendNodes(nodeIndex, parameter->getParH(level)->sendProcessNeighborZ, indexOfProcessNeighborSend, indexInSendBuffer); + bool foundIndex = findIndexInSendNodes(nodeIndex, parameter->getParH(level)->sendProcessNeighborZ, + indexOfProcessNeighborSend, indexInSendBuffer); if (foundIndex) { parameter->getParH(level)->edgeNodesXtoZ.emplace_back(i, j, indexOfProcessNeighborSend, indexInSendBuffer); @@ -56,8 +56,8 @@ void findEdgeNodesYZ(int level, SPtr<Parameter> parameter) for (uint i = 0; i < (unsigned int)(parameter->getNumberOfProcessNeighborsY(level, "recv")); i++) { for (int j = 0; j < parameter->getParH(level)->recvProcessNeighborY[i].numberOfNodes; j++) { int nodeIndex = parameter->getParH(level)->recvProcessNeighborY[i].index[j]; - bool foundIndex = - findIndexInSendNodes(nodeIndex, parameter->getParH(level)->sendProcessNeighborZ,indexOfProcessNeighborSend, indexInSendBuffer); + bool foundIndex = findIndexInSendNodes(nodeIndex, parameter->getParH(level)->sendProcessNeighborZ, + indexOfProcessNeighborSend, indexInSendBuffer); if (foundIndex) { parameter->getParH(level)->edgeNodesYtoZ.emplace_back(i, j, indexOfProcessNeighborSend, indexInSendBuffer); @@ -66,7 +66,8 @@ void findEdgeNodesYZ(int level, SPtr<Parameter> parameter) } } -bool findIndexInSendNodes(int nodeIndex, const std::vector<ProcessNeighbor27>& sendProcessNeighbor, int &indexOfProcessNeighborSend, int &indexInSendBuffer) +bool findIndexInSendNodes(int nodeIndex, const std::vector<ProcessNeighbor27> &sendProcessNeighbor, + int &indexOfProcessNeighborSend, int &indexInSendBuffer) { for (uint neighbor = 0; neighbor < (unsigned int)sendProcessNeighbor.size(); neighbor++) { for (int node = 0; node < sendProcessNeighbor[neighbor].numberOfNodes; node++) { diff --git a/src/gpu/VirtualFluids_GPU/Parameter/EdgeNodeFinder.h b/src/gpu/VirtualFluids_GPU/Parameter/EdgeNodeFinder.h index 9c0477f5f..831f4efcc 100644 --- a/src/gpu/VirtualFluids_GPU/Parameter/EdgeNodeFinder.h +++ b/src/gpu/VirtualFluids_GPU/Parameter/EdgeNodeFinder.h @@ -54,10 +54,11 @@ void findEdgeNodesCommMultiGPU(SPtr<Parameter> parameter); // anonymous namespace namespace { -static bool findIndexInSendNodes(int nodeIndex, const std::vector<ProcessNeighbor27>& sendProcessNeighbor, int &indexOfProcessNeighborSend, int &indexInSendBuffer); -static void findEdgeNodesXY(int level, SPtr<Parameter> parameter); -static void findEdgeNodesXZ(int level, SPtr<Parameter> parameter); -static void findEdgeNodesYZ(int level, SPtr<Parameter> parameter); +bool findIndexInSendNodes(int nodeIndex, const std::vector<ProcessNeighbor27> &sendProcessNeighbor, + int &indexOfProcessNeighborSend, int &indexInSendBuffer); +void findEdgeNodesXY(int level, SPtr<Parameter> parameter); +void findEdgeNodesXZ(int level, SPtr<Parameter> parameter); +void findEdgeNodesYZ(int level, SPtr<Parameter> parameter); } // namespace #endif \ No newline at end of file -- GitLab