diff --git a/src/gpu/VirtualFluids_GPU/Communication/ExchangeData27.cpp b/src/gpu/VirtualFluids_GPU/Communication/ExchangeData27.cpp index bd5b08c431bba65e460bbe984860a38774ea6395..99a3489a03de1f20cf447664928bde0ef6bd0108 100644 --- a/src/gpu/VirtualFluids_GPU/Communication/ExchangeData27.cpp +++ b/src/gpu/VirtualFluids_GPU/Communication/ExchangeData27.cpp @@ -161,7 +161,7 @@ void exchangeCollDataYGPU27(Parameter *para, vf::gpu::Communicator *comm, CudaMe cudaStreamSynchronize(stream); ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // copy corner received node values from x - if (para->getNumberOfProcessNeighborsX(level, "receive") > 0) { + if (para->getNumberOfProcessNeighborsX(level, "recv") > 0) { for (uint i = 0; i < para->getParH(level)->cornerNodesXtoY.recvPos.size(); i++) { std::pair<int, int> & recvPosX = para->getParH(level)->cornerNodesXtoY.recvPos[i]; std::pair<int, int> & sendPosY = para->getParH(level)->cornerNodesXtoY.sendPos[i]; @@ -270,7 +270,7 @@ void exchangeCollDataZGPU27(Parameter *para, vf::gpu::Communicator *comm, CudaMe cudaStreamSynchronize(stream); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // copy corner received node values from x - if (para->getNumberOfProcessNeighborsX(level, "receive") > 0) { + if (para->getNumberOfProcessNeighborsX(level, "recv") > 0) { for (uint i = 0; i < para->getParH(level)->cornerNodesXtoZ.recvPos.size(); i++) { std::pair<int, int> &recvPosX = para->getParH(level)->cornerNodesXtoZ.recvPos[i]; std::pair<int, int> &sendPosZ = para->getParH(level)->cornerNodesXtoZ.sendPos[i]; @@ -280,7 +280,7 @@ void exchangeCollDataZGPU27(Parameter *para, vf::gpu::Communicator *comm, CudaMe } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // copy corner received node values from y - if (para->getNumberOfProcessNeighborsY(level, "receive") > 0) { + if (para->getNumberOfProcessNeighborsY(level, "recv") > 0) { for (uint i = 0; i < para->getParH(level)->cornerNodesYtoZ.recvPos.size(); i++) { std::pair<int, int> &recvPosY = para->getParH(level)->cornerNodesYtoZ.recvPos[i]; std::pair<int, int> &sendPosZ = para->getParH(level)->cornerNodesYtoZ.sendPos[i]; diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp index 2ed642ec5f7e7a324b1d87aa8d95318657f89623..440e589847c0ff3a1952e49b212ee6219e5a6086 100644 --- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp +++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp @@ -2330,7 +2330,7 @@ unsigned int Parameter::getNumberOfProcessNeighborsX(int level, std::string sor) { return (unsigned int)parH[level]->recvProcessNeighborX.size(); } - throw std::runtime_error("Parameter string invalid."); + throw std::runtime_error("getNumberOfProcessNeighborsX: Parameter string invalid."); } unsigned int Parameter::getNumberOfProcessNeighborsY(int level, std::string sor) { @@ -2342,7 +2342,7 @@ unsigned int Parameter::getNumberOfProcessNeighborsY(int level, std::string sor) { return (unsigned int)parH[level]->recvProcessNeighborY.size(); } - throw std::runtime_error("Parameter string invalid."); + throw std::runtime_error("getNumberOfProcessNeighborsY: Parameter string invalid."); } unsigned int Parameter::getNumberOfProcessNeighborsZ(int level, std::string sor) { @@ -2354,7 +2354,7 @@ unsigned int Parameter::getNumberOfProcessNeighborsZ(int level, std::string sor) { return (unsigned int)parH[level]->recvProcessNeighborZ.size(); } - throw std::runtime_error("Parameter string invalid."); + throw std::runtime_error("getNumberOfProcessNeighborsZ: Parameter string invalid."); } bool Parameter::getIsNeighborX() @@ -2503,7 +2503,7 @@ void Parameter::findCornerNodesCommMultiGPU() { void Parameter::findCornerNodesXY(int level) { - for (uint i = 0; i < (unsigned int)(this->getNumberOfProcessNeighborsX(level, "receive")); i++) + for (uint i = 0; i < (unsigned int)(this->getNumberOfProcessNeighborsX(level, "recv")); i++) for (int j = 0; j < parH[level]->recvProcessNeighborX[i].numberOfNodes; j++) { int index = parH[level]->recvProcessNeighborX[i].index[j]; bool foundIndex = findIndexInSendNodesXY(level, index); @@ -2525,7 +2525,7 @@ bool Parameter::findIndexInSendNodesXY(int level, int index) void Parameter::findCornerNodesXZ(int level) { - for (uint i = 0; i < (unsigned int)(this->getNumberOfProcessNeighborsX(level, "receive")); i++) + for (uint i = 0; i < (unsigned int)(this->getNumberOfProcessNeighborsX(level, "recv")); i++) for (int j = 0; j < parH[level]->recvProcessNeighborX[i].numberOfNodes; j++) { int index = parH[level]->recvProcessNeighborX[i].index[j]; bool foundIndex = findIndexInSendNodesXZ(level, index); @@ -2547,7 +2547,7 @@ bool Parameter::findIndexInSendNodesXZ(int level, int index) void Parameter::findCornerNodesYZ(int level) { - for (uint i = 0; i < (unsigned int)(this->getNumberOfProcessNeighborsY(level, "receive")); i++) + for (uint i = 0; i < (unsigned int)(this->getNumberOfProcessNeighborsY(level, "recv")); i++) for (int j = 0; j < parH[level]->recvProcessNeighborY[i].numberOfNodes; j++) { int index = parH[level]->recvProcessNeighborY[i].index[j]; bool foundIndex = findIndexInSendNodesYZ(level, index);