diff --git a/targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.cpp b/targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.cpp
index a24b51d2c16986f46b5198f35ee25996eda6845c..995f0c91134aaa4aadd40ffaa4e2e85749cc1b56 100644
--- a/targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.cpp
+++ b/targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.cpp
@@ -10,8 +10,8 @@
InitialConditionShearWave::InitialConditionShearWave(std::shared_ptr<ShearWaveParameterStruct> simParaStruct, std::shared_ptr<GridInformationStruct> gridInfoStruct)
{
this->l0 = simParaStruct->l0;
- this->lx = lx;
- this->lz = lz;
+ this->lx = gridInfoStruct->lx;
+ this->lz = gridInfoStruct->lz;
this->rho = simParaStruct->rho0;
this->u0 = simParaStruct->ux;
this->v0 = simParaStruct->uz;
diff --git a/targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp b/targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp
index 45aa561df203338071f4900b0a7dbc86fae7e211..0c98fc427a1f25c1e23c00bf6775ac68be28dc79 100644
--- a/targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp
+++ b/targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp
@@ -11,11 +11,20 @@ std::shared_ptr<ShearWaveInformation> ShearWaveInformation::getNewInstance(std::
std::string ShearWaveInformation::getOutput()
{
makeCenterHead("ShearWave Information");
+ oss << "SimulationName=ShearWave" << std::endl;
+ oss << "Lx=\"";
for (int i = 0; i < lx.size(); i++) {
- oss << "Lx=" << lx.at(i) << std::endl;
- oss << "l0=" << l0 << std::endl;
- oss << "ux=" << ux / (lx.at(i) / l0) << std::endl;
- oss << "uz=" << uz / (lx.at(i) / l0) << std::endl;
+ oss << lx.at(i);
+ if (i < lx.size() - 1)
+ oss << " ";
+ else
+ oss << "\"" << std::endl << std::endl;
+ }
+
+ for (int i = 0; i < lx.size(); i++) {
+ oss << "l0_" << lx.at(i) << "=" << l0 << std::endl;
+ oss << "ux_" << lx.at(i) << "=" << ux / (lx.at(i) / l0) << std::endl;
+ oss << "uz_" << lx.at(i) << "=" << uz / (lx.at(i) / l0) << std::endl;
oss << std::endl;
}
return oss.str();
diff --git a/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/LogFileInformationTaylorGreenVortexUx.cpp b/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/LogFileInformationTaylorGreenVortexUx.cpp
index 4b09fa3e01a61c572b54ff6f4dc31ec7a4017734..bfe7087df904870f5ed6f78c47e9f2af2e2d845f 100644
--- a/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/LogFileInformationTaylorGreenVortexUx.cpp
+++ b/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/LogFileInformationTaylorGreenVortexUx.cpp
@@ -10,12 +10,21 @@ std::shared_ptr<LogFileInformationTaylorGreenUx> LogFileInformationTaylorGreenUx
std::string LogFileInformationTaylorGreenUx::getOutput()
{
- makeCenterHead("TaylorGreenVortex U0 Information");
+ makeCenterHead("TaylorGreenVortex Ux Information");
+ oss << "SimulationName=TaylorGreenVortexUx" << std::endl;
+ oss << "Lx=\"";
for (int i = 0; i < lx.size(); i++) {
- oss << "Lx=" << lx.at(i) << std::endl;
- oss << "ux=" << ux / (lx.at(i) / l0) << std::endl;
- oss << "Amplitude= " << amplitude / (lx.at(i) / l0) << std::endl;
- oss << "l0=" << l0 << std::endl;
+ oss << lx.at(i);
+ if (i < lx.size() - 1)
+ oss << " ";
+ else
+ oss << "\"" << std::endl << std::endl;
+ }
+
+ for (int i = 0; i < lx.size(); i++) {
+ oss << "ux_" << lx.at(i) << "=" << ux / (lx.at(i) / l0) << std::endl;
+ oss << "Amplitude_"<< lx.at(i) << "=" << amplitude / (lx.at(i) / l0) << std::endl;
+ oss << "l0_" << lx.at(i) << "=" << l0 << std::endl;
oss << std::endl;
}
diff --git a/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/LogFileInformationTaylorGreenVortexUz.cpp b/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/LogFileInformationTaylorGreenVortexUz.cpp
index 48693c653b6c44f2a7f9652ce93718d41813c261..34bf4595e67dd0c2be0147bc05638e804726fa10 100644
--- a/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/LogFileInformationTaylorGreenVortexUz.cpp
+++ b/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/LogFileInformationTaylorGreenVortexUz.cpp
@@ -10,11 +10,20 @@ std::shared_ptr<LogFileInformationTaylorGreenUz> LogFileInformationTaylorGreenUz
std::string LogFileInformationTaylorGreenUz::getOutput()
{
makeCenterHead("TaylorGreenVortex V0 Information");
+ oss << "SimulationName=TaylorGreenVortexUz" << std::endl;
+ oss << "Lz=\"";
for (int i = 0; i < lz.size(); i++) {
- oss << "Lz=" << lz.at(i) << std::endl;
- oss << "l0=" << l0 << std::endl;
- oss << "uz=" << uz / (lz.at(i) / l0) << std::endl;
- oss << "Amplitude=" << amplitude / (lz.at(i) / l0) << std::endl;
+ oss << lz.at(i);
+ if (i < lz.size() - 1)
+ oss << " ";
+ else
+ oss << "\"" << std::endl << std::endl;
+ }
+
+ for (int i = 0; i < lz.size(); i++) {
+ oss << "l0_" << lz.at(i) << "=" << l0 << std::endl;
+ oss << "uz_" << lz.at(i) << "=" << uz / (lz.at(i) / l0) << std::endl;
+ oss << "Amplitude_" << lz.at(i) << "=" << amplitude / (lz.at(i) / l0) << std::endl;
oss << std::endl;
}
diff --git a/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp b/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp
index cc36ad2d5e63426c1fefcd671ceaaf1252296beb..c9bf4fd8412abcb39a3f5459cd85aaba2f9588fc 100644
--- a/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp
+++ b/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp
@@ -27,7 +27,7 @@ void ConfigFileReader::readConfigFile(const std::string aFilePath)
configData->viscosity = StringUtil::toDoubleVector(input->getValue("Viscosity"));
configData->kernelsToTest = readKernelList(input);
- configData->writeAnalyticalToVTK = StringUtil::toBool(input->getValue("WriteVTKFiles"));
+ configData->writeAnalyticalToVTK = StringUtil::toBool(input->getValue("WriteAnalyResultsToVTK"));
configData->ySliceForCalculation = StringUtil::toInt(input->getValue("ySliceForCalculation"));;
configData->logFilePath = input->getValue("PathLogFile");
configData->numberOfSimulations = calcNumberOfSimulations(input);
@@ -281,7 +281,7 @@ std::shared_ptr<LogFileParameterStruct> ConfigFileReader::makeLogFilePara(std::s
std::shared_ptr<LogFileParameterStruct> logFilePara = std::shared_ptr<LogFileParameterStruct>(new LogFileParameterStruct);
logFilePara->devices = StringUtil::toIntVector(input->getValue("Devices"));
logFilePara->numberOfTimeSteps = StringUtil::toInt(input->getValue("NumberOfTimeSteps"));
- logFilePara->writeAnalyticalToVTK = StringUtil::toBool(input->getValue("WriteVTKFiles"));
+ logFilePara->writeAnalyticalToVTK = StringUtil::toBool(input->getValue("WriteAnalyResultsToVTK"));
return logFilePara;
}
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/LogFileHead.cpp b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/LogFileHead.cpp
index a52b50cdf57f162408dadd33cd3ebfadbe0cb6af..e77aa1461df8699507ca29d6b5ec4ad168a6aa66 100644
--- a/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/LogFileHead.cpp
+++ b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/LogFileHead.cpp
@@ -21,10 +21,15 @@ std::string LogFileHead::getOutput()
oss << "Time=" << std::setw(2) << std::setfill('0') << nowLocal.tm_hour << ":" << std::setw(2) << nowLocal.tm_min << ":" << std::setw(2) << nowLocal.tm_sec << std::endl;
oss << std::endl;
+ oss << "GPU_Devices=\"";
for (int i = 0; i < devices.size(); i++) {
cudaDeviceProp prop;
cudaGetDeviceProperties(&prop, devices.at(i));
- oss << "GPU_Device" << devices.at(i) << "=" << prop.name << std::endl;
+ oss << prop.name;
+ if (i < devices.size() - 1)
+ oss << " ";
+ else
+ oss << "\"" << std::endl;
}
oss << std::endl;
diff --git a/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.cpp b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.cpp
index fd140c1d01478d3a0b65661e29440105b11811a7..b67fa0dc3c2aa27dcbcf9d2f37d515dab165dde9 100644
--- a/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.cpp
+++ b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.cpp
@@ -12,13 +12,10 @@ std::shared_ptr<LogFileTimeInformation> LogFileTimeInformation::getNewInstance(s
std::string LogFileTimeInformation::getOutput()
{
makeCenterHead("Simulation Time Information");
- oss << "FileWriting=" << std::boolalpha << fileWriting <<std::endl;
- oss << std::endl;
- oss << std::left << std::setfill(' ') << std::setw(11) << "" << "TestName \t \t \t" << " L\t\t" << "Time for Test" << std::endl;
- oss << std::endl;
- for (int i = 0; i < simInfo.size(); i++)
- oss << simInfo.at(i)->getRunTimeOutput();
- oss << std::endl;
+ oss << "VTKFileWriting=" << std::boolalpha << fileWriting <<std::endl << std::endl;
+ for (int i = 0; i < simInfo.size(); i++) {
+ oss << simInfo.at(i)->getRunTimeOutput() << std::endl;
+ }
return oss.str();
}
diff --git a/targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.cpp b/targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.cpp
index 889d74988206dd1001132afc59b441f9c967b9f8..d900a338e2dec5e8f8a403573c59fe9e35d13877 100644
--- a/targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.cpp
+++ b/targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.cpp
@@ -48,9 +48,9 @@ int SimulationInfoImp::getSimulationID()
std::string SimulationInfoImp::getRunTimeOutput()
{
std::ostringstream oss;
- oss << std::left << std::setfill(' ') << std::setw(11) << "Simulation" << std::setw(17) << simulationName << "\t" << std::right << std::setw(3) << lx << "\t\t" << std::setw(9) << timeInfo->getSimulationTime() << std::endl;
- oss << std::left << std::setfill(' ') << std::setw(11) << "Test" << std::setw(17) << simulationName << "\t" << std::right << std::setw(3) << lx << "\t\t" << std::setw(9) << timeInfo->getTestTime() << std::endl;
- oss << std::left << std::setfill(' ') << std::setw(11) << "FileWriting" << std::setw(17) << simulationName << "\t" << std::right << std::setw(3) << lx << "\t\t" << std::setw(9) << timeInfo->getAnalyticalResultWriteTime() << std::endl;
+ oss << "SimulationTime_" << lx << "=" << timeInfo->getSimulationTime() << std::endl;
+ oss << "TestTime_" << lx << "=" << timeInfo->getTestTime() << std::endl;
+ oss << "AnalyticalVTKFileWritingTime_" << lx << "=" << timeInfo->getAnalyticalResultWriteTime() << std::endl;
return oss.str();
}
diff --git a/targets/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp b/targets/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp
index 013b3eae1cbeda3c7819ca5b88aec6045e9d32df..72f8366274aecae1e7c90ccfacb799cc1b076901 100644
--- a/targets/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp
+++ b/targets/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp
@@ -31,7 +31,6 @@ TestSimulationImp::TestSimulationImp(std::shared_ptr<TestSimulationDataStruct> t
this->anaResultWriter = anaResultWriter;
this->colorOutput = colorOutput;
-
this->simObserver.resize(0);
this->simualtionRun = false;
}
diff --git a/targets/tests/NumericalTests/config.txt b/targets/tests/NumericalTests/config.txt
index 6433ae5f8ce274afb63cb0ebda8fbebaab6e3fad..a8d7a677028a8007328ce1ca7eb68098e2aec4f3 100644
--- a/targets/tests/NumericalTests/config.txt
+++ b/targets/tests/NumericalTests/config.txt
@@ -6,7 +6,8 @@ Devices="1"
##################################################
# Basic Simulation Parameter #
##################################################
-KernelsToTest="CumulantOneCompSP27 CumulantAA2016CompSP27 CumulantAll4CompSP27"
+KernelsToTest="CumulantOneCompSP27"
+ CumulantAA2016CompSP27 CumulantAll4CompSP27"
NumberOfTimeSteps=20
Viscosity="0.001"
Rho0=1.0
@@ -19,7 +20,7 @@ ux_TGV_Ux="0.032"
Amplitude_TGV_Ux="0.01"
l0_TGV_Ux=32
-BasisTimeStepLength_TGV_Uz="100"
+BasisTimeStepLength_TGV_Uz="1000"
uz_TGV_Uz="0.048"
Amplitude_TGV_Uz="0.01"
l0_TGV_Uz=48
@@ -49,7 +50,7 @@ EndTimeStepCalculation_PhiNu=20
##################################################
# L2-Norm Test Parameter #
##################################################
-L2NormTest=true
+L2NormTest=false
MaxL2NormDiff=2.5
DataToCalc_L2="Vx"
BasicTimeStep_L2=0
@@ -58,7 +59,7 @@ DivergentTimeStep_L2=20
##################################################
# L2-Norm Test Between Kernels Parameter #
##################################################
-L2NormBetweenKernelsTest=true
+L2NormBetweenKernelsTest=false
BasicKernel_L2NormBetweenKernels=CumulantOneCompSP27
Timesteps_L2NormBetweenKernels="0 20"
DataToCalc_L2NormBetweenKernels="Vx"
@@ -66,8 +67,8 @@ DataToCalc_L2NormBetweenKernels="Vx"
##################################################
# Simulation To Perform #
##################################################
-TaylorGreenVortexUx32=true
-TaylorGreenVortexUx64=true
+TaylorGreenVortexUx32=false
+TaylorGreenVortexUx64=false
TaylorGreenVortexUx128=false
TaylorGreenVortexUx256=false
TaylorGreenVortexUx512=false
@@ -78,8 +79,8 @@ TaylorGreenVortexUz128=false
TaylorGreenVortexUz256=false
TaylorGreenVortexUz512=false
-ShearWave32=false
-ShearWave64=false
+ShearWave32=true
+ShearWave64=true
ShearWave128=false
ShearWave256=false
ShearWave512=false