diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3637910de2ed4b9e69c2dc7da9a657778cb7dd91..71fd19c00c8f78cdd67a25ca11758ab3903cea38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,6 +178,6 @@ endif()
if(HULC.BUILD_NUMERIC_TESTS)
add_subdirectory(3rdParty/fftw/fftw-3.3.7)
- add_subdirectory(targets/tests/TestingHULC)
+ add_subdirectory(targets/tests/NumericalTests)
endif()
diff --git a/targets/tests/TestingHULC/3rdPartyLinking.cmake b/targets/tests/NumericalTests/3rdPartyLinking.cmake
similarity index 100%
rename from targets/tests/TestingHULC/3rdPartyLinking.cmake
rename to targets/tests/NumericalTests/3rdPartyLinking.cmake
diff --git a/targets/tests/TestingHULC/CMakeLists.txt b/targets/tests/NumericalTests/CMakeLists.txt
similarity index 100%
rename from targets/tests/TestingHULC/CMakeLists.txt
rename to targets/tests/NumericalTests/CMakeLists.txt
diff --git a/targets/tests/TestingHULC/CMakePackage.cmake b/targets/tests/NumericalTests/CMakePackage.cmake
similarity index 100%
rename from targets/tests/TestingHULC/CMakePackage.cmake
rename to targets/tests/NumericalTests/CMakePackage.cmake
diff --git a/targets/tests/TestingHULC/TaylorGreenVortex/package.include b/targets/tests/NumericalTests/TaylorGreenVortex/package.include
similarity index 100%
rename from targets/tests/TestingHULC/TaylorGreenVortex/package.include
rename to targets/tests/NumericalTests/TaylorGreenVortex/package.include
diff --git a/targets/tests/TestingHULC/Tests/DataCollector/DataCollector.cpp b/targets/tests/NumericalTests/Tests/DataCollector/DataCollector.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Tests/DataCollector/DataCollector.cpp
rename to targets/tests/NumericalTests/Tests/DataCollector/DataCollector.cpp
diff --git a/targets/tests/TestingHULC/Tests/DataCollector/DataCollector.h b/targets/tests/NumericalTests/Tests/DataCollector/DataCollector.h
similarity index 100%
rename from targets/tests/TestingHULC/Tests/DataCollector/DataCollector.h
rename to targets/tests/NumericalTests/Tests/DataCollector/DataCollector.h
diff --git a/targets/tests/TestingHULC/Tests/DataCollector/package.include b/targets/tests/NumericalTests/Tests/DataCollector/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Tests/DataCollector/package.include
rename to targets/tests/NumericalTests/Tests/DataCollector/package.include
diff --git a/targets/tests/TestingHULC/Tests/DataQueue/DataQueue.cpp b/targets/tests/NumericalTests/Tests/DataQueue/DataQueue.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Tests/DataQueue/DataQueue.cpp
rename to targets/tests/NumericalTests/Tests/DataQueue/DataQueue.cpp
diff --git a/targets/tests/TestingHULC/Tests/DataQueue/DataQueue.h b/targets/tests/NumericalTests/Tests/DataQueue/DataQueue.h
similarity index 100%
rename from targets/tests/TestingHULC/Tests/DataQueue/DataQueue.h
rename to targets/tests/NumericalTests/Tests/DataQueue/DataQueue.h
diff --git a/targets/tests/TestingHULC/Tests/DataQueue/package.include b/targets/tests/NumericalTests/Tests/DataQueue/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Tests/DataQueue/package.include
rename to targets/tests/NumericalTests/Tests/DataQueue/package.include
diff --git a/targets/tests/TestingHULC/Tests/OrderOfAccuracy/OrderOfAccuracy.cpp b/targets/tests/NumericalTests/Tests/OrderOfAccuracy/OrderOfAccuracy.cpp
similarity index 71%
rename from targets/tests/TestingHULC/Tests/OrderOfAccuracy/OrderOfAccuracy.cpp
rename to targets/tests/NumericalTests/Tests/OrderOfAccuracy/OrderOfAccuracy.cpp
index 1ea96dd2812d2991487bb255acdefe00e5463b0a..eaefbdb1b30204dafbaae221030c0eaac7bb142f 100644
--- a/targets/tests/TestingHULC/Tests/OrderOfAccuracy/OrderOfAccuracy.cpp
+++ b/targets/tests/NumericalTests/Tests/OrderOfAccuracy/OrderOfAccuracy.cpp
@@ -6,7 +6,7 @@
TEST_P(OrderOfAccuracy, Test) {
DataQueue input = GetParam();
if (input.expected) {
- TEST_COUT(input.testName, input.la, input.lb, input.valueName, input.valueName, "OrderOfAccuracy", input.a, input.b, input.orderOfAccuracy);
+ //TEST_COUT(input.testName, input.la, input.lb, input.valueName, input.valueName, "OrderOfAccuracy", input.a, input.b, input.orderOfAccuracy);
}
ASSERT_THAT(OrderOfAccuracy::test(input.orderOfAccuracy, input.minOrderOfAccuracy), Eq(input.expected));
}
diff --git a/targets/tests/TestingHULC/Tests/OrderOfAccuracy/OrderOfAccuracy.h b/targets/tests/NumericalTests/Tests/OrderOfAccuracy/OrderOfAccuracy.h
similarity index 100%
rename from targets/tests/TestingHULC/Tests/OrderOfAccuracy/OrderOfAccuracy.h
rename to targets/tests/NumericalTests/Tests/OrderOfAccuracy/OrderOfAccuracy.h
diff --git a/targets/tests/TestingHULC/Tests/OrderOfAccuracy/package.include b/targets/tests/NumericalTests/Tests/OrderOfAccuracy/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Tests/OrderOfAccuracy/package.include
rename to targets/tests/NumericalTests/Tests/OrderOfAccuracy/package.include
diff --git a/targets/tests/TestingHULC/Tests/PhiAndNuTest/PhiAndNuTest.cpp b/targets/tests/NumericalTests/Tests/PhiAndNuTest/PhiAndNuTest.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Tests/PhiAndNuTest/PhiAndNuTest.cpp
rename to targets/tests/NumericalTests/Tests/PhiAndNuTest/PhiAndNuTest.cpp
diff --git a/targets/tests/TestingHULC/Tests/PhiAndNuTest/PhiAndNuTest.h b/targets/tests/NumericalTests/Tests/PhiAndNuTest/PhiAndNuTest.h
similarity index 100%
rename from targets/tests/TestingHULC/Tests/PhiAndNuTest/PhiAndNuTest.h
rename to targets/tests/NumericalTests/Tests/PhiAndNuTest/PhiAndNuTest.h
diff --git a/targets/tests/TestingHULC/Tests/PhiAndNuTest/package.include b/targets/tests/NumericalTests/Tests/PhiAndNuTest/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Tests/PhiAndNuTest/package.include
rename to targets/tests/NumericalTests/Tests/PhiAndNuTest/package.include
diff --git a/targets/tests/TestingHULC/Utilities/AnalyticalResultProvider/AnalyticalResultProvider.cpp b/targets/tests/NumericalTests/Utilities/AnalyticalResultProvider/AnalyticalResultProvider.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/AnalyticalResultProvider/AnalyticalResultProvider.cpp
rename to targets/tests/NumericalTests/Utilities/AnalyticalResultProvider/AnalyticalResultProvider.cpp
diff --git a/targets/tests/TestingHULC/Utilities/AnalyticalResultProvider/AnalyticalResultProvider.h b/targets/tests/NumericalTests/Utilities/AnalyticalResultProvider/AnalyticalResultProvider.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/AnalyticalResultProvider/AnalyticalResultProvider.h
rename to targets/tests/NumericalTests/Utilities/AnalyticalResultProvider/AnalyticalResultProvider.h
diff --git a/targets/tests/TestingHULC/Utilities/AnalyticalResultProvider/TaylorGreenVortex/TaylorGreenAnalytical.cpp b/targets/tests/NumericalTests/Utilities/AnalyticalResultProvider/TaylorGreenVortex/TaylorGreenAnalytical.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/AnalyticalResultProvider/TaylorGreenVortex/TaylorGreenAnalytical.cpp
rename to targets/tests/NumericalTests/Utilities/AnalyticalResultProvider/TaylorGreenVortex/TaylorGreenAnalytical.cpp
diff --git a/targets/tests/TestingHULC/Utilities/AnalyticalResultProvider/TaylorGreenVortex/TaylorGreenAnalytical.h b/targets/tests/NumericalTests/Utilities/AnalyticalResultProvider/TaylorGreenVortex/TaylorGreenAnalytical.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/AnalyticalResultProvider/TaylorGreenVortex/TaylorGreenAnalytical.h
rename to targets/tests/NumericalTests/Utilities/AnalyticalResultProvider/TaylorGreenVortex/TaylorGreenAnalytical.h
diff --git a/targets/tests/TestingHULC/Utilities/AnalyticalResultProvider/TaylorGreenVortex/package.include b/targets/tests/NumericalTests/Utilities/AnalyticalResultProvider/TaylorGreenVortex/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/AnalyticalResultProvider/TaylorGreenVortex/package.include
rename to targets/tests/NumericalTests/Utilities/AnalyticalResultProvider/TaylorGreenVortex/package.include
diff --git a/targets/tests/TestingHULC/Utilities/AnalyticalResultProvider/package.include b/targets/tests/NumericalTests/Utilities/AnalyticalResultProvider/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/AnalyticalResultProvider/package.include
rename to targets/tests/NumericalTests/Utilities/AnalyticalResultProvider/package.include
diff --git a/targets/tests/TestingHULC/Utilities/Calculator/Calculator.h b/targets/tests/NumericalTests/Utilities/Calculator/Calculator.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Calculator/Calculator.h
rename to targets/tests/NumericalTests/Utilities/Calculator/Calculator.h
diff --git a/targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/FFTCalculator.cpp b/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/FFTCalculator.cpp
rename to targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.cpp
diff --git a/targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/FFTCalculator.h b/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/FFTCalculator.h
rename to targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.h
diff --git a/targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/VxFFTCalculator/VxFFTCalculator.cpp b/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/VxFFTCalculator/VxFFTCalculator.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/VxFFTCalculator/VxFFTCalculator.cpp
rename to targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/VxFFTCalculator/VxFFTCalculator.cpp
diff --git a/targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/VxFFTCalculator/VxFFTCalculator.h b/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/VxFFTCalculator/VxFFTCalculator.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/VxFFTCalculator/VxFFTCalculator.h
rename to targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/VxFFTCalculator/VxFFTCalculator.h
diff --git a/targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/VxFFTCalculator/package.include b/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/VxFFTCalculator/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/VxFFTCalculator/package.include
rename to targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/VxFFTCalculator/package.include
diff --git a/targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/VzFFTCalculator/VzFFTCalculator.cpp b/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/VzFFTCalculator/VzFFTCalculator.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/VzFFTCalculator/VzFFTCalculator.cpp
rename to targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/VzFFTCalculator/VzFFTCalculator.cpp
diff --git a/targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/VzFFTCalculator/VzFFTCalculator.h b/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/VzFFTCalculator/VzFFTCalculator.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/VzFFTCalculator/VzFFTCalculator.h
rename to targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/VzFFTCalculator/VzFFTCalculator.h
diff --git a/targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/VzFFTCalculator/package.include b/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/VzFFTCalculator/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/VzFFTCalculator/package.include
rename to targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/VzFFTCalculator/package.include
diff --git a/targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/package.include b/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Calculator/FFTCalculator/package.include
rename to targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/package.include
diff --git a/targets/tests/TestingHULC/Utilities/Calculator/package.include b/targets/tests/NumericalTests/Utilities/Calculator/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Calculator/package.include
rename to targets/tests/NumericalTests/Utilities/Calculator/package.include
diff --git a/targets/tests/TestingHULC/Utilities/DataWriter/ToVectorWriter.cpp b/targets/tests/NumericalTests/Utilities/DataWriter/ToVectorWriter.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/DataWriter/ToVectorWriter.cpp
rename to targets/tests/NumericalTests/Utilities/DataWriter/ToVectorWriter.cpp
diff --git a/targets/tests/TestingHULC/Utilities/DataWriter/ToVectorWriter.h b/targets/tests/NumericalTests/Utilities/DataWriter/ToVectorWriter.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/DataWriter/ToVectorWriter.h
rename to targets/tests/NumericalTests/Utilities/DataWriter/ToVectorWriter.h
diff --git a/targets/tests/TestingHULC/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.cpp b/targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.cpp
rename to targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.cpp
diff --git a/targets/tests/TestingHULC/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.h b/targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.h
rename to targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.h
diff --git a/targets/tests/TestingHULC/Utilities/DataWriter/Y2dSliceToResults/package.include b/targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/DataWriter/Y2dSliceToResults/package.include
rename to targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/package.include
diff --git a/targets/tests/TestingHULC/Utilities/DataWriter/package.include b/targets/tests/NumericalTests/Utilities/DataWriter/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/DataWriter/package.include
rename to targets/tests/NumericalTests/Utilities/DataWriter/package.include
diff --git a/targets/tests/TestingHULC/Utilities/EvaluationParameter/EvaluationParameter.cpp b/targets/tests/NumericalTests/Utilities/EvaluationParameter/EvaluationParameter.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/EvaluationParameter/EvaluationParameter.cpp
rename to targets/tests/NumericalTests/Utilities/EvaluationParameter/EvaluationParameter.cpp
diff --git a/targets/tests/TestingHULC/Utilities/EvaluationParameter/EvaluationParameter.h b/targets/tests/NumericalTests/Utilities/EvaluationParameter/EvaluationParameter.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/EvaluationParameter/EvaluationParameter.h
rename to targets/tests/NumericalTests/Utilities/EvaluationParameter/EvaluationParameter.h
diff --git a/targets/tests/TestingHULC/Utilities/EvaluationParameter/package.include b/targets/tests/NumericalTests/Utilities/EvaluationParameter/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/EvaluationParameter/package.include
rename to targets/tests/NumericalTests/Utilities/EvaluationParameter/package.include
diff --git a/targets/tests/TestingHULC/Utilities/GridReaderforTesting/gridReaderforTesting.cpp b/targets/tests/NumericalTests/Utilities/GridReaderforTesting/gridReaderforTesting.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/GridReaderforTesting/gridReaderforTesting.cpp
rename to targets/tests/NumericalTests/Utilities/GridReaderforTesting/gridReaderforTesting.cpp
diff --git a/targets/tests/TestingHULC/Utilities/GridReaderforTesting/gridReaderforTesting.h b/targets/tests/NumericalTests/Utilities/GridReaderforTesting/gridReaderforTesting.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/GridReaderforTesting/gridReaderforTesting.h
rename to targets/tests/NumericalTests/Utilities/GridReaderforTesting/gridReaderforTesting.h
diff --git a/targets/tests/TestingHULC/Utilities/GridReaderforTesting/package.include b/targets/tests/NumericalTests/Utilities/GridReaderforTesting/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/GridReaderforTesting/package.include
rename to targets/tests/NumericalTests/Utilities/GridReaderforTesting/package.include
diff --git a/targets/tests/TestingHULC/Utilities/InitialCondition/InitialCondition.h b/targets/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/InitialCondition/InitialCondition.h
rename to targets/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h
diff --git a/targets/tests/TestingHULC/Utilities/InitialCondition/InitialConditionImp.cpp b/targets/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/InitialCondition/InitialConditionImp.cpp
rename to targets/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.cpp
diff --git a/targets/tests/TestingHULC/Utilities/InitialCondition/InitialConditionImp.h b/targets/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/InitialCondition/InitialConditionImp.h
rename to targets/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.h
diff --git a/targets/tests/TestingHULC/Utilities/InitialCondition/ShearWave/InitialConditionShearWave.cpp b/targets/tests/NumericalTests/Utilities/InitialCondition/ShearWave/InitialConditionShearWave.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/InitialCondition/ShearWave/InitialConditionShearWave.cpp
rename to targets/tests/NumericalTests/Utilities/InitialCondition/ShearWave/InitialConditionShearWave.cpp
diff --git a/targets/tests/TestingHULC/Utilities/InitialCondition/ShearWave/InitialConditionShearWave.h b/targets/tests/NumericalTests/Utilities/InitialCondition/ShearWave/InitialConditionShearWave.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/InitialCondition/ShearWave/InitialConditionShearWave.h
rename to targets/tests/NumericalTests/Utilities/InitialCondition/ShearWave/InitialConditionShearWave.h
diff --git a/targets/tests/TestingHULC/Utilities/InitialCondition/ShearWave/package.include b/targets/tests/NumericalTests/Utilities/InitialCondition/ShearWave/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/InitialCondition/ShearWave/package.include
rename to targets/tests/NumericalTests/Utilities/InitialCondition/ShearWave/package.include
diff --git a/targets/tests/TestingHULC/Utilities/InitialCondition/TaylorGreenVortex/InitialconditionTaylorGreenVortex.cpp b/targets/tests/NumericalTests/Utilities/InitialCondition/TaylorGreenVortex/InitialconditionTaylorGreenVortex.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/InitialCondition/TaylorGreenVortex/InitialconditionTaylorGreenVortex.cpp
rename to targets/tests/NumericalTests/Utilities/InitialCondition/TaylorGreenVortex/InitialconditionTaylorGreenVortex.cpp
diff --git a/targets/tests/TestingHULC/Utilities/InitialCondition/TaylorGreenVortex/InitialconditionTaylorGreenVortex.h b/targets/tests/NumericalTests/Utilities/InitialCondition/TaylorGreenVortex/InitialconditionTaylorGreenVortex.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/InitialCondition/TaylorGreenVortex/InitialconditionTaylorGreenVortex.h
rename to targets/tests/NumericalTests/Utilities/InitialCondition/TaylorGreenVortex/InitialconditionTaylorGreenVortex.h
diff --git a/targets/tests/TestingHULC/Utilities/InitialCondition/TaylorGreenVortex/package.include b/targets/tests/NumericalTests/Utilities/InitialCondition/TaylorGreenVortex/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/InitialCondition/TaylorGreenVortex/package.include
rename to targets/tests/NumericalTests/Utilities/InitialCondition/TaylorGreenVortex/package.include
diff --git a/targets/tests/TestingHULC/Utilities/InitialCondition/package.include b/targets/tests/NumericalTests/Utilities/InitialCondition/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/InitialCondition/package.include
rename to targets/tests/NumericalTests/Utilities/InitialCondition/package.include
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.cpp b/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.cpp
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.cpp
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h b/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/BasicSimulationInfo/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/BasicSimulationInfo/package.include
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/package.include
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/LogFileInformation.h b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/LogFileInformation.h
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/LogFileInformationImp.cpp b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/LogFileInformationImp.cpp
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.cpp
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/LogFileInformationImp.h b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/LogFileInformationImp.h
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/LogFileInformationOutput/LogFileInformationOutput.cpp b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationOutput/LogFileInformationOutput.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/LogFileInformationOutput/LogFileInformationOutput.cpp
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationOutput/LogFileInformationOutput.cpp
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/LogFileInformationOutput/LogFileInformationOutput.h b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationOutput/LogFileInformationOutput.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/LogFileInformationOutput/LogFileInformationOutput.h
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationOutput/LogFileInformationOutput.h
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/LogFileInformationOutput/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationOutput/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/LogFileInformationOutput/package.include
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationOutput/package.include
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/ShearWaveInformation/ShearWaveInformation.cpp b/targets/tests/NumericalTests/Utilities/LogFileInformation/ShearWaveInformation/ShearWaveInformation.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/ShearWaveInformation/ShearWaveInformation.cpp
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/ShearWaveInformation/ShearWaveInformation.cpp
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/ShearWaveInformation/ShearWaveInformation.h b/targets/tests/NumericalTests/Utilities/LogFileInformation/ShearWaveInformation/ShearWaveInformation.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/ShearWaveInformation/ShearWaveInformation.h
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/ShearWaveInformation/ShearWaveInformation.h
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/ShearWaveInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/ShearWaveInformation/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/ShearWaveInformation/package.include
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/ShearWaveInformation/package.include
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/SimulationTimeInformation/SimulationTimeInformation.cpp b/targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationTimeInformation/SimulationTimeInformation.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/SimulationTimeInformation/SimulationTimeInformation.cpp
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationTimeInformation/SimulationTimeInformation.cpp
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/SimulationTimeInformation/SimulationTimeInformation.h b/targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationTimeInformation/SimulationTimeInformation.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/SimulationTimeInformation/SimulationTimeInformation.h
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationTimeInformation/SimulationTimeInformation.h
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/SimulationTimeInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationTimeInformation/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/SimulationTimeInformation/package.include
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationTimeInformation/package.include
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/TaylorGreenInformation/TaylorGreenInformation.cpp b/targets/tests/NumericalTests/Utilities/LogFileInformation/TaylorGreenInformation/TaylorGreenInformation.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/TaylorGreenInformation/TaylorGreenInformation.cpp
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/TaylorGreenInformation/TaylorGreenInformation.cpp
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/TaylorGreenInformation/TaylorGreenInformation.h b/targets/tests/NumericalTests/Utilities/LogFileInformation/TaylorGreenInformation/TaylorGreenInformation.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/TaylorGreenInformation/TaylorGreenInformation.h
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/TaylorGreenInformation/TaylorGreenInformation.h
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/TaylorGreenInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/TaylorGreenInformation/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/TaylorGreenInformation/package.include
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/TaylorGreenInformation/package.include
diff --git a/targets/tests/TestingHULC/Utilities/LogFileInformation/package.include b/targets/tests/NumericalTests/Utilities/LogFileInformation/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileInformation/package.include
rename to targets/tests/NumericalTests/Utilities/LogFileInformation/package.include
diff --git a/targets/tests/TestingHULC/Utilities/LogFileWriter/LogFileWriter.cpp b/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileWriter/LogFileWriter.cpp
rename to targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.cpp
diff --git a/targets/tests/TestingHULC/Utilities/LogFileWriter/LogFileWriter.h b/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileWriter/LogFileWriter.h
rename to targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h
diff --git a/targets/tests/TestingHULC/Utilities/LogFileWriter/package.include b/targets/tests/NumericalTests/Utilities/LogFileWriter/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/LogFileWriter/package.include
rename to targets/tests/NumericalTests/Utilities/LogFileWriter/package.include
diff --git a/targets/tests/TestingHULC/Utilities/reader/reader.cpp b/targets/tests/NumericalTests/Utilities/Reader/Reader.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/reader/reader.cpp
rename to targets/tests/NumericalTests/Utilities/Reader/Reader.cpp
diff --git a/targets/tests/TestingHULC/Utilities/reader/reader.h b/targets/tests/NumericalTests/Utilities/Reader/Reader.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/reader/reader.h
rename to targets/tests/NumericalTests/Utilities/Reader/Reader.h
diff --git a/targets/tests/TestingHULC/Utilities/Results/package.include b/targets/tests/NumericalTests/Utilities/Reader/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Results/package.include
rename to targets/tests/NumericalTests/Utilities/Reader/package.include
diff --git a/targets/tests/TestingHULC/Utilities/Results/Results.cpp b/targets/tests/NumericalTests/Utilities/Results/Results.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Results/Results.cpp
rename to targets/tests/NumericalTests/Utilities/Results/Results.cpp
diff --git a/targets/tests/TestingHULC/Utilities/Results/Results.h b/targets/tests/NumericalTests/Utilities/Results/Results.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/Results/Results.h
rename to targets/tests/NumericalTests/Utilities/Results/Results.h
diff --git a/targets/tests/TestingHULC/Utilities/SimulationInfo/package.include b/targets/tests/NumericalTests/Utilities/Results/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/SimulationInfo/package.include
rename to targets/tests/NumericalTests/Utilities/Results/package.include
diff --git a/targets/tests/TestingHULC/Utilities/SimulationInfo/SimulationInfo.h b/targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/SimulationInfo/SimulationInfo.h
rename to targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h
diff --git a/targets/tests/TestingHULC/Utilities/SimulationInfo/SimulationInfoImp.cpp b/targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/SimulationInfo/SimulationInfoImp.cpp
rename to targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.cpp
diff --git a/targets/tests/TestingHULC/Utilities/SimulationInfo/SimulationInfoImp.h b/targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/SimulationInfo/SimulationInfoImp.h
rename to targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.h
diff --git a/targets/tests/TestingHULC/Utilities/TestCondition/package.include b/targets/tests/NumericalTests/Utilities/SimulationInfo/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestCondition/package.include
rename to targets/tests/NumericalTests/Utilities/SimulationInfo/package.include
diff --git a/targets/tests/TestingHULC/Utilities/TestCondition/TestCondition.h b/targets/tests/NumericalTests/Utilities/TestCondition/TestCondition.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestCondition/TestCondition.h
rename to targets/tests/NumericalTests/Utilities/TestCondition/TestCondition.h
diff --git a/targets/tests/TestingHULC/Utilities/TestCondition/TestConditionImp.cpp b/targets/tests/NumericalTests/Utilities/TestCondition/TestConditionImp.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestCondition/TestConditionImp.cpp
rename to targets/tests/NumericalTests/Utilities/TestCondition/TestConditionImp.cpp
diff --git a/targets/tests/TestingHULC/Utilities/TestCondition/TestConditionImp.h b/targets/tests/NumericalTests/Utilities/TestCondition/TestConditionImp.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestCondition/TestConditionImp.h
rename to targets/tests/NumericalTests/Utilities/TestCondition/TestConditionImp.h
diff --git a/targets/tests/TestingHULC/Utilities/TestConditionFactory/package.include b/targets/tests/NumericalTests/Utilities/TestCondition/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestConditionFactory/package.include
rename to targets/tests/NumericalTests/Utilities/TestCondition/package.include
diff --git a/targets/tests/TestingHULC/Utilities/TestConditionFactory/TestConditionFactory.h b/targets/tests/NumericalTests/Utilities/TestConditionFactory/TestConditionFactory.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestConditionFactory/TestConditionFactory.h
rename to targets/tests/NumericalTests/Utilities/TestConditionFactory/TestConditionFactory.h
diff --git a/targets/tests/TestingHULC/Utilities/TestConditionFactory/TestConditionFactoryImp.cpp b/targets/tests/NumericalTests/Utilities/TestConditionFactory/TestConditionFactoryImp.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestConditionFactory/TestConditionFactoryImp.cpp
rename to targets/tests/NumericalTests/Utilities/TestConditionFactory/TestConditionFactoryImp.cpp
diff --git a/targets/tests/TestingHULC/Utilities/TestConditionFactory/TestConditionFactoryImp.h b/targets/tests/NumericalTests/Utilities/TestConditionFactory/TestConditionFactoryImp.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestConditionFactory/TestConditionFactoryImp.h
rename to targets/tests/NumericalTests/Utilities/TestConditionFactory/TestConditionFactoryImp.h
diff --git a/targets/tests/TestingHULC/Utilities/TestCout/package.include b/targets/tests/NumericalTests/Utilities/TestConditionFactory/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestCout/package.include
rename to targets/tests/NumericalTests/Utilities/TestConditionFactory/package.include
diff --git a/targets/tests/TestingHULC/Utilities/TestCout/TestCout.h b/targets/tests/NumericalTests/Utilities/TestCout/TestCout.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestCout/TestCout.h
rename to targets/tests/NumericalTests/Utilities/TestCout/TestCout.h
diff --git a/targets/tests/TestingHULC/Utilities/TestCout/TestCoutImp.cpp b/targets/tests/NumericalTests/Utilities/TestCout/TestCoutImp.cpp
similarity index 95%
rename from targets/tests/TestingHULC/Utilities/TestCout/TestCoutImp.cpp
rename to targets/tests/NumericalTests/Utilities/TestCout/TestCoutImp.cpp
index bc856508c7a4efa918b490b5c281765083394853..f700d664f677fa576eaab5fc86118a8e9fc038c2 100644
--- a/targets/tests/TestingHULC/Utilities/TestCout/TestCoutImp.cpp
+++ b/targets/tests/NumericalTests/Utilities/TestCout/TestCoutImp.cpp
@@ -58,15 +58,14 @@ void TestCoutImp::makeSimulationHeadOutput(std::string simName, int l)
void TestCoutImp::makeFinalTestOutput(int numberOfPassedTests, int numberOfTests)
{
setColor(numberOfPassedTests == numberOfTests);
- testing::internal::ColoredPrintf(color, "\n[----------]\n[----------]");
+ testing::internal::ColoredPrintf(color, "[----------]\n[----------]");
testing::internal::ColoredPrintf(testing::internal::COLOR_DEFAULT, "Test Summary\n");
testing::internal::ColoredPrintf(color, "[----------]");
std::ostringstream info;
info << numberOfPassedTests << " out of " << numberOfTests << " tests passed";
testing::internal::ColoredPrintf(testing::internal::COLOR_DEFAULT, info.str().c_str());
- testing::internal::ColoredPrintf(color, "\n[----------]\n");
- std::cout << std::endl;
+ testing::internal::ColoredPrintf(color, "\n[----------]\n\n");
}
void TestCoutImp::printTestStart()
@@ -89,7 +88,7 @@ void TestCoutImp::printTestEnd(bool testPassed)
testing::internal::ColoredPrintf(testing::internal::COLOR_RED, "[ FAILED]");
std::cout << std::endl;
testing::internal::ColoredPrintf(color, "[----------]");
- std::cout << std::endl;
+ std::cout << std::endl << std::endl;
}
void TestCoutImp::print(std::string output)
diff --git a/targets/tests/TestingHULC/Utilities/TestCout/TestCoutImp.h b/targets/tests/NumericalTests/Utilities/TestCout/TestCoutImp.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestCout/TestCoutImp.h
rename to targets/tests/NumericalTests/Utilities/TestCout/TestCoutImp.h
diff --git a/targets/tests/TestingHULC/Utilities/TestInformation/package.include b/targets/tests/NumericalTests/Utilities/TestCout/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestInformation/package.include
rename to targets/tests/NumericalTests/Utilities/TestCout/package.include
diff --git a/targets/tests/TestingHULC/Utilities/TestInformation/TestInformation.h b/targets/tests/NumericalTests/Utilities/TestInformation/TestInformation.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestInformation/TestInformation.h
rename to targets/tests/NumericalTests/Utilities/TestInformation/TestInformation.h
diff --git a/targets/tests/TestingHULC/Utilities/TestInformation/TestInformationImp.cpp b/targets/tests/NumericalTests/Utilities/TestInformation/TestInformationImp.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestInformation/TestInformationImp.cpp
rename to targets/tests/NumericalTests/Utilities/TestInformation/TestInformationImp.cpp
diff --git a/targets/tests/TestingHULC/Utilities/TestInformation/TestInformationImp.h b/targets/tests/NumericalTests/Utilities/TestInformation/TestInformationImp.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestInformation/TestInformationImp.h
rename to targets/tests/NumericalTests/Utilities/TestInformation/TestInformationImp.h
diff --git a/targets/tests/TestingHULC/Utilities/TestParameter/ShearWaveTestParameter/package.include b/targets/tests/NumericalTests/Utilities/TestInformation/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestParameter/ShearWaveTestParameter/package.include
rename to targets/tests/NumericalTests/Utilities/TestInformation/package.include
diff --git a/targets/tests/TestingHULC/Utilities/TestParameter/ShearWaveTestParameter/ShearWaveTestParameter.cpp b/targets/tests/NumericalTests/Utilities/TestParameter/ShearWaveTestParameter/ShearWaveTestParameter.cpp
similarity index 75%
rename from targets/tests/TestingHULC/Utilities/TestParameter/ShearWaveTestParameter/ShearWaveTestParameter.cpp
rename to targets/tests/NumericalTests/Utilities/TestParameter/ShearWaveTestParameter/ShearWaveTestParameter.cpp
index 00ed258273db7d264bc878840437c3c55d6af1d7..c9ca3b467bf0ad77dffe60b78cdb8db37c4a39ea 100644
--- a/targets/tests/TestingHULC/Utilities/TestParameter/ShearWaveTestParameter/ShearWaveTestParameter.cpp
+++ b/targets/tests/NumericalTests/Utilities/TestParameter/ShearWaveTestParameter/ShearWaveTestParameter.cpp
@@ -23,15 +23,8 @@ double ShearWaveTestParameter::getVelocity()
return v0;
}
-ShearWaveTestParameter::ShearWaveTestParameter( real u0, real v0, real viscosity, unsigned int lx, unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength,
- unsigned int startStepCalculation, unsigned int ySliceForCalculation, std::string gridPath, bool writeFiles,
- unsigned int startStepFileWriter, std::string filePath, std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices)
- :TestParameterImp(viscosity, lx,
- numberOfTimeSteps, basisTimeStepLength,
- startStepCalculation, ySliceForCalculation,
- gridPath,
- writeFiles, startStepFileWriter, testResults, devices),
- u0(u0), v0(v0)
+ShearWaveTestParameter::ShearWaveTestParameter( real u0, real v0, real viscosity, unsigned int lx, unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength, unsigned int startStepCalculation, unsigned int ySliceForCalculation, std::string gridPath, bool writeFiles, unsigned int startStepFileWriter, std::string filePath, std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices)
+:TestParameterImp(viscosity, lx, numberOfTimeSteps, basisTimeStepLength, startStepCalculation, ySliceForCalculation, gridPath, writeFiles, startStepFileWriter, testResults, devices), u0(u0), v0(v0)
{
std::ostringstream oss;
oss << filePath + "/ShearWave/grid" << lx;
diff --git a/targets/tests/NumericalTests/Utilities/TestParameter/ShearWaveTestParameter/ShearWaveTestParameter.h b/targets/tests/NumericalTests/Utilities/TestParameter/ShearWaveTestParameter/ShearWaveTestParameter.h
new file mode 100644
index 0000000000000000000000000000000000000000..b9ce98747ac9a3a9ed7b788c39a7428c3e231987
--- /dev/null
+++ b/targets/tests/NumericalTests/Utilities/TestParameter/ShearWaveTestParameter/ShearWaveTestParameter.h
@@ -0,0 +1,34 @@
+#ifndef SHEARWAVETESTPARAMETER_H
+#define SHEARWAVETESTPARAMETER_H
+
+#include "../TestParameterImp.h"
+
+class PhiAndNuTest;
+
+class ShearWaveTestParameter : public TestParameterImp
+{
+public:
+ static std::shared_ptr<TestParameter> getNewInstance(real u0, real v0,
+ real viscosity, unsigned int lx,
+ unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength,
+ unsigned int startStepCalculation, unsigned int ySliceForCalculation,
+ std::string gridPath,
+ bool writeFiles, unsigned int startStepFileWriter, std::string filePath,
+ std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices);
+ double getVelocity();
+
+protected:
+ ShearWaveTestParameter() {};
+ ShearWaveTestParameter(real u0, real v0,
+ real viscosity, unsigned int lx,
+ unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength,
+ unsigned int startStepCalculation, unsigned int ySliceForCalculation,
+ std::string gridPath,
+ bool writeFiles, unsigned int startStepFileWriter, std::string filePath,
+ std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices);
+
+private:
+ real u0, v0;
+};
+
+#endif // !SHEARWAVETESTPARAMETER_H
diff --git a/targets/tests/TestingHULC/Utilities/TestParameter/TaylorGreenTestParameter/package.include b/targets/tests/NumericalTests/Utilities/TestParameter/ShearWaveTestParameter/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestParameter/TaylorGreenTestParameter/package.include
rename to targets/tests/NumericalTests/Utilities/TestParameter/ShearWaveTestParameter/package.include
diff --git a/targets/tests/NumericalTests/Utilities/TestParameter/TaylorGreenTestParameter/TaylorGreenTestParameter.cpp b/targets/tests/NumericalTests/Utilities/TestParameter/TaylorGreenTestParameter/TaylorGreenTestParameter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ed8ec0205cdba8a30029e31caca09ae2c4197d87
--- /dev/null
+++ b/targets/tests/NumericalTests/Utilities/TestParameter/TaylorGreenTestParameter/TaylorGreenTestParameter.cpp
@@ -0,0 +1,30 @@
+#include "TaylorGreenTestParameter.h"
+
+#include "Utilities/InitialCondition\TaylorGreenVortex\InitialconditionTaylorGreenVortex.h"
+#include "Utilities/Calculator\FFTCalculator\VxFFTCalculator\VxFFTCalculator.h"
+#include "Tests\PhiAndNuTest\PhiAndNuTest.h"
+#include "Utilities/Results/Results.h"
+
+#include <sstream>
+
+std::shared_ptr<TestParameter> TaylorGreenTestParameter::getNewInstance(real u0, real amplitude, real viscosity, unsigned int lx, unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength, unsigned int startStepCalculation, unsigned int ySliceForCalculation, std::string gridPath, bool writeFiles, unsigned int startStepFileWriter, std::string filePath, std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices)
+{
+ return std::shared_ptr<TestParameter>(new TaylorGreenTestParameter(u0, amplitude, viscosity, lx, numberOfTimeSteps, basisTimeStepLength, startStepCalculation, ySliceForCalculation, gridPath, writeFiles, startStepFileWriter, filePath, testResults, devices));
+}
+
+double TaylorGreenTestParameter::getVelocity()
+{
+ return u0;
+}
+
+TaylorGreenTestParameter::TaylorGreenTestParameter(real u0, real amplitude, real viscosity, unsigned int lx, unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength, unsigned int startStepCalculation, unsigned int ySliceForCalculation, std::string gridPath, bool writeFiles, unsigned int startStepFileWriter, std::string filePath, std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices)
+:TestParameterImp(viscosity, lx, numberOfTimeSteps, basisTimeStepLength, startStepCalculation, ySliceForCalculation, gridPath, writeFiles, startStepFileWriter, testResults, devices), u0(u0), amplitude(amplitude)
+{
+ std::ostringstream oss;
+ oss << filePath + "/TaylorGreenVortex/grid" << lx;
+ this->filePath = oss.str();
+
+ initialCondition = std::shared_ptr<InitialConditionTaylorGreen>(new InitialConditionTaylorGreen((double)lx, (double)lz, (double)l0, u0, amplitude, rho0));
+ simResults = Results::getNewInstance(lx, lz, timeStepLength);
+ calculator = VxFFTCalculator::getNewInstance(viscosity, testResults);
+}
diff --git a/targets/tests/NumericalTests/Utilities/TestParameter/TaylorGreenTestParameter/TaylorGreenTestParameter.h b/targets/tests/NumericalTests/Utilities/TestParameter/TaylorGreenTestParameter/TaylorGreenTestParameter.h
new file mode 100644
index 0000000000000000000000000000000000000000..b287c659f2332cac9680d09b610f56a4e5032dcf
--- /dev/null
+++ b/targets/tests/NumericalTests/Utilities/TestParameter/TaylorGreenTestParameter/TaylorGreenTestParameter.h
@@ -0,0 +1,35 @@
+#ifndef TGV_TEST_PARAMETER_H
+#define TGV_TEST_PARAMETER_H
+
+#include "../TestParameterImp.h"
+
+#include <string>
+#include <memory>
+
+class PhiAndNuTest;
+
+class TaylorGreenTestParameter : public TestParameterImp
+{
+public:
+ static std::shared_ptr<TestParameter> getNewInstance(real u0, real amplitude, real viscosity, unsigned int lx,
+ unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength,
+ unsigned int startStepCalculation, unsigned int ySliceForCalculation,
+ std::string gridPath,
+ bool writeFiles, unsigned int startStepFileWriter, std::string filePath,
+ std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices);
+ double getVelocity();
+
+protected:
+ TaylorGreenTestParameter(real u0, real amplitude,
+ real viscosity, unsigned int lx,
+ unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength,
+ unsigned int startStepCalculation, unsigned int ySliceForCalculation,
+ std::string gridPath,
+ bool writeFiles, unsigned int startStepFileWriter, std::string filePath,
+ std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices);
+
+private:
+ real u0, amplitude;
+
+};
+#endif
diff --git a/targets/tests/TestingHULC/Utilities/TestParameter/package.include b/targets/tests/NumericalTests/Utilities/TestParameter/TaylorGreenTestParameter/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestParameter/package.include
rename to targets/tests/NumericalTests/Utilities/TestParameter/TaylorGreenTestParameter/package.include
diff --git a/targets/tests/TestingHULC/Utilities/TestParameter/TestParameter.h b/targets/tests/NumericalTests/Utilities/TestParameter/TestParameter.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestParameter/TestParameter.h
rename to targets/tests/NumericalTests/Utilities/TestParameter/TestParameter.h
diff --git a/targets/tests/TestingHULC/Utilities/TestParameter/TestParameterImp.cpp b/targets/tests/NumericalTests/Utilities/TestParameter/TestParameterImp.cpp
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestParameter/TestParameterImp.cpp
rename to targets/tests/NumericalTests/Utilities/TestParameter/TestParameterImp.cpp
diff --git a/targets/tests/TestingHULC/Utilities/TestParameter/TestParameterImp.h b/targets/tests/NumericalTests/Utilities/TestParameter/TestParameterImp.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestParameter/TestParameterImp.h
rename to targets/tests/NumericalTests/Utilities/TestParameter/TestParameterImp.h
diff --git a/targets/tests/TestingHULC/Utilities/TestResults/package.include b/targets/tests/NumericalTests/Utilities/TestParameter/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestResults/package.include
rename to targets/tests/NumericalTests/Utilities/TestParameter/package.include
diff --git a/targets/tests/TestingHULC/Utilities/TestResults/TestResults.h b/targets/tests/NumericalTests/Utilities/TestResults/TestResults.h
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/TestResults/TestResults.h
rename to targets/tests/NumericalTests/Utilities/TestResults/TestResults.h
diff --git a/targets/tests/TestingHULC/Utilities/reader/package.include b/targets/tests/NumericalTests/Utilities/TestResults/package.include
similarity index 100%
rename from targets/tests/TestingHULC/Utilities/reader/package.include
rename to targets/tests/NumericalTests/Utilities/TestResults/package.include
diff --git a/targets/tests/TestingHULC/config.txt b/targets/tests/NumericalTests/config.txt
similarity index 57%
rename from targets/tests/TestingHULC/config.txt
rename to targets/tests/NumericalTests/config.txt
index e919556ba4e693f343dbf8e28f86572b3c9cfe4a..124a6428a52768f24483bb47f83c1b5b5b057c5e 100644
--- a/targets/tests/TestingHULC/config.txt
+++ b/targets/tests/NumericalTests/config.txt
@@ -1,13 +1,20 @@
##################################################
-# Basic Test Parameter #
+# GPU Mapping #
+##################################################
+Devices="1"
+
+##################################################
+# Basic Simulation Parameter #
##################################################
NumberOfTimeSteps=20
BasisTimeStepLength=1000
-StartStepCalculation=11
-ySliceForCalculation=0
-
Viscosity=0.00001
+##################################################
+# Basic Test Parameter #
+##################################################
+StartStepCalculation=11
+ySliceForCalculation=0
MinOrderOfAccuracy=1.95
##################################################
@@ -23,36 +30,34 @@ u0_SW=0.032
v0_SW=0.1
##################################################
-# Tests To Perform #
+# Simulation To Perform #
##################################################
TaylorGreenVortex32=true
TaylorGreenVortex64=true
-TaylorGreenVortex128=false
+TaylorGreenVortex128=true
TaylorGreenVortex256=false
TaylorGreenVortex512=false
ShearWave32=true
ShearWave64=true
-ShearWave128=false
+ShearWave128=true
ShearWave256=false
ShearWave512=false
##################################################
# Grid Information #
##################################################
-GridPath32="D:/GRIDGENERATION/numeric_testing/grids/gridUni32x4x48"
-GridPath64="D:/GRIDGENERATION/numeric_testing/grids/gridUni64x4x96"
-GridPath128="D:/GRIDGENERATION/numeric_testing/grids/gridUni128x4x192"
-GridPath256="D:/GRIDGENERATION/numeric_testing/grids/gridUni256x4x384"
-GridPath512="D:/GRIDGENERATION/numeric_testing/grids/gridUni512x4x768"
+GridPath32="C:\Users\Timon\Documents\studienarbeitIRMB\grids\gridUni32x4x48"
+GridPath64="C:\Users\Timon\Documents\studienarbeitIRMB\grids\gridUni64x4x96"
+GridPath128="C:\Users\Timon\Documents\studienarbeitIRMB\grids\gridUni128x4x192"
+GridPath256="C:\Users\Timon\Documents\studienarbeitIRMB\grids\gridUni256x4x384"
+GridPath512="C:\Users\Timon\Documents\studienarbeitIRMB\grids\gridUni512x4x768"
##################################################
# File Writing Information #
##################################################
WriteFiles=true
-PathForFileWriting="D:/GRIDGENERATION/numeric_testing/output"
+PathForFileWriting="C:\Users\Timon\Documents\studienarbeitIRMB\Output"
StartStepFileWriter=0
-PathLogFile="D:/GRIDGENERATION/numeric_testing/logFiles"
-
-
+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
new file mode 100644
index 0000000000000000000000000000000000000000..00d0d9a9b47f3e9dd7677240d09b633c1e3b67c0
--- /dev/null
+++ b/targets/tests/NumericalTests/main.cpp
@@ -0,0 +1,50 @@
+#include <gmock/gmock.h>
+#include "mpi.h"
+
+#include "VirtualFluids_GPU/LBM/Simulation.h"
+
+#include "Utilities/Reader/Reader.h"
+#include "Utilities/TestCondition/TestCondition.h"
+#include "Utilities/TestConditionFactory/TestConditionFactoryImp.h"
+#include "Utilities/Calculator/Calculator.h"
+#include "Utilities/TestResults/TestResults.h"
+#include "Utilities/TestInformation/TestInformation.h"
+
+static void testHULC(const std::string &configFile)
+{
+ std::shared_ptr< Reader> configReader = Reader::getNewInstance(configFile);
+
+ std::shared_ptr<TestInformation> testInfo = configReader->getTestInformation();
+
+ std::vector< std::shared_ptr< TestParameter> > testPara = configReader->getTestParameter();
+ std::shared_ptr< TestConditionFactory> factory = TestConditionFactoryImp::getNewInstance(testPara);
+ std::vector< std::shared_ptr< TestCondition> > testConditions = factory->makeTestConditions();
+
+ for (int i = 0; i < testConditions.size(); i++)
+ {
+ testInfo->makeSimulationHeadOutput(i);
+ testInfo->setSimulationStartTime(i);
+ Simulation sim;
+ sim.init(testConditions.at(i)->getParameter(), testConditions.at(i)->getGrid(), testConditions.at(i)->getDataWriter());
+ sim.run();
+ testInfo->setSimulationEndTime(i);
+
+ testConditions.at(i)->getCalculator()->calcAndCopyToTestResults();
+ testConditions.at(i)->getTestResults()->evaluate();
+ }
+
+ testInfo->makeFinalTestOutput();
+ testInfo->writeLogFile();
+}
+
+int main(int argc, char **argv)
+{
+ MPI_Init(&argc, &argv);
+
+ if (argc > 1)
+ testHULC(argv[1]);
+
+ MPI_Finalize();
+
+ return 0;
+}
\ No newline at end of file
diff --git a/targets/tests/TestingHULC/package.include b/targets/tests/NumericalTests/package.include
similarity index 100%
rename from targets/tests/TestingHULC/package.include
rename to targets/tests/NumericalTests/package.include
diff --git a/targets/tests/TestingHULC/Utilities/TestParameter/ShearWaveTestParameter/ShearWaveTestParameter.h b/targets/tests/TestingHULC/Utilities/TestParameter/ShearWaveTestParameter/ShearWaveTestParameter.h
deleted file mode 100644
index 2bffcfdc662625a726a63950e262e120f75cf623..0000000000000000000000000000000000000000
--- a/targets/tests/TestingHULC/Utilities/TestParameter/ShearWaveTestParameter/ShearWaveTestParameter.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef SHEARWAVETESTPARAMETER_H
-#define SHEARWAVETESTPARAMETER_H
-
-#include "../TestParameterImp.h"
-
-class PhiAndNuTest;
-
-class ShearWaveTestParameter : public TestParameterImp
-{
-public:
- static std::shared_ptr<TestParameter> getNewInstance(real u0, real v0,
- real viscosity, unsigned int lx,
- unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength,
- unsigned int startStepCalculation, unsigned int ySliceForCalculation,
- std::string gridPath,
- bool writeFiles, unsigned int startStepFileWriter, std::string filePath,
- std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices);
- double getVelocity();
-
-protected:
- ShearWaveTestParameter() {};
- ShearWaveTestParameter(real u0, real v0,
- real viscosity, unsigned int lx,
- unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength,
- unsigned int startStepCalculation, unsigned int ySliceForCalculation,
- std::string gridPath,
- bool writeFiles, unsigned int startStepFileWriter, std::string filePath,
- std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices);
-
-private:
- real u0, v0;
-};
-
-#endif // !SHEARWAVETESTPARAMETER_H
diff --git a/targets/tests/TestingHULC/Utilities/TestParameter/TaylorGreenTestParameter/TaylorGreenTestParameter.cpp b/targets/tests/TestingHULC/Utilities/TestParameter/TaylorGreenTestParameter/TaylorGreenTestParameter.cpp
deleted file mode 100644
index a77ebdb268cd046b0c70baecd67fec0b83994ac0..0000000000000000000000000000000000000000
--- a/targets/tests/TestingHULC/Utilities/TestParameter/TaylorGreenTestParameter/TaylorGreenTestParameter.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "TaylorGreenTestParameter.h"
-
-#include "Utilities/InitialCondition\TaylorGreenVortex\InitialconditionTaylorGreenVortex.h"
-#include "Utilities/Calculator\FFTCalculator\VxFFTCalculator\VxFFTCalculator.h"
-#include "Tests\PhiAndNuTest\PhiAndNuTest.h"
-#include "Utilities/Results/Results.h"
-
-#include <sstream>
-
-std::shared_ptr<TestParameter> TaylorGreenTestParameter::getNewInstance(real u0, real amplitude,
- real viscosity, unsigned int lx,
- unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength,
- unsigned int startStepCalculation, unsigned int ySliceForCalculation,
- std::string gridPath,
- bool writeFiles, unsigned int startStepFileWriter, std::string filePath,
- std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices)
-{
- return std::shared_ptr<TestParameter>(
- new TaylorGreenTestParameter(
- u0, amplitude,
- viscosity, lx,
- numberOfTimeSteps, basisTimeStepLength,
- startStepCalculation, ySliceForCalculation,
- gridPath,
- writeFiles, startStepFileWriter, filePath, testResults, devices));
-}
-
-double TaylorGreenTestParameter::getVelocity()
-{
- return u0;
-}
-
-TaylorGreenTestParameter::TaylorGreenTestParameter(
- real u0, real amplitude,
- real viscosity, unsigned int lx,
- unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength,
- unsigned int startStepCalculation, unsigned int ySliceForCalculation,
- std::string gridPath,
- bool writeFiles, unsigned int startStepFileWriter, std::string filePath,
- std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices)
-
- :TestParameterImp(viscosity, lx,
- numberOfTimeSteps, basisTimeStepLength,
- startStepCalculation, ySliceForCalculation,
- gridPath,
- writeFiles, startStepFileWriter, testResults, devices),
- u0(u0), amplitude(amplitude)
-{
- std::ostringstream oss;
- oss << filePath + "/TaylorGreenVortex/grid" << lx;
- this->filePath = oss.str();
-
- initialCondition = std::shared_ptr<InitialConditionTaylorGreen>(new InitialConditionTaylorGreen((double)lx, (double)lz, (double)l0, u0, amplitude, rho0));
- simResults = Results::getNewInstance(lx, lz, timeStepLength);
- calculator = VxFFTCalculator::getNewInstance(viscosity, testResults);
-}
diff --git a/targets/tests/TestingHULC/Utilities/TestParameter/TaylorGreenTestParameter/TaylorGreenTestParameter.h b/targets/tests/TestingHULC/Utilities/TestParameter/TaylorGreenTestParameter/TaylorGreenTestParameter.h
deleted file mode 100644
index 3d7746b939551c01ccc1abc15e8d0b2ad94af31b..0000000000000000000000000000000000000000
--- a/targets/tests/TestingHULC/Utilities/TestParameter/TaylorGreenTestParameter/TaylorGreenTestParameter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef TGV_TEST_PARAMETER_H
-#define TGV_TEST_PARAMETER_H
-
-#include "../TestParameterImp.h"
-
-#include <string>
-#include <memory>
-
-class PhiAndNuTest;
-
-class TaylorGreenTestParameter : public TestParameterImp
-{
-public:
- static std::shared_ptr<TestParameter> getNewInstance(real u0, real amplitude,
- real viscosity, unsigned int lx,
- unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength,
- unsigned int startStepCalculation, unsigned int ySliceForCalculation,
- std::string gridPath,
- bool writeFiles, unsigned int startStepFileWriter, std::string filePath,
- std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices);
- double getVelocity();
-
-protected:
- TaylorGreenTestParameter(real u0, real amplitude,
- real viscosity, unsigned int lx,
- unsigned int numberOfTimeSteps, unsigned int basisTimeStepLength,
- unsigned int startStepCalculation, unsigned int ySliceForCalculation,
- std::string gridPath,
- bool writeFiles, unsigned int startStepFileWriter, std::string filePath,
- std::shared_ptr<PhiAndNuTest> testResults, std::vector<int> devices);
-
-private:
- real u0, amplitude;
-
-};
-#endif
diff --git a/targets/tests/TestingHULC/main.cpp b/targets/tests/TestingHULC/main.cpp
deleted file mode 100644
index 5d5bbd34579c866bcdf17644e24b275e8383c5c9..0000000000000000000000000000000000000000
--- a/targets/tests/TestingHULC/main.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#include <gmock/gmock.h>
-#include "mpi.h"
-
-#include "VirtualFluids_GPU\LBM\Simulation.h"
-
-#include "Utilities\Reader\Reader.h"
-#include "Utilities\EvaluationParameter\EvaluationParameter.h"
-#include "Utilities\TestCondition\TestCondition.h"
-#include "Utilities\Calculator\Calculator.h"
-#include "Utilities\LogFileWriter\LogFileWriter.h"
-#include "Utilities\TestConditionFactory\TestConditionFactoryImp.h"
-
-#include "Tests\DataCollector\DataCollector.h"
-#include "Tests\DataQueue\DataQueue.h"
-
-#include "Tests\OrderOfAccuracy\OrderOfAccuracy.h"
-
-#include "Tests\TestCout\TestCout.h"
-
-#include <iostream>
-
-
-//muss nicht unbedingt
-#include "Utilities\Results\Results.h"
-
-using std::shared_ptr;
-
-
-const int numberOfTests = 5;
-
-DataQueue nuTGV[numberOfTests - 1];
-DataQueue phiTGV[numberOfTests - 1];
-DataQueue nuSW[numberOfTests - 1];
-DataQueue phiSW[numberOfTests - 1];
-
-static void testHULC(const std::string &configFile)
-{
- std::shared_ptr< Reader > configReader = Reader::getNewInstance(configFile);
-
- std::vector< std::shared_ptr< EvaluationParameter > > evaPara = configReader->makeEvaluationParameter();
- std::shared_ptr<TestInformation> testInfo = configReader->makeTestInformation();
- std::vector<std::shared_ptr<TestParameter> > testPara = configReader->makeTestParameter();
-
- std::shared_ptr<TestConditionFactory> factory = TestConditionFactoryImp::getNewInstance(testPara);
- std::vector<std::shared_ptr<TestCondition>> testConditions = factory->makeTestConditions();
-
- DataCollector tgvCollector = DataCollector(nuTGV, phiTGV, numberOfTests - 1, "TaylorGreenVortex");
- DataCollector swCollector = DataCollector(nuSW, phiSW, numberOfTests - 1, "ShearWave");
-
- for (int i = 0; i < testConditions.size(); i++)
- {
- evaPara.at(i)->setStartTime();
- TEST_HEAD(evaPara.at(i)->getTestName(), evaPara.at(i)->getLx());
- Simulation sim;
- sim.init(testConditions.at(i)->getParameter(), testConditions.at(i)->getGrid(), testConditions.at(i)->getDataWriter());
- sim.run();
- evaPara.at(i)->setEndTime();
-
- std::shared_ptr<Calulator> calc = std::shared_ptr<Calulator>(new Calulator(testConditions.at(i)->getSimulationResults(), evaPara.at(i)));
-
- double nu = calc->calcNu();
- double nudiff = calc->calcNuDiff(nu);
- double phidiff = calc->calcPhiDiff();
-
- tgvCollector.addNuDiffAndPhi(nudiff, phidiff, evaPara.at(i));
- swCollector.addNuDiffAndPhi(nudiff, phidiff, evaPara.at(i));
- }
-
- std::shared_ptr<LogFileWriter> logFile = std::shared_ptr<LogFileWriter>(new LogFileWriter(evaPara, testInfo));
- logFile->makeDataQueueOutput(nuTGV, numberOfTests - 1);
- logFile->makeDataQueueOutput(phiTGV, numberOfTests - 1);
- logFile->makeDataQueueOutput(nuSW, numberOfTests - 1);
- logFile->makeDataQueueOutput(phiSW, numberOfTests - 1);
-}
-
-int main(int argc, char **argv)
-{
- MPI_Init(&argc, &argv);
-
- if (argc > 1)
- testHULC(argv[1]);
-
- ::testing::InitGoogleTest(&argc, argv);
- MPI_Finalize();
-
- return RUN_ALL_TESTS();
-}
-
-INSTANTIATE_TEST_CASE_P(TaylorGreenVortexNu, OrderOfAccuracy, ValuesIn(nuTGV));
-INSTANTIATE_TEST_CASE_P(TaylorGreenVortexPhi, OrderOfAccuracy, ValuesIn(phiTGV));
-
-INSTANTIATE_TEST_CASE_P(ShearWaveNu, OrderOfAccuracy, ValuesIn(nuSW));
-INSTANTIATE_TEST_CASE_P(ShearWavePhi, OrderOfAccuracy, ValuesIn(phiSW));
\ No newline at end of file