From 05491b002a7ad7550d99f20524ad00acd5acff49 Mon Sep 17 00:00:00 2001
From: Timon Habenicht <t.habenicht@tu-bs.de>
Date: Sat, 9 Feb 2019 14:52:54 +0100
Subject: [PATCH] adds BasicTestLogFileInformation
---
.../BasicTestLogFileInformation.cpp | 47 ++++++++
.../BasicTestLogFileInformation.h | 27 +++++
.../package.include | 0
.../LogFileWriter/LogFileWriterImp.cpp | 22 ++--
.../LogFileWriter/LogFileWriterImp.h | 5 +-
.../NumericalTestFactoryImp.cpp | 112 ++++++++++--------
.../NumericalTestFactoryImp.h | 2 +
targets/tests/NumericalTests/config.txt | 10 +-
8 files changed, 161 insertions(+), 64 deletions(-)
create mode 100644 targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.cpp
create mode 100644 targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.h
create mode 100644 targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/package.include
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.cpp b/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.cpp
new file mode 100644
index 000000000..b86f9e364
--- /dev/null
+++ b/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.cpp
@@ -0,0 +1,47 @@
+#include "BasicTestLogFileInformation.h"
+
+std::shared_ptr<BasicTestLogFileInformation> BasicTestLogFileInformation::getInstance()
+{
+ static std::shared_ptr<BasicTestLogFileInformation> uniqueInstance;
+ if (!uniqueInstance)
+ uniqueInstance = std::shared_ptr<BasicTestLogFileInformation>(new BasicTestLogFileInformation());
+ return uniqueInstance;
+}
+
+std::string BasicTestLogFileInformation::getOutput()
+{
+ if (!outputBuild)
+ buildOutput();
+ return oss.str();
+}
+
+void BasicTestLogFileInformation::addTest(std::string testName, bool testRun)
+{
+ bool isRegistered = false;
+ for (int i = 0; i < this->testName.size(); i++) {
+ if (this->testName.at(i) == testName)
+ isRegistered = true;
+ }
+ if (!isRegistered) {
+ this->testName.push_back(testName);
+ this->testRun.push_back(testRun);
+ }
+}
+
+BasicTestLogFileInformation::BasicTestLogFileInformation()
+{
+ testName.resize(0);
+ testRun.resize(0);
+ outputBuild = false;
+}
+
+void BasicTestLogFileInformation::buildOutput()
+{
+ makeCenterHead("Basic Test Information");
+
+ for (int i = 0; i < testName.size(); i++)
+ oss << testName.at(i) << "=" << std::boolalpha << testRun.at(i) << std::endl;
+ oss << std::endl;
+
+ outputBuild = true;
+}
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.h b/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.h
new file mode 100644
index 000000000..41144eb9a
--- /dev/null
+++ b/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.h
@@ -0,0 +1,27 @@
+#ifndef BASIC_TEST_LOGFILE_INFORMATION_H
+#define BASIC_TEST_LOGFILE_INFORMATION_H
+
+#include "../LogFileInformationImp.h"
+
+#include <iostream>
+#include <memory>
+#include <vector>
+
+class BasicTestLogFileInformation : public LogFileInformationImp
+{
+public:
+ static std::shared_ptr<BasicTestLogFileInformation> getInstance();
+
+ std::string getOutput();
+ void addTest(std::string testName, bool testRun);
+
+private:
+ BasicTestLogFileInformation();
+
+ void buildOutput();
+
+ bool outputBuild;
+ std::vector<std::string> testName;
+ std::vector<bool> testRun;
+};
+#endif
\ No newline at end of file
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/package.include
new file mode 100644
index 000000000..e69de29bb
diff --git a/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.cpp b/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.cpp
index ca2eaf96e..46a78e24b 100644
--- a/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.cpp
+++ b/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.cpp
@@ -1,30 +1,32 @@
#include "LogFileWriterImp.h"
-#include "Utilities\LogFileInformation\SimulationLogFileInformation\SimulationLogFileInformation.h"
-#include "Utilities\LogFileInformation\LogFileHead\LogFileHead.h"
-#include "Utilities\LogFileInformation\BasicSimulationInfo\BasicSimulationInfo.h"
-#include "Utilities\LogFileInformation\LogFileTimeInformation\LogFileTimeInformation.h"
-#include "Utilities\LogFileInformation\TestLogFileInformation\TestLogFileInformation.h"
+#include "Utilities/LogFileInformation/SimulationLogFileInformation/SimulationLogFileInformation.h"
+#include "Utilities/LogFileInformation/LogFileHead/LogFileHead.h"
+#include "Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h"
+#include "Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.h"
+#include "Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.h"
+#include "Utilities/LogFileInformation/TestLogFileInformation/TestLogFileInformation.h"
#include <helper_functions.h>
#include <iomanip>
#include <ctime>
#include <experimental/filesystem>
-LogFileWriterImp::LogFileWriterImp(std::shared_ptr<LogFileHead> logFileHead, std::shared_ptr<BasicSimulationInfo> basicSimInfo, std::vector<std::shared_ptr<TestLogFileInformation> > testLogFiles, std::shared_ptr<LogFileTimeInformation> logFileTimeInfo, std::shared_ptr<SimulationLogFileInformation> simLogInfo, std::string kernelName, double viscosity) : kernelName(kernelName), viscosity(viscosity)
+LogFileWriterImp::LogFileWriterImp(std::shared_ptr<LogFileHead> logFileHead, std::shared_ptr<BasicSimulationInfo> basicSimInfo, std::shared_ptr<BasicTestLogFileInformation> basicTestInfo, std::vector<std::shared_ptr<TestLogFileInformation> > testLogFiles, std::shared_ptr<LogFileTimeInformation> logFileTimeInfo, std::shared_ptr<SimulationLogFileInformation> simLogInfo, std::string kernelName, double viscosity) : kernelName(kernelName), viscosity(viscosity)
{
logFileInfo.push_back(logFileHead);
logFileInfo.push_back(basicSimInfo);
this->simLogInfo = simLogInfo;
logFileInfo.push_back(simLogInfo);
logFileInfo.push_back(logFileTimeInfo);
+ logFileInfo.push_back(basicTestInfo);
for (int i = 0; i < testLogFiles.size(); i++)
logFileInfo.push_back(testLogFiles.at(i));
}
-std::shared_ptr<LogFileWriterImp> LogFileWriterImp::getNewInstance(std::shared_ptr<LogFileHead> logFileHead, std::shared_ptr<BasicSimulationInfo> basicSimInfo, std::vector<std::shared_ptr<TestLogFileInformation> > testLogFiles, std::shared_ptr<LogFileTimeInformation> logFileTimeInfo, std::shared_ptr<SimulationLogFileInformation> simLogInfo, std::string kernelName, double viscosity)
+std::shared_ptr<LogFileWriterImp> LogFileWriterImp::getNewInstance(std::shared_ptr<LogFileHead> logFileHead, std::shared_ptr<BasicSimulationInfo> basicSimInfo, std::shared_ptr<BasicTestLogFileInformation> basicTestInfo, std::vector<std::shared_ptr<TestLogFileInformation> > testLogFiles, std::shared_ptr<LogFileTimeInformation> logFileTimeInfo, std::shared_ptr<SimulationLogFileInformation> simLogInfo, std::string kernelName, double viscosity)
{
- return std::shared_ptr<LogFileWriterImp>(new LogFileWriterImp(logFileHead, basicSimInfo, testLogFiles, logFileTimeInfo, simLogInfo, kernelName, viscosity));
+ return std::shared_ptr<LogFileWriterImp>(new LogFileWriterImp(logFileHead, basicSimInfo, basicTestInfo, testLogFiles, logFileTimeInfo, simLogInfo, kernelName, viscosity));
}
void LogFileWriterImp::writeLogFile(std::string basicFilePath)
@@ -51,12 +53,12 @@ std::string LogFileWriterImp::calcDateAndTime()
std::string LogFileWriterImp::buildFilePath(std::string basicFilePath)
{
std::ostringstream filePath;
- filePath << basicFilePath << simLogInfo->getFilePathExtensionOne() << "viscosity_" << viscosity << "\\" << simLogInfo->getFilePathExtensionTwo() << kernelName;
+ filePath << basicFilePath << simLogInfo->getFilePathExtensionOne() << "viscosity_" << viscosity << "/" << simLogInfo->getFilePathExtensionTwo() << kernelName;
std::experimental::filesystem::path dir(filePath.str());
if (!(std::experimental::filesystem::exists(dir)))
std::experimental::filesystem::create_directories(dir);
- filePath << "\\logfile_" << calcDateAndTime() << "_" << kernelName << "_vis_" << viscosity << ".txt";
+ filePath << "/logfile_" << calcDateAndTime() << "_" << kernelName << "_vis_" << viscosity << ".txt";
return filePath.str();
}
diff --git a/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.h b/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.h
index ec5919393..38ace4a81 100644
--- a/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.h
+++ b/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.h
@@ -8,6 +8,7 @@
#include <memory>
class BasicSimulationInfo;
+class BasicTestLogFileInformation;
class SimulationLogFileInformation;
class LogFileHead;
class LogFileInformation;
@@ -17,7 +18,7 @@ class TestLogFileInformation;
class LogFileWriterImp : public LogFileWriter
{
public:
- static std::shared_ptr<LogFileWriterImp> getNewInstance(std::shared_ptr<LogFileHead> logFileHead, std::shared_ptr<BasicSimulationInfo> basicSimInfo, std::vector<std::shared_ptr<TestLogFileInformation> > testLogFiles,
+ static std::shared_ptr<LogFileWriterImp> getNewInstance(std::shared_ptr<LogFileHead> logFileHead, std::shared_ptr<BasicSimulationInfo> basicSimInfo, std::shared_ptr<BasicTestLogFileInformation> basicTestInfo, std::vector<std::shared_ptr<TestLogFileInformation> > testLogFiles,
std::shared_ptr<LogFileTimeInformation> logFileTimeInfo,
std::shared_ptr<SimulationLogFileInformation> simLogInfo,
std::string kernelName, double viscosity);
@@ -25,7 +26,7 @@ public:
private:
- LogFileWriterImp(std::shared_ptr<LogFileHead> logFileHead, std::shared_ptr<BasicSimulationInfo> basicSimInfo, std::vector<std::shared_ptr<TestLogFileInformation> > testLogFiles, std::shared_ptr<LogFileTimeInformation> logFileTimeInfo, std::shared_ptr<SimulationLogFileInformation> simLogInfo, std::string kernelName, double viscosity);
+ LogFileWriterImp(std::shared_ptr<LogFileHead> logFileHead, std::shared_ptr<BasicSimulationInfo> basicSimInfo, std::shared_ptr<BasicTestLogFileInformation> basicTestInfo, std::vector<std::shared_ptr<TestLogFileInformation> > testLogFiles, std::shared_ptr<LogFileTimeInformation> logFileTimeInfo, std::shared_ptr<SimulationLogFileInformation> simLogInfo, std::string kernelName, double viscosity);
std::string calcDateAndTime();
std::string buildFilePath(std::string basicFilePath);
diff --git a/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.cpp b/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.cpp
index f38d1ae98..0f8a7a8bf 100644
--- a/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.cpp
+++ b/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.cpp
@@ -1,59 +1,60 @@
#include "NumericalTestFactoryImp.h"
-#include "Utilities\Structs\ConfigDataStruct.h"
-#include "Utilities\Structs\LogFileParameterStruct.h"
-#include "Utilities\Structs\NumericalTestStruct.h"
-#include "Utilities\Structs\SimulationDataStruct.h"
-#include "Utilities\Structs\TestSimulationDataStruct.h"
-
-#include "Simulations\TaylorGreenVortexUx\AnalyticalResults\AnalyticalResultsTaylorGreenVortexUx.h"
-#include "Simulations\TaylorGreenVortexUx\InitialConditions\InitialConditionTaylorGreenVortexUx.h"
+#include "Utilities/Structs/ConfigDataStruct.h"
+#include "Utilities/Structs/LogFileParameterStruct.h"
+#include "Utilities/Structs/NumericalTestStruct.h"
+#include "Utilities/Structs/SimulationDataStruct.h"
+#include "Utilities/Structs/TestSimulationDataStruct.h"
+
+#include "Simulations/TaylorGreenVortexUx/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUx.h"
+#include "Simulations/TaylorGreenVortexUx/InitialConditions/InitialConditionTaylorGreenVortexUx.h"
#include "Simulations/TaylorGreenVortexUx/LogFileInformation/LogFileInformationTaylorGreenVortexUx.h"
-#include "Simulations\TaylorGreenVortexUx\SimulationInfo\SimulationInfoTaylorGreenVortexUx.h"
+#include "Simulations/TaylorGreenVortexUx/SimulationInfo/SimulationInfoTaylorGreenVortexUx.h"
#include "Simulations/TaylorGreenVortexUx/SimulationParameter/SimulationParameterTaylorGreenVortexUx.h"
#include "Simulations/TaylorGreenVortexUz/SimulationParameter/SimulationParameterTaylorGreenVortexUz.h"
#include "Simulations/TaylorGreenVortexUz/LogFileInformation/LogFileInformationTaylorGreenvortexUz.h"
-#include "Simulations\TaylorGreenVortexUz\SimulationInfo\SimulationInfoTaylorGreenVortexUz.h"
-#include "Simulations\TaylorGreenVortexUz\AnalyticalResults\AnalyticalResultsTaylorGreenVortexUz.h"
-#include "Simulations\TaylorGreenVortexUz\InitialConditions\InitialConditionTaylorGreenVortexUz.h"
+#include "Simulations/TaylorGreenVortexUz/SimulationInfo/SimulationInfoTaylorGreenVortexUz.h"
+#include "Simulations/TaylorGreenVortexUz/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUz.h"
+#include "Simulations/TaylorGreenVortexUz/InitialConditions/InitialConditionTaylorGreenVortexUz.h"
#include "Simulations/ShearWave/SimulationParameter/ShearWaveSimulationParameter.h"
#include "Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h"
-#include "Simulations\ShearWave\SimulationInfo\ShearWaveSimulationInfo.h"
-#include "Simulations\ShearWave\AnalyticalResults\ShearWaveAnalyticalResults.h"
-#include "Simulations\ShearWave\InitialConditions\InitialConditionShearWave.h"
+#include "Simulations/ShearWave/SimulationInfo/ShearWaveSimulationInfo.h"
+#include "Simulations/ShearWave/AnalyticalResults/ShearWaveAnalyticalResults.h"
+#include "Simulations/ShearWave/InitialConditions/InitialConditionShearWave.h"
#include "Tests/PhiAndNyTest/PhiAndNyTest.h"
-#include "Tests\PhiAndNyTest\LogFileInformation\PhiAndNyLogFileInformation.h"
-#include "Tests\PhiAndNyTest\PostProcessingStrategy\PostProcessingStrategyPhiAndNyTest.h"
-#include "Tests\PhiAndNyTest\PhiAndNyTestStruct.h"
-
-#include "Tests\L2NormTest\L2NormTest.h"
-#include "Tests\L2NormTest\LogFileInformation\L2NormLogFileInformation.h"
-#include "Tests\L2NormTest\PostProcessingStrategy\PostProcessingStrategyL2NormTest.h"
-#include "Tests\L2NormTest\L2NormTestStruct.h"
-
-#include "Tests\L2NormTestBetweenKernels\L2NormTestBetweenKernels.h"
-#include "Tests\L2NormTestBetweenKernels\PostProcessingStrategy\L2NormBetweenKernelPostProcessingStrategy.h"
-#include "Tests\L2NormTestBetweenKernels\LogFileInformation\L2NormLogFileInformationBetweenKernels.h"
-#include "Tests\L2NormTestBetweenKernels\L2NormTestBetweenKernelsStruct.h"
-
-#include "Utilities\ColorConsoleOutput\ColorConsoleOutputImp.h"
-#include "Utilities\DataWriter\AnalyticalResults2DToVTKWriter\AnalyticalResults2DToVTKWriterImp.h"
-#include "Utilities\DataWriter\Y2dSliceToResults\Y2dSliceToResults.h"
-
-#include "Utilities\LogFileInformation\LogFileHead\LogFileHead.h"
-#include "Utilities\LogFileInformation\BasicSimulationInfo\BasicSimulationInfo.h"
-#include "Utilities\LogFileInformation\LogFileInformationImp.h"
-#include "Utilities\LogFileInformation\LogFileTimeInformation\LogFileTimeInformation.h"
-#include "Utilities\LogFileWriter\LogFileWriterImp.h"
-#include "Utilities\LogFileQueue\LogFileQueueImp.h"
-
-#include "Utilities\Results\SimulationResults\SimulationResults.h"
-#include "Utilities\TestQueue\TestQueueImp.h"
+#include "Tests/PhiAndNyTest/LogFileInformation/PhiAndNyLogFileInformation.h"
+#include "Tests/PhiAndNyTest/PostProcessingStrategy/PostProcessingStrategyPhiAndNyTest.h"
+#include "Tests/PhiAndNyTest/PhiAndNyTestStruct.h"
+
+#include "Tests/L2NormTest/L2NormTest.h"
+#include "Tests/L2NormTest/LogFileInformation/L2NormLogFileInformation.h"
+#include "Tests/L2NormTest/PostProcessingStrategy/PostProcessingStrategyL2NormTest.h"
+#include "Tests/L2NormTest/L2NormTestStruct.h"
+
+#include "Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernels.h"
+#include "Tests/L2NormTestBetweenKernels/PostProcessingStrategy/L2NormBetweenKernelPostProcessingStrategy.h"
+#include "Tests/L2NormTestBetweenKernels/LogFileInformation/L2NormLogFileInformationBetweenKernels.h"
+#include "Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernelsStruct.h"
+
+#include "Utilities/ColorConsoleOutput/ColorConsoleOutputImp.h"
+#include "Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.h"
+#include "Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.h"
+
+#include "Utilities/LogFileInformation/LogFileHead/LogFileHead.h"
+#include "Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h"
+#include "Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.h"
+#include "Utilities/LogFileInformation/LogFileInformationImp.h"
+#include "Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.h"
+#include "Utilities/LogFileWriter/LogFileWriterImp.h"
+#include "Utilities/LogFileQueue/LogFileQueueImp.h"
+
+#include "Utilities/Results/SimulationResults/SimulationResults.h"
+#include "Utilities/TestQueue/TestQueueImp.h"
#include "Utilities/TestSimulation/TestSimulationImp.h"
-#include "Utilities\Time\TimeImp.h"
+#include "Utilities/Time/TimeImp.h"
#include <algorithm>
@@ -64,6 +65,7 @@ std::shared_ptr<NumericalTestFactoryImp> NumericalTestFactoryImp::getNewInstance
NumericalTestFactoryImp::NumericalTestFactoryImp(std::shared_ptr<ConfigDataStruct> configFileData)
{
+ basicTestLogFileInfo = BasicTestLogFileInformation::getInstance();
colorOutput = ColorConsoleOutputImp::getInstance();
myTestQueue = TestQueueImp::getNewInstance(colorOutput);
myLogFileWriterQueue = LogFileQueueImp::getNewInstance(configFileData->logFilePath);
@@ -135,20 +137,36 @@ std::shared_ptr<NumericalTestStruct> NumericalTestFactoryImp::makeNumericalTestS
std::shared_ptr<PhiAndNyTestStruct> phiAndNyTestStruct = makePhiAndNyTestsStructs(configFileData->phiAndNuTestParameter, testSim, viscosity);
for (int i = 0; i < phiAndNyTestStruct->tests.size(); i++)
numTestStruct->tests.push_back(phiAndNyTestStruct->tests.at(i));
- if(phiAndNyTestStruct->tests.size() > 0)
+ if (phiAndNyTestStruct->tests.size() > 0) {
testLogFileInfo.push_back(phiAndNyTestStruct->logFileInfo);
+ basicTestLogFileInfo->addTest("PhiAndNyTest", true);
+ }
+ else {
+ basicTestLogFileInfo->addTest("PhiAndNyTest", false);
+ }
+
std::shared_ptr<L2NormTestStruct> l2NormTestSruct = makeL2NormTestsStructs(configFileData->l2NormTestParameter, testSim);
for (int i = 0; i < l2NormTestSruct->tests.size(); i++)
numTestStruct->tests.push_back(l2NormTestSruct->tests.at(i));
- if (l2NormTestSruct->tests.size() > 0)
+ if (l2NormTestSruct->tests.size() > 0) {
testLogFileInfo.push_back(l2NormTestSruct->logFileInfo);
+ basicTestLogFileInfo->addTest("L2NormTest", true);
+ }
+ else {
+ basicTestLogFileInfo->addTest("L2NormTest", false);
+ }
std::shared_ptr<L2NormTestBetweenKernelsStruct> l2NormTestBetweenKernelStruct = makeL2NormTestsBetweenKernelsStructs(configFileData->l2NormTestBetweenKernelsParameter, testSim, kernel);
for (int i = 0; i < l2NormTestBetweenKernelStruct->tests.size(); i++)
numTestStruct->tests.push_back(l2NormTestBetweenKernelStruct->tests.at(i));
- if (l2NormTestBetweenKernelStruct->tests.size() > 0)
+ if (l2NormTestBetweenKernelStruct->tests.size() > 0) {
testLogFileInfo.push_back(l2NormTestBetweenKernelStruct->logFileInfo);
+ basicTestLogFileInfo->addTest("L2NormTestBetweenKernel", true);
+ }
+ else {
+ basicTestLogFileInfo->addTest("L2NormTestBetweenKernel", false);
+ }
std::vector<std::shared_ptr<SimulationInfo> > simInfo;
for (int i = 0; i < simDataStruct->testSimData.size(); i++)
@@ -408,7 +426,7 @@ std::shared_ptr<LogFileWriter> NumericalTestFactoryImp::makeLogFileWriter(std::v
std::shared_ptr<LogFileTimeInformation> logFileTimeInfo = LogFileTimeInformation::getNewInstance(simInfo, logFilePara->writeAnalyticalToVTK);
- std::shared_ptr<LogFileWriterImp> logFileWriter = LogFileWriterImp::getNewInstance(logFileHead, basicSimInfo, testLogFiles, logFileTimeInfo, simLogInfo, kernelName, viscosity);
+ std::shared_ptr<LogFileWriterImp> logFileWriter = LogFileWriterImp::getNewInstance(logFileHead, basicSimInfo, basicTestLogFileInfo, testLogFiles, logFileTimeInfo, simLogInfo, kernelName, viscosity);
return logFileWriter;
}
\ No newline at end of file
diff --git a/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h b/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h
index d7ecb2f36..ae895b65e 100644
--- a/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h
+++ b/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h
@@ -21,6 +21,7 @@ struct TestSimulationDataStruct;
struct VectorWriterInformationStruct;
class AnalyticalResults2DToVTKWriter;
+class BasicTestLogFileInformation;
class ColorConsoleOutput;
class L2NormTest;
class L2NormPostProcessingStrategy;
@@ -84,6 +85,7 @@ private:
std::shared_ptr<ColorConsoleOutput> colorOutput;
std::shared_ptr<AnalyticalResults2DToVTKWriter> anaResultWriter;
+ std::shared_ptr<BasicTestLogFileInformation> basicTestLogFileInfo;
int simID;
int numberOfSimulations;
diff --git a/targets/tests/NumericalTests/config.txt b/targets/tests/NumericalTests/config.txt
index c55f8e2ee..e0bec2e25 100644
--- a/targets/tests/NumericalTests/config.txt
+++ b/targets/tests/NumericalTests/config.txt
@@ -59,7 +59,7 @@ DivergentTimeStep_L2=20
##################################################
# L2-Norm Test Between Kernels Parameter #
##################################################
-L2NormBetweenKernelsTest=false
+L2NormBetweenKernelsTest=true
BasicKernel_L2NormBetweenKernels=CumulantOneCompSP27
Timesteps_L2NormBetweenKernels="0 20"
DataToCalc_L2NormBetweenKernels="Vx"
@@ -68,19 +68,19 @@ DataToCalc_L2NormBetweenKernels="Vx"
# Simulation To Perform #
##################################################
TaylorGreenVortexUx32=true
-TaylorGreenVortexUx64=false
+TaylorGreenVortexUx64=true
TaylorGreenVortexUx128=false
TaylorGreenVortexUx256=false
TaylorGreenVortexUx512=false
TaylorGreenVortexUz32=true
-TaylorGreenVortexUz64=false
+TaylorGreenVortexUz64=true
TaylorGreenVortexUz128=false
TaylorGreenVortexUz256=false
TaylorGreenVortexUz512=false
ShearWave32=true
-ShearWave64=false
+ShearWave64=true
ShearWave128=false
ShearWave256=false
ShearWave512=false
@@ -103,6 +103,6 @@ WriteVTKFiles=true
PathForVTKFileWriting="C:\Users\Timon\Documents\studienarbeitIRMB\Output"
StartStepFileWriter=0
-WriteAnalyResultsToVTK=false
+WriteAnalyResultsToVTK=true
PathLogFile="C:\Users\Timon\Documents\studienarbeitIRMB\logFiles"
\ No newline at end of file
--
GitLab