diff --git a/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.cpp b/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.cpp index 9982e7be949a6df6cdbeac3add10d39b208a1870..f08607630729de195f63621737c92c3c545dd6a2 100644 --- a/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.cpp +++ b/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.cpp @@ -372,6 +372,7 @@ std::vector<std::shared_ptr<L2NormTest> > NumericalTestFactoryImp::makeL2NormTes std::shared_ptr<TestStruct> NumericalTestFactoryImp::makeL2NormTestsBetweenKernelsStructs(std::shared_ptr<L2NormTestBetweenKernelsParameterStruct> testPara, std::vector<std::shared_ptr<TestSimulationImp> > testSim, std::string kernelName) { std::shared_ptr<TestStruct> testStruct = std::shared_ptr<TestStruct>(new TestStruct); + testStruct->testName = "L2NormTestBetweenKernel"; if (testPara->basicTestParameter->runTest) { @@ -396,7 +397,6 @@ std::shared_ptr<TestStruct> NumericalTestFactoryImp::makeL2NormTestsBetweenKerne for (int i = 0; i < tests.size(); i++) testStruct->tests.push_back(tests.at(i)); testStruct->logFileInfo = L2NormBetweenKernelsInformation::getNewInstance(tests, testPara, testSim.at(0)->getDataToCalcTests()); - testStruct->testName = "L2NormTestBetweenKernel"; } } return testStruct; @@ -452,7 +452,7 @@ std::vector<std::shared_ptr<L2NormTestBetweenKernels> > NumericalTestFactoryImp: return tests; } -void NumericalTestFactoryImp::initTestStruct(std::shared_ptr<TestStruct> testStruct, std::shared_ptr<NumericalTestStruct> numericalTestStruct, std::vector<std::shared_ptr<TestLogFileInformation> > testLogFileInfo, std::shared_ptr<BasicTestLogFileInformation> basicTestLogFileInfo) +void NumericalTestFactoryImp::initTestStruct(std::shared_ptr<TestStruct> testStruct, std::shared_ptr<NumericalTestStruct> numericalTestStruct, std::vector<std::shared_ptr<TestLogFileInformation> > &testLogFileInfo, std::shared_ptr<BasicTestLogFileInformation> basicTestLogFileInfo) { for (int i = 0; i < testStruct->tests.size(); i++) numericalTestStruct->tests.push_back(testStruct->tests.at(i)); diff --git a/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h b/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h index 70fcc7e2c0873a5aa4986075a1362081c0192645..7ed8b8b118c4c65ce0a3ee54e74fc5a96814de24 100644 --- a/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h +++ b/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h @@ -81,7 +81,7 @@ private: std::shared_ptr<LogFileWriter> makeLogFileWriter(std::vector<std::shared_ptr<TestLogFileInformation> > testLogFiles, std::shared_ptr<SimulationLogFileInformation> simLogInfo, std::vector<std::shared_ptr<SimulationInfo> > simInfo, std::string kernelName, double viscosity, int basicTimeStepLength, std::shared_ptr<LogFileParameterStruct> logFilePara, std::shared_ptr<BasicTestLogFileInformation> basicTestLogFileInfo); - void initTestStruct(std::shared_ptr<TestStruct> testStruct, std::shared_ptr<NumericalTestStruct> numericalTestStruct, std::vector<std::shared_ptr<TestLogFileInformation> > testLogFileInfo, std::shared_ptr<BasicTestLogFileInformation> basicTestLogFileInfo); + void initTestStruct(std::shared_ptr<TestStruct> testStruct, std::shared_ptr<NumericalTestStruct> numericalTestStruct, std::vector<std::shared_ptr<TestLogFileInformation> > &testLogFileInfo, std::shared_ptr<BasicTestLogFileInformation> basicTestLogFileInfo); std::vector<std::shared_ptr<TestSimulation> > myTestSimulations; std::shared_ptr<TestQueueImp> myTestQueue; diff --git a/targets/tests/NumericalTests/config.txt b/targets/tests/NumericalTests/config.txt index e710b02dcf16a04fc73f923035f97d2e940bed08..0293d229f60865a05e6dbf718dfe72c204dcd17f 100644 --- a/targets/tests/NumericalTests/config.txt +++ b/targets/tests/NumericalTests/config.txt @@ -6,7 +6,7 @@ Devices="1" ################################################## # Basic Simulation Parameter # ################################################## -KernelsToTest="CumulantF3CompSP27 BGKCompSP27 BGKPlusCompSP27" +KernelsToTest="BGKCompSP27 BGKPlusCompSP27 CumulantOneCompSP27 CumulantAA2016CompSP27 CumulantF3CompSP27" #BGKCompSP27 BGKPlusCompSP27 CumulantAA2016CompSP27 CumulantOneCompSP27 CumulantF3CompSP27 CumulantF32018CompSP27 CumulantAll4CompSP27 NumberOfTimeSteps=20 Viscosity="0.001" @@ -120,4 +120,4 @@ StartStepFileWriter=0 WriteAnalyResultsToVTK=true -PathLogFile="C:\Users\Timon\Documents\studienarbeitIRMB\logFiles\KleinerTest" \ No newline at end of file +PathLogFile="C:\Users\Timon\Documents\studienarbeitIRMB\logFiles" \ No newline at end of file diff --git a/targets/tests/NumericalTests/main.cpp b/targets/tests/NumericalTests/main.cpp index abf2d8b3cf1a91dd2956bee3f0b0b3b9835f8e12..0e6a3147548099270d150e2595d28f11010f7cd3 100644 --- a/targets/tests/NumericalTests/main.cpp +++ b/targets/tests/NumericalTests/main.cpp @@ -20,7 +20,7 @@ static void validateTestSuite() const int end = 20; const int l0 = 32; const double viscosity = 0.001; - std::string kernelName = "TGV"; + std::string kernelName = "Cum"; std::vector<int> xLength{32,64,128,256,512}; std::vector<int> zLength(xLength.size());