diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp
index 0a3284f3f8578d4d72d4ed606587dd4664c39a0e..b96f00f35ee25d4ac695b4beeeee691ad40ccc15 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp
@@ -110,7 +110,7 @@ static SPtr<Parameter> initParameterClass()
class IndexRearrangementForStreamsTest_IndicesCFBorderBulkTest : public testing::Test
{
-public:
+protected:
CFBorderBulk cf;
SPtr<Parameter> para;
std::unique_ptr<IndexRearrangementForStreams> testSubject;
@@ -198,7 +198,7 @@ struct FCBorderBulk {
class IndexRearrangementForStreamsTest_IndicesFCBorderBulkTest : public testing::Test
{
-public:
+protected:
FCBorderBulk fc;
SPtr<Parameter> para;
std::unique_ptr<IndexRearrangementForStreams> testSubject;
@@ -281,11 +281,17 @@ struct SendIndicesForCommAfterFtoCX {
class IndexRearrangementForStreamsTest_reorderSendIndices : public testing::Test
{
-public:
+protected:
SendIndicesForCommAfterFtoCX si;
SPtr<Parameter> para;
std::unique_ptr<IndexRearrangementForStreams> testSubject;
+ void act()
+ {
+ testSubject->reorderSendIndicesForCommAfterFtoCX(si.direction, si.level, si.indexOfProcessNeighbor,
+ si.sendIndicesForCommAfterFtoCPositions);
+ };
+private:
std::unique_ptr<IndexRearrangementForStreams> createTestSubjectReorderSendIndices()
{
logging::Logger::addStream(&std::cout);
@@ -319,12 +325,6 @@ public:
para = initParameterClass();
testSubject = createTestSubjectReorderSendIndices();
};
-
- void act()
- {
- testSubject->reorderSendIndicesForCommAfterFtoCX(si.direction, si.level, si.indexOfProcessNeighbor,
- si.sendIndicesForCommAfterFtoCPositions);
- };
};
TEST_F(IndexRearrangementForStreamsTest_reorderSendIndices, reorderSendIndicesForCommAfterFtoCX)
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp b/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp
index df77d0fd4b668ccf745c8c1a04ce7beaa4133860..59ac0d7af820056459fdb2d16998682a71ddead4 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp
+++ b/src/gpu/VirtualFluids_GPU/Parameter/ParameterTest.cpp
@@ -1,22 +1,20 @@
#include <gmock/gmock.h>
+#include <filesystem>
#include <iostream>
#include <string>
-#include <filesystem>
#include "Parameter.h"
#include <basics/config/ConfigurationFile.h>
-
-auto RealEq = [](auto value) {
+auto RealEq = [](auto value) {
#ifdef VF_DOUBLE_ACCURACY
- return testing::DoubleEq(value);
-#else
+ return testing::DoubleEq(value);
+#else
return testing::FloatEq(value);
#endif
};
-
TEST(ParameterTest, passingEmptyFileWithoutPath_ShouldThrow)
{
// assuming that the config files is stored parallel to this file.
@@ -50,7 +48,7 @@ TEST(ParameterTest, check_all_Parameter_CanBePassedToConstructor)
// test optional parameter
EXPECT_THAT(para.getMaxDev(), testing::Eq(2));
- EXPECT_THAT(para.getDevices(), testing::ElementsAreArray({2,3}));
+ EXPECT_THAT(para.getDevices(), testing::ElementsAreArray({ 2, 3 }));
EXPECT_THAT(para.getOutputPrefix(), testing::Eq("MyPrefix"));
EXPECT_THAT(para.getPrintFiles(), testing::Eq(true));
EXPECT_THAT(para.getIsGeometryValues(), testing::Eq(true));
@@ -105,16 +103,16 @@ TEST(ParameterTest, check_all_Parameter_CanBePassedToConstructor)
EXPECT_THAT(para.getclockCycleForMP(), RealEq(0.4));
EXPECT_THAT(para.getTimestepForMP(), testing::Eq(4));
- std::vector<real> forces {2.0,2.1,2.2};
- double* forces_actual = para.getForcesDouble();
+ std::vector<real> forces{ 2.0, 2.1, 2.2 };
+ double *forces_actual = para.getForcesDouble();
for (size_t i = 0; i < forces.size(); ++i) {
- EXPECT_THAT((real)forces_actual[i], RealEq(forces[i]));
+ EXPECT_THAT((real)forces_actual[i], RealEq(forces[i]));
}
- std::vector<real> limiters {3.0,3.1,3.2};
- double* limiters_actual = para.getQuadricLimitersDouble();
+ std::vector<real> limiters{ 3.0, 3.1, 3.2 };
+ double *limiters_actual = para.getQuadricLimitersDouble();
for (size_t i = 0; i < limiters.size(); ++i) {
- EXPECT_THAT((real)limiters_actual[i], RealEq(limiters[i]));
+ EXPECT_THAT((real)limiters_actual[i], RealEq(limiters[i]));
}
EXPECT_THAT(para.getCalcParticle(), testing::Eq(true));
@@ -130,82 +128,82 @@ TEST(ParameterTest, check_all_Parameter_CanBePassedToConstructor)
EXPECT_THAT(para.getDoRestart(), testing::Eq(true));
EXPECT_THAT(para.getMaxLevel(), testing::Eq(1)); // NOGL - 1
- EXPECT_THAT(para.getGridX(), testing::ElementsAreArray({100, 101}));
- EXPECT_THAT(para.getGridY(), testing::ElementsAreArray({200, 201}));
- EXPECT_THAT(para.getGridZ(), testing::ElementsAreArray({300, 301}));
- EXPECT_THAT(para.getDistX(), testing::ElementsAreArray({400, 401}));
- EXPECT_THAT(para.getDistY(), testing::ElementsAreArray({500, 501}));
- EXPECT_THAT(para.getDistZ(), testing::ElementsAreArray({600, 601}));
+ EXPECT_THAT(para.getGridX(), testing::ElementsAreArray({ 100, 101 }));
+ EXPECT_THAT(para.getGridY(), testing::ElementsAreArray({ 200, 201 }));
+ EXPECT_THAT(para.getGridZ(), testing::ElementsAreArray({ 300, 301 }));
+ EXPECT_THAT(para.getDistX(), testing::ElementsAreArray({ 400, 401 }));
+ EXPECT_THAT(para.getDistY(), testing::ElementsAreArray({ 500, 501 }));
+ EXPECT_THAT(para.getDistZ(), testing::ElementsAreArray({ 600, 601 }));
EXPECT_THAT(para.getMainKernel(), testing::Eq("KernelName"));
EXPECT_THAT(para.getMultiKernelOn(), testing::Eq(true));
- EXPECT_THAT(para.getMultiKernelLevel(), testing::ElementsAreArray({3, 2, 1}));
+ EXPECT_THAT(para.getMultiKernelLevel(), testing::ElementsAreArray({ 3, 2, 1 }));
- std::vector<std::string> kernel {"Kernel1", "Kernel2", "Kernel3"};
+ std::vector<std::string> kernel{ "Kernel1", "Kernel2", "Kernel3" };
auto kernel_actual = para.getMultiKernel();
for (size_t i = 0; i < kernel.size(); ++i) {
EXPECT_THAT(kernel_actual[i], testing::Eq(kernel[i]));
}
-
EXPECT_THAT(para.getCoarse(), testing::Eq(0));
- EXPECT_THAT(para.getFine(), testing::Eq(1)); // NOGL - 1
+ EXPECT_THAT(para.getFine(), testing::Eq(1)); // NOGL - 1
EXPECT_THAT(para.parH.size(), testing::Eq(2));
EXPECT_THAT(para.parD.size(), testing::Eq(2));
}
-
-TEST(ParameterTest, findEdgeNodesXY_shouldReturnCorrectVector)
+static std::shared_ptr<Parameter> initParameterClass()
{
-
- std::filesystem::path filePath = __FILE__;
+ std::filesystem::path filePath = __FILE__; // assuming that the config file is stored parallel to this file.
filePath.replace_filename("parameterTest.cfg");
vf::basics::ConfigurationFile config;
config.load(filePath.string());
- Parameter para(config, 1, 0);
+ return std::make_shared<Parameter>(config, 1, 0);
+}
+
+TEST(ParameterTest, findEdgeNodesXY_shouldReturnCorrectVector)
+{
- para.initLBMSimulationParameter();
+ auto para = initParameterClass();
+ para->initLBMSimulationParameter();
int level = 0;
- para.parH[level]->recvProcessNeighborX.push_back(ProcessNeighbor27());
- para.parH[level]->sendProcessNeighborY.push_back(ProcessNeighbor27());
- para.parH[level]->sendProcessNeighborY.push_back(ProcessNeighbor27());
+ para->parH[level]->recvProcessNeighborX.push_back(ProcessNeighbor27());
+ para->parH[level]->sendProcessNeighborY.push_back(ProcessNeighbor27());
+ para->parH[level]->sendProcessNeighborY.push_back(ProcessNeighbor27());
- int numRecvNeighbor = (int)para.parH[level]->recvProcessNeighborX.size() - 1;
- int numSendNeighbor = (int)para.parH[level]->sendProcessNeighborY.size() - 1;
+ int numRecvNeighbor = (int)para->parH[level]->recvProcessNeighborX.size() - 1;
+ int numSendNeighbor = (int)para->parH[level]->sendProcessNeighborY.size() - 1;
const int sizeRecv = 6;
const int sizeSend = 10;
- para.parH[level]->recvProcessNeighborX[numRecvNeighbor].numberOfNodes = sizeRecv;
- para.parH[level]->sendProcessNeighborY[numSendNeighbor].numberOfNodes = sizeSend;
+ para->parH[level]->recvProcessNeighborX[numRecvNeighbor].numberOfNodes = sizeRecv;
+ para->parH[level]->sendProcessNeighborY[numSendNeighbor].numberOfNodes = sizeSend;
int recvNeighbors[sizeRecv] = { 1, 2, 3, 4, 5, 6 };
- para.parH[level]->recvProcessNeighborX[numRecvNeighbor].index = recvNeighbors;
+ para->parH[level]->recvProcessNeighborX[numRecvNeighbor].index = recvNeighbors;
int sendNeighbors[sizeSend] = { 20, 1, 21, 22, 6, 23, 5, 24, 25, 26 };
- para.parH[level]->sendProcessNeighborY[numSendNeighbor].index = sendNeighbors;
-
-
- para.findEdgeNodesCommMultiGPU();
+ para->parH[level]->sendProcessNeighborY[numSendNeighbor].index = sendNeighbors;
+ para->findEdgeNodesCommMultiGPU();
std::vector<std::pair<int, int>> expectedEdgeNodesXtoYRecv = { std::pair(numRecvNeighbor, 0),
- std::pair(numRecvNeighbor, 4),
- std::pair(numRecvNeighbor, 5) };
+ std::pair(numRecvNeighbor, 4),
+ std::pair(numRecvNeighbor, 5) };
std::vector<std::pair<int, int>> expectedEdgeNodesXtoYSend = { std::pair(numSendNeighbor, 1),
- std::pair(numSendNeighbor, 6),
- std::pair(numSendNeighbor, 4) };
+ std::pair(numSendNeighbor, 6),
+ std::pair(numSendNeighbor, 4) };
- EXPECT_THAT(para.parH[level]->edgeNodesXtoY.size(), testing::Eq(expectedEdgeNodesXtoYRecv.size()));
+ EXPECT_THAT(para->parH[level]->edgeNodesXtoY.size(), testing::Eq(expectedEdgeNodesXtoYRecv.size()));
bool vectorsAreIdentical = true;
for (int i = 0; i < (int)expectedEdgeNodesXtoYRecv.size(); i++) {
- if (para.parH[level]->edgeNodesXtoY[i].indexOfProcessNeighborRecv != expectedEdgeNodesXtoYRecv[i].first) {
+ if (para->parH[level]->edgeNodesXtoY[i].indexOfProcessNeighborRecv != expectedEdgeNodesXtoYRecv[i].first) {
vectorsAreIdentical = false;
break;
}
- if (para.parH[level]->edgeNodesXtoY[i].indexInRecvBuffer != expectedEdgeNodesXtoYRecv[i].second) {
+ if (para->parH[level]->edgeNodesXtoY[i].indexInRecvBuffer != expectedEdgeNodesXtoYRecv[i].second) {
vectorsAreIdentical = false;
break;
}
@@ -215,11 +213,11 @@ TEST(ParameterTest, findEdgeNodesXY_shouldReturnCorrectVector)
vectorsAreIdentical = true;
for (int i = 0; i < (int)expectedEdgeNodesXtoYSend.size(); i++) {
- if (para.parH[level]->edgeNodesXtoY[i].indexOfProcessNeighborSend != expectedEdgeNodesXtoYSend[i].first) {
+ if (para->parH[level]->edgeNodesXtoY[i].indexOfProcessNeighborSend != expectedEdgeNodesXtoYSend[i].first) {
vectorsAreIdentical = false;
break;
}
- if (para.parH[level]->edgeNodesXtoY[i].indexInSendBuffer != expectedEdgeNodesXtoYSend[i].second) {
+ if (para->parH[level]->edgeNodesXtoY[i].indexInSendBuffer != expectedEdgeNodesXtoYSend[i].second) {
vectorsAreIdentical = false;
break;
}
@@ -231,54 +229,47 @@ TEST(ParameterTest, findEdgeNodesXY_shouldReturnCorrectVector)
TEST(ParameterTest, findEdgeNodesXZ_shouldReturnCorrectVector)
{
- std::filesystem::path filePath = __FILE__;
- filePath.replace_filename("parameterTest.cfg");
- vf::basics::ConfigurationFile config;
- config.load(filePath.string());
- Parameter para(config, 1, 0);
-
- para.initLBMSimulationParameter();
+ auto para = initParameterClass();
+ para->initLBMSimulationParameter();
int level = 0;
- para.parH[level]->recvProcessNeighborX.push_back(ProcessNeighbor27());
- para.parH[level]->sendProcessNeighborZ.push_back(ProcessNeighbor27());
- para.parH[level]->sendProcessNeighborZ.push_back(ProcessNeighbor27());
+ para->parH[level]->recvProcessNeighborX.push_back(ProcessNeighbor27());
+ para->parH[level]->sendProcessNeighborZ.push_back(ProcessNeighbor27());
+ para->parH[level]->sendProcessNeighborZ.push_back(ProcessNeighbor27());
- int numRecvNeighbor = (int)para.parH[level]->recvProcessNeighborX.size() - 1;
- int numSendNeighbor = (int)para.parH[level]->sendProcessNeighborZ.size() - 1;
+ int numRecvNeighbor = (int)para->parH[level]->recvProcessNeighborX.size() - 1;
+ int numSendNeighbor = (int)para->parH[level]->sendProcessNeighborZ.size() - 1;
const int sizeRecv = 10;
const int sizeSend = 6;
- para.parH[level]->recvProcessNeighborX[numRecvNeighbor].numberOfNodes = sizeRecv;
- para.parH[level]->sendProcessNeighborZ[numSendNeighbor].numberOfNodes = sizeSend;
+ para->parH[level]->recvProcessNeighborX[numRecvNeighbor].numberOfNodes = sizeRecv;
+ para->parH[level]->sendProcessNeighborZ[numSendNeighbor].numberOfNodes = sizeSend;
int recvNeighbors[sizeRecv] = { 20, 1, 21, 22, 6, 23, 5, 24, 25, 26 };
- para.parH[level]->recvProcessNeighborX[numRecvNeighbor].index = recvNeighbors;
+ para->parH[level]->recvProcessNeighborX[numRecvNeighbor].index = recvNeighbors;
int sendNeighbors[sizeSend] = { 1, 2, 3, 4, 5, 6 };
- para.parH[level]->sendProcessNeighborZ[numSendNeighbor].index = sendNeighbors;
-
-
- para.findEdgeNodesCommMultiGPU();
+ para->parH[level]->sendProcessNeighborZ[numSendNeighbor].index = sendNeighbors;
+ para->findEdgeNodesCommMultiGPU();
std::vector<std::pair<int, int>> expectedEdgeNodesXtoZRecv = { std::pair(numRecvNeighbor, 1),
- std::pair(numRecvNeighbor, 4),
- std::pair(numRecvNeighbor, 6) };
+ std::pair(numRecvNeighbor, 4),
+ std::pair(numRecvNeighbor, 6) };
std::vector<std::pair<int, int>> expectedEdgeNodesXtoZSend = { std::pair(numSendNeighbor, 0),
- std::pair(numSendNeighbor, 5),
- std::pair(numSendNeighbor, 4) };
+ std::pair(numSendNeighbor, 5),
+ std::pair(numSendNeighbor, 4) };
- EXPECT_THAT(para.parH[level]->edgeNodesXtoZ.size(), testing::Eq(expectedEdgeNodesXtoZRecv.size()));
+ EXPECT_THAT(para->parH[level]->edgeNodesXtoZ.size(), testing::Eq(expectedEdgeNodesXtoZRecv.size()));
bool vectorsAreIdentical = true;
for (int i = 0; i < (int)expectedEdgeNodesXtoZRecv.size(); i++) {
- if (para.parH[level]->edgeNodesXtoZ[i].indexOfProcessNeighborRecv != expectedEdgeNodesXtoZRecv[i].first) {
+ if (para->parH[level]->edgeNodesXtoZ[i].indexOfProcessNeighborRecv != expectedEdgeNodesXtoZRecv[i].first) {
vectorsAreIdentical = false;
break;
}
- if (para.parH[level]->edgeNodesXtoZ[i].indexInRecvBuffer != expectedEdgeNodesXtoZRecv[i].second) {
+ if (para->parH[level]->edgeNodesXtoZ[i].indexInRecvBuffer != expectedEdgeNodesXtoZRecv[i].second) {
vectorsAreIdentical = false;
break;
}
@@ -288,11 +279,11 @@ TEST(ParameterTest, findEdgeNodesXZ_shouldReturnCorrectVector)
vectorsAreIdentical = true;
for (int i = 0; i < (int)expectedEdgeNodesXtoZRecv.size(); i++) {
- if (para.parH[level]->edgeNodesXtoZ[i].indexOfProcessNeighborSend != expectedEdgeNodesXtoZSend[i].first){
+ if (para->parH[level]->edgeNodesXtoZ[i].indexOfProcessNeighborSend != expectedEdgeNodesXtoZSend[i].first) {
vectorsAreIdentical = false;
break;
}
- if (para.parH[level]->edgeNodesXtoZ[i].indexInSendBuffer != expectedEdgeNodesXtoZSend[i].second) {
+ if (para->parH[level]->edgeNodesXtoZ[i].indexInSendBuffer != expectedEdgeNodesXtoZSend[i].second) {
vectorsAreIdentical = false;
break;
}
@@ -304,54 +295,47 @@ TEST(ParameterTest, findEdgeNodesXZ_shouldReturnCorrectVector)
TEST(ParameterTest, findEdgeNodesYZ_shouldReturnCorrectVector)
{
- std::filesystem::path filePath = __FILE__;
- filePath.replace_filename("parameterTest.cfg");
- vf::basics::ConfigurationFile config;
- config.load(filePath.string());
- Parameter para(config, 1, 0);
-
- para.initLBMSimulationParameter();
+ auto para = initParameterClass();
+ para->initLBMSimulationParameter();
int level = 0;
- para.parH[level]->recvProcessNeighborY.push_back(ProcessNeighbor27());
- para.parH[level]->sendProcessNeighborZ.push_back(ProcessNeighbor27());
- para.parH[level]->sendProcessNeighborZ.push_back(ProcessNeighbor27());
+ para->parH[level]->recvProcessNeighborY.push_back(ProcessNeighbor27());
+ para->parH[level]->sendProcessNeighborZ.push_back(ProcessNeighbor27());
+ para->parH[level]->sendProcessNeighborZ.push_back(ProcessNeighbor27());
const int sizeRecv = 10;
const int sizeSend1 = 6;
const int sizeSend2 = 5;
- para.parH[level]->recvProcessNeighborY[0].numberOfNodes = sizeRecv;
- para.parH[level]->sendProcessNeighborZ[0].numberOfNodes = sizeSend1;
- para.parH[level]->sendProcessNeighborZ[1].numberOfNodes = sizeSend2;
+ para->parH[level]->recvProcessNeighborY[0].numberOfNodes = sizeRecv;
+ para->parH[level]->sendProcessNeighborZ[0].numberOfNodes = sizeSend1;
+ para->parH[level]->sendProcessNeighborZ[1].numberOfNodes = sizeSend2;
int recvNeighbors[sizeRecv] = { 20, 1, 9, 22, 6, 23, 5, 24, 11, 26 };
- para.parH[level]->recvProcessNeighborY[0].index = recvNeighbors;
+ para->parH[level]->recvProcessNeighborY[0].index = recvNeighbors;
int sendNeighbors1[sizeSend1] = { 1, 2, 3, 4, 5, 6 };
int sendNeighbors2[sizeSend2] = { 7, 8, 9, 10, 11 };
- para.parH[level]->sendProcessNeighborZ[0].index = sendNeighbors1;
- para.parH[level]->sendProcessNeighborZ[1].index = sendNeighbors2;
-
-
- para.findEdgeNodesCommMultiGPU();
+ para->parH[level]->sendProcessNeighborZ[0].index = sendNeighbors1;
+ para->parH[level]->sendProcessNeighborZ[1].index = sendNeighbors2;
+ para->findEdgeNodesCommMultiGPU();
std::vector<std::pair<int, int>> expectedEdgeNodesXtoZRecv = { std::pair(0, 1), std::pair(0, 2), std::pair(0, 4),
- std::pair(0, 6), std::pair(0, 8) };
+ std::pair(0, 6), std::pair(0, 8) };
std::vector<std::pair<int, int>> expectedEdgeNodesXtoZSend = { std::pair(0, 0), std::pair(1, 2), std::pair(0, 5),
- std::pair(0, 4), std::pair(1, 4) };
+ std::pair(0, 4), std::pair(1, 4) };
- EXPECT_THAT(para.parH[level]->edgeNodesYtoZ.size(), testing::Eq(expectedEdgeNodesXtoZRecv.size()));
+ EXPECT_THAT(para->parH[level]->edgeNodesYtoZ.size(), testing::Eq(expectedEdgeNodesXtoZRecv.size()));
bool vectorsAreIdentical = true;
for (int i = 0; i < (int)expectedEdgeNodesXtoZRecv.size(); i++) {
- if (para.parH[level]->edgeNodesYtoZ[i].indexOfProcessNeighborRecv != expectedEdgeNodesXtoZRecv[i].first) {
+ if (para->parH[level]->edgeNodesYtoZ[i].indexOfProcessNeighborRecv != expectedEdgeNodesXtoZRecv[i].first) {
vectorsAreIdentical = false;
break;
}
- if (para.parH[level]->edgeNodesYtoZ[i].indexInRecvBuffer != expectedEdgeNodesXtoZRecv[i].second) {
+ if (para->parH[level]->edgeNodesYtoZ[i].indexInRecvBuffer != expectedEdgeNodesXtoZRecv[i].second) {
vectorsAreIdentical = false;
break;
}
@@ -361,11 +345,11 @@ TEST(ParameterTest, findEdgeNodesYZ_shouldReturnCorrectVector)
vectorsAreIdentical = true;
for (int i = 0; i < (int)expectedEdgeNodesXtoZRecv.size(); i++) {
- if (para.parH[level]->edgeNodesYtoZ[i].indexOfProcessNeighborSend != expectedEdgeNodesXtoZSend[i].first) {
+ if (para->parH[level]->edgeNodesYtoZ[i].indexOfProcessNeighborSend != expectedEdgeNodesXtoZSend[i].first) {
vectorsAreIdentical = false;
break;
}
- if (para.parH[level]->edgeNodesYtoZ[i].indexInSendBuffer != expectedEdgeNodesXtoZSend[i].second) {
+ if (para->parH[level]->edgeNodesYtoZ[i].indexInSendBuffer != expectedEdgeNodesXtoZSend[i].second) {
vectorsAreIdentical = false;
break;
}