diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d22c9cc45853ecff7b333469a7678144b3c4d3c..42dc32b0fa50ab4e27d422c76a8a69dc4bc5c645 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -379,7 +379,6 @@ gpu_numerical_tests:
- $CI_PROJECT_DIR/cache
artifacts:
- expire_in: 1 hrs
paths:
- $CI_PROJECT_DIR/numerical_tests_gpu_results.txt
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.cpp
index 58a4128fbd1ae54f59c625cb7b7ca4f851885962..6821f270428a32c2b579174a6c3e1662d0ccc55b 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.cpp
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.cpp
@@ -1,6 +1,7 @@
#include "MathematicaListOfListsImp.h"
#include <iomanip>
+#include <limits>
std::shared_ptr<MathematicaListOfLists> MathematicaListOfListsImp::getNewInstance(std::string listName, std::vector<std::vector<double>> listOfLists)
{
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.h
index ba19ba20dde6f9810f1003fb56964c9915cb425b..a1e82892ca92fc8b3b484440edb30bfbf957d965 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.h
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.h
@@ -1,5 +1,5 @@
#ifndef MATHEMATICA_LIST_OF_LISTS_IMP_H
-#define MATHEMATICA_LIST_OF_LISTS_IMÜ_H
+#define MATHEMATICA_LIST_OF_LISTS_IMP_H
#include "MathematicaListOfLists.h"
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.cpp
index 6689d5f14ad94cad908584c2847cc02536df60a6..cd00dddf194903666dc36abba86985c0a643d310 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.cpp
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.cpp
@@ -4,6 +4,7 @@
#include "MathematicaPointList.h"
#include <iomanip>
+#include <limits>
std::shared_ptr<MathematicaPointList> MathematicaPointListImp::getNewInstance(std::string listName, std::vector<std::shared_ptr<DataPoint> > plotData)
{
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReader.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReader.h
index 4ac2f917f904f32a80427514bffeeccc4dce53e9..21ee18ef262a24ed5ba978c9f1623ebc0ce5a286 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReader.h
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReader.h
@@ -9,6 +9,7 @@ class PostProcessingConfigData;
class PostProcessingConfigFileReader
{
public:
+ virtual ~PostProcessingConfigFileReader() = default;
virtual std::shared_ptr<PostProcessingConfigData> readConfigFile(std::string filePath) = 0;
};
#endif
\ No newline at end of file
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
index 6c52eeb93f3e556ebfad4e993eb56c63c95b56fd..968af578a868b9e2655f4062d89fda8fed37941b 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
@@ -64,7 +64,3 @@ std::shared_ptr<PostProcessingConfigData> PostProcessingConfigFileReaderImp::rea
return data;
}
-
-PostProcessingConfigFileReaderImp::PostProcessingConfigFileReaderImp()
-{
-}
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.h
index a47d53820807a6ac2fada77d7cb7efc09f658e07..e5355a708adb753e78089a68dc9f889df9a83fc5 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.h
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.h
@@ -8,10 +8,10 @@ class PostProcessingConfigFileReaderImp : public PostProcessingConfigFileReader
public:
static std::shared_ptr<PostProcessingConfigFileReader> getNewInstance();
- std::shared_ptr<PostProcessingConfigData> readConfigFile(std::string filePath);
+ std::shared_ptr<PostProcessingConfigData> readConfigFile(std::string filePath) override;
private:
- PostProcessingConfigFileReaderImp();
+ PostProcessingConfigFileReaderImp() = default;
};
#endif
\ No newline at end of file
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/main.cpp b/apps/gpu/tests/NumericalTestPostProcessing/main.cpp
index bf88ad153d49bea167e148bab1abba8fa760b70f..e5dbeef9c7d3928c039049627129689ab92c653b 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/main.cpp
+++ b/apps/gpu/tests/NumericalTestPostProcessing/main.cpp
@@ -39,12 +39,12 @@ int main(int argc, char **argv)
std::shared_ptr<MathematicaAssistantFactory> assistantFactory = MathematicaAssistantFactoryImp::getNewInstance();
std::vector<std::shared_ptr<MathematicaAssistant> > mathematicaAssistants = assistantFactory->makeMathematicaAssistants(configData->getAssistants(), functionFactory);
- for (int sim = 0; sim < configData->getSimulations().size(); sim++) {
- for (int comb = 0; comb < configData->getDataCombinations().size(); comb++) {
+ for (uint sim = 0; sim < configData->getSimulations().size(); sim++) {
+ for (uint comb = 0; comb < configData->getDataCombinations().size(); comb++) {
std::shared_ptr<LogFileDataAssistantStrategy> strategy = assistentStrategyFactory->makeLogFileDataAssistantStrategy(configData->getSimulations().at(sim));
std::vector<std::shared_ptr<LogFileDataGroup> > logFileDataSorted = assistentLogFile->findDataCombination(logFileDataVector, strategy, configData->getDataCombinations().at(comb));
- for (int i = 0; i < logFileDataSorted.size(); i++) {
- for (int j = 0; j < mathematicaAssistants.size(); j++)
+ for (uint i = 0; i < logFileDataSorted.size(); i++) {
+ for (uint j = 0; j < mathematicaAssistants.size(); j++)
mathematicaAssistants.at(j)->makeMathematicaOutput(logFileDataSorted.at(i), aMathmaticaFile);
}
}
diff --git a/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.cpp b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.cpp
index bf93a95f450ff1a21062644d9be098eb2c2c235f..a8a4a4df2e4d04564dbeb2a881cebd95ce6a1a9f 100644
--- a/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.cpp
+++ b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.cpp
@@ -17,7 +17,7 @@ std::shared_ptr<PhiTest> PhiTest::getNewInstance(std::shared_ptr<ColorConsoleOut
void PhiTest::evaluate()
{
- for (int i = 0; i < postProStrategies.size(); i++)
+ for (uint i = 0; i < postProStrategies.size(); i++)
phiDiff.push_back(postProStrategies.at(i)->getPhiDiff(dataToCalculate));
orderOfAccuracy = calcOrderOfAccuracy(phiDiff);
@@ -46,7 +46,7 @@ std::string PhiTest::getDataToCalculate()
std::vector<int> PhiTest::getLx()
{
std::vector<int> lxINT;
- for (int i = 0; i < lx.size(); i++)
+ for (uint i = 0; i < lx.size(); i++)
lxINT.push_back((int)lx.at(i));
return lxINT;
}
@@ -62,7 +62,7 @@ double PhiTest::getOrderOfAccuracy()
}
PhiTest::PhiTest(std::shared_ptr<ColorConsoleOutput> colorOutput, double viscosity, std::shared_ptr<PhiTestParameterStruct> testPara, std::string dataToCalculate)
- : TestImp(colorOutput), viscosity(viscosity), dataToCalculate(dataToCalculate)
+ : TestImp(colorOutput), dataToCalculate(dataToCalculate)
{
minOrderOfAccuracy = testPara->minOrderOfAccuracy;
startStepCalculation = testPara->startTimeStepCalculation;
@@ -92,7 +92,7 @@ std::vector<std::string> PhiTest::buildTestOutput()
std::vector<std::string> output = buildBasicTestOutput();
std::ostringstream oss;
- for (int i = 0; i < phiDiff.size(); i++) {
+ for (uint i = 0; i < phiDiff.size(); i++) {
oss << "PhiDiff" << simInfos.at(i)->getLx() << ": " << phiDiff.at(i);
output.push_back(oss.str());
oss.str(std::string());
@@ -125,7 +125,7 @@ std::vector<std::string> PhiTest::buildBasicTestOutput()
output.push_back(oss.str());
oss.str(std::string());
- for (int i = 0; i < simInfos.size(); i++) {
+ for (uint i = 0; i < simInfos.size(); i++) {
oss << "L: " << std::setfill(' ') << std::right << std::setw(4) << simInfos.at(i)->getLx() << simInfos.at(i)->getSimulationParameterString();
output.push_back(oss.str());
oss.str(std::string());
diff --git a/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.h b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.h
index 84b1d33896a89834460c9d8495f1e068a2221364..4bf1c02f85e35b9cf1766642b6a0e9b58e6b4d07 100644
--- a/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.h
+++ b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.h
@@ -40,7 +40,6 @@ private:
std::vector<double> phiDiff;
double orderOfAccuracy;
double minOrderOfAccuracy;
- double viscosity;
std::string dataToCalculate;
std::vector<std::shared_ptr<PhiTestPostProcessingStrategy> > postProStrategies;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculator.h b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculator.h
index 21ab49017188b92a97ea59a53d7ce28e51a694a8..5c90fa1ae0fe1332608d2932f2fa40435bb21fc5 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculator.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculator.h
@@ -8,6 +8,7 @@
class L2NormCalculator
{
public:
+ virtual ~L2NormCalculator() = default;
virtual double calc(std::vector<double> basicData, std::vector<double> divergentData, std::vector<unsigned int> level, double lx, double lz, double l0) = 0;
virtual std::string getErrorMessage() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactory.h b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactory.h
index 2b13f7ca3ca1337d8cbd7181ce4fc556e831a248..ffd1030cfa2abf8fb8b82699fe209dcf4e2416de 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactory.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactory.h
@@ -9,6 +9,7 @@ class L2NormCalculator;
class L2NormCalculatorFactory
{
public:
+ virtual ~L2NormCalculatorFactory() = default;
virtual std::shared_ptr<L2NormCalculator> makeL2NormCalculator(std::string type) = 0;
};
diff --git a/apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutput.h b/apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutput.h
index 73b5dff2a02af7a60d3bccc9df6c0ec90c8c5940..5c9f03658f40e77cdd9d8ce8f82d3cd08e2c02d6 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutput.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutput.h
@@ -12,6 +12,7 @@ class SimulationInfo;
class ColorConsoleOutput
{
public:
+ virtual ~ColorConsoleOutput() = default;
virtual void makeSimulationHeadOutput(std::shared_ptr<SimulationInfo> simInfo) = 0;
virtual void makeTestOutput(std::vector<std::string> testOutput, TestStatus status) = 0;
virtual void makeFinalTestOutputHead(int numberOfTests, int numberOfExecutedTest, int numberOfPassedTest, int numberOfFailedTest, int numberOfErrorTest, int numberOfNotExecutedTest) = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriter.h b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriter.h
index 3af764aeeaa8b6f29831ead54b1f312d3be54e9f..a6e1eecf4a976e8c8e6a34c34f8b1e5e08887fd1 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriter.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriter.h
@@ -10,7 +10,7 @@ class AnalyticalResults;
class AnalyticalResults2DToVTKWriter
{
public:
-
+ virtual ~AnalyticalResults2DToVTKWriter() = default;
virtual void writeAnalyticalResult(std::shared_ptr<Parameter> para, std::shared_ptr<AnalyticalResults> analyticalResult) = 0;
};
diff --git a/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h b/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h
index 0735f39696efe134393f6fca66a5d318d59bcb13..1c9b322a29c80c28173d5791adc75e3756f22bbc 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h
@@ -11,6 +11,7 @@ class Parameter;
class InitialCondition
{
public:
+ virtual ~InitialCondition() = default;
virtual void setParameter(std::shared_ptr<Parameter> para) = 0;
virtual void init(const int level) = 0;
virtual real getInitVX(int i, int level) = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfiguration.h b/apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfiguration.h
index dbcb9b003579b34be5f5a6be09154d3762576086..7407fe4cc33da0a929d090a30878b8fe628f03bf 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfiguration.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfiguration.h
@@ -7,7 +7,8 @@
class KernelConfiguration
{
public:
- virtual std::string getMainKernel() = 0;
+ virtual ~KernelConfiguration() = default;
+ virtual std::string getMainKernel() = 0;
virtual bool getMultiKernelOn() = 0;
virtual std::vector<int> getMultiKernelLevel() = 0;
virtual std::vector<std::string> getMultiKernel() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h
index 20897bc5f8de3c94f7659b67b4ba6bdb3598d958..a8f14cab134f821b5dd46116e2b690779cab8176 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h
@@ -12,7 +12,7 @@ public:
std::string getOutput();
private:
- BasicSimulationInfo() {};
+ BasicSimulationInfo() = default;
BasicSimulationInfo(int numberOfTimeSteps, double viscosity, int basicTimeStepLength, std::string kernel);
int numberOfTimeSteps;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h
index 6c035169a8d74cd51aa0e94281b2f01bf3b4fc33..b234c86551603df780613da31b07aa5836f528d0 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h
@@ -1,11 +1,12 @@
#ifndef LOGFILE_INFORMATION_H
#define LOGFILE_INFORMATION_H
-#include <iostream>
+#include <string>
class LogFileInformation
{
public:
+ virtual ~LogFileInformation() = default;
virtual std::string getOutput() = 0;
private:
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h
index 83c4cff969f8910cabdd4ef4f57c8ef3f8fe8925..c89decfe90014d2090a6d9a89ec3b8d79d49ce8d 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h
@@ -8,6 +8,7 @@
class LogFileInformationImp : public LogFileInformation
{
public:
+ LogFileInformationImp() = default;
virtual std::string getOutput() = 0;
protected:
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/SimulationLogFileInformation.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/SimulationLogFileInformation.h
index ce72f8f124a1273e9c2124e2ea30b9a055237733..45a41cc1f43eae3d1fa6fb17457b77a83826e7d6 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/SimulationLogFileInformation.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/SimulationLogFileInformation.h
@@ -9,6 +9,7 @@
class SimulationLogFileInformation : public LogFileInformationImp
{
public:
+ virtual ~SimulationLogFileInformation() = default;
virtual std::string getOutput() = 0;
virtual std::vector<std::string> getFilePathExtension() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueue.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueue.h
index cb8c413d13769551ef2b9c23592d02f03f14c291..013d553901a93328fbd5f44c0b035ecd24b49d3e 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueue.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueue.h
@@ -1,13 +1,10 @@
#ifndef LOGFILE_QUEUE_H
#define LOGFILE_QUEUE_H
-#include <memory>
-
-class LogFileWriter;
-
class LogFileQueue
{
public:
+ virtual ~LogFileQueue() = default;
virtual void writeLogFiles() = 0;
private:
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.cpp
index 9decb8a93ccaa3bf8e1b198bb646f4f499ada72f..fa6b0b2b5a6c7e296dd4dc3b9034c027c416cbc5 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.cpp
@@ -13,7 +13,7 @@ std::shared_ptr<LogFileQueueImp> LogFileQueueImp::getNewInstance(std::string bas
void LogFileQueueImp::writeLogFiles()
{
- for (int i = 0; i < logFileWriter.size(); i++){
+ for (uint i = 0; i < logFileWriter.size(); i++){
logFileWriter.at(i)->writeLogFile(basicLogFilePath);
}
}
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.h
index 3fe27faeb0d8f48bf087c76fb8c57c36cb0a4bb1..133924382995d2a91abfbb51185bccdd7fe33e63 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.h
@@ -5,17 +5,20 @@
#include <string>
#include <vector>
+#include <memory>
+
+class LogFileWriter;
class LogFileQueueImp : public LogFileQueue
{
public:
static std::shared_ptr<LogFileQueueImp> getNewInstance(std::string basicLogFilePath);
- void writeLogFiles();
+ void writeLogFiles() override;
void addLogFileWriter(std::shared_ptr<LogFileWriter> aLogFileWriter);
private:
- LogFileQueueImp() {};
+ LogFileQueueImp() = default;
LogFileQueueImp(std::string basicLogFilePath);
std::string calcDateAndTime();
diff --git a/apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h
index d828256c677e1fece336845de68fb1fc3d3868df..396deec9d1a771fd74e9ca7f3e23910a6c9c7fcb 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h
@@ -6,6 +6,7 @@
class LogFileWriter
{
public:
+ virtual ~LogFileWriter() = default;
virtual void writeLogFile(std::string basicFilePath) = 0;
private:
diff --git a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactory.h b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactory.h
index b5facb26a1dd1e2e0439a415fae2c692340449fe..d21deb7bda97df58830ec9f4dc3dcb8445915911 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactory.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactory.h
@@ -12,6 +12,7 @@ class LogFileQueue;
class NumericalTestFactory
{
public:
+ virtual ~NumericalTestFactory() = default;
virtual std::vector<std::shared_ptr<TestSimulation> > getTestSimulations() = 0;
virtual std::shared_ptr<TestQueue> getTestQueue() = 0;
virtual std::shared_ptr<LogFileQueue> getLogFileQueue() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h
index 1d9b33d357406de2e94c6eb7f2ef9a570ce59e21..ff9753a4afde382e48fc8d07a8763f26f4c6b23d 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h
@@ -93,7 +93,7 @@ private:
int simID;
int numberOfSimulations;
- int simPerKernel, numberOfTestGroupsBetweenKernels, numberOfTestsForOneSimulation, numberOfTestsBetweenKernels;
- int posBasicSimulationForL2Test, posDivergentSimulationForL2Test;
+ // int simPerKernel, numberOfTestGroupsBetweenKernels, numberOfTestsForOneSimulation, numberOfTestsBetweenKernels;
+ // int posBasicSimulationForL2Test, posDivergentSimulationForL2Test;
};
-#endif
\ No newline at end of file
+#endif
diff --git a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestSimulation/NumericalTestSimulation.h b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestSimulation/NumericalTestSimulation.h
index b3835c11bf101c3a0e10beddba0095d0f1f0bef3..0e3c9fcb23964922b8ed155a89ca8c3504aa67fc 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/NumericalTestSimulation/NumericalTestSimulation.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestSimulation/NumericalTestSimulation.h
@@ -10,6 +10,7 @@ enum SimulationStatus { initialized , executed, crashed};
class NumericalTestSimulation
{
public:
+ virtual ~NumericalTestSimulation() = default;
virtual void run() = 0;
virtual SimulationStatus getSimulationStatus() = 0;
virtual void registerSimulationObserver(std::shared_ptr<SimulationObserver> simObserver) = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategy.h b/apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategy.h
index 686c2300e75257717820b6bb97554b37493d46e3..e995bd4de187da87bce2cc987ac460138e3ffcb8 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategy.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategy.h
@@ -10,6 +10,7 @@ class SimulationResults;
class PostProcessingStrategy
{
public:
+ virtual ~PostProcessingStrategy() = default;
virtual void evaluate() = 0;
};
#endif
\ No newline at end of file
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResult.h b/apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResult.h
index 7ed53fce60606e8a91b52330cb87822207f36f94..979c57ec3a2fd2bc26f85d07db06e31169b5aa7a 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResult.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResult.h
@@ -10,6 +10,7 @@ class SimulationResults;
class AnalyticalResults : public ResultsImp
{
public:
+ virtual ~AnalyticalResults() = default;
virtual void calc(std::shared_ptr<SimulationResults> simResults) = 0;
virtual bool isCalculated() = 0;
};
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Results/Results.h b/apps/gpu/tests/NumericalTests/Utilities/Results/Results.h
index 264831a96b1df5cf212b033f2a8dc2acfb03ae5a..3744bf591d98769cee398fcfde78dac1d14737ae 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Results/Results.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Results/Results.h
@@ -6,6 +6,7 @@
class Results
{
public:
+ virtual ~Results() = default;
virtual int getNumberOfTimeSteps() = 0;
virtual std::vector<std::vector<double> > getVx() = 0;
virtual std::vector<std::vector<double> > getVy() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h b/apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h
index cd0c29e9c41765b3c877fb4830d66d41f5c98ee7..aa49cba4875a6ad2090cdd715da9971b6bec8967 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h
@@ -10,6 +10,7 @@ class TimeInfo;
class SimulationInfo
{
public:
+ virtual ~SimulationInfo() = default;
virtual std::string getKernelName() = 0;
virtual double getViscosity() = 0;
virtual std::string getSimulationName() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameter.h b/apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameter.h
index b9ca9b2e332f4a7f3a79ca0ffae65f621b942230..7de661ce17d681c88fdeef50aebb56ce9af36202 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameter.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameter.h
@@ -11,6 +11,7 @@ class KernelConfiguration;
class SimulationParameter
{
public:
+ virtual ~SimulationParameter() = default;
virtual std::shared_ptr<KernelConfiguration> getKernelConfiguration() = 0;
virtual double getViscosity() = 0;
virtual std::string getGridPath() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Test/SimulationObserver.h b/apps/gpu/tests/NumericalTests/Utilities/Test/SimulationObserver.h
index 9cf022b558255ee2dbb3862caf78ccea8c0e1873..ac579cdc97015c16b5bb8cf27ae664c82aa86655 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Test/SimulationObserver.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Test/SimulationObserver.h
@@ -4,6 +4,7 @@
class SimulationObserver
{
public:
+ virtual ~SimulationObserver() = default;
virtual void update() = 0;
};
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Test/Test.h b/apps/gpu/tests/NumericalTests/Utilities/Test/Test.h
index c5809671330d2ac5a32f13f3db0d6d3690f06b6f..994bf272eeae9c1d93f15748def233fa0672812c 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Test/Test.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Test/Test.h
@@ -10,8 +10,8 @@
class Test : public SimulationObserver
{
public:
+ virtual ~Test() = default;
virtual void run() = 0;
- virtual void update() = 0;
virtual TestStatus getTestStatus() = 0;
virtual void makeConsoleOutput() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Test/TestImp.h b/apps/gpu/tests/NumericalTests/Utilities/Test/TestImp.h
index f4fc758ec75f3c0e12b79faf2efb74a2e749e00e..06c2b3013e22f9de7280dc42b86ad2c1974b1b40 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Test/TestImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Test/TestImp.h
@@ -16,9 +16,9 @@ class TestImp : public Test
{
public:
void run() override;
- void update();
- TestStatus getTestStatus();
- virtual void makeConsoleOutput();
+ void update() override;
+ TestStatus getTestStatus() override;
+ void makeConsoleOutput() override;
void addSimulation(std::shared_ptr<NumericalTestSimulation> sim, std::shared_ptr<SimulationInfo> simInfo, std::shared_ptr<PostProcessingStrategy> postProStrategy);
diff --git a/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueue.h b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueue.h
index dcc0ece599e45539fd1416b3cd06bb67576a915a..736146d5a9aa3ce295e661fcd0bd3340f0a56ad0 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueue.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueue.h
@@ -6,6 +6,7 @@ enum TestSuiteResult { PASSED, FAILED };
class TestQueue
{
public:
+ virtual ~TestQueue() = default;
virtual TestSuiteResult run() = 0;
virtual void makeFinalOutput() = 0;
virtual int getNumberOfFailedTests() const noexcept = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.cpp
index c7ceef408bcc7d098810aa0f8fd82498902ee211..f55b932bf8f55b3bbab7983a17646b0826484915 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.cpp
@@ -6,7 +6,7 @@
TestSuiteResult TestQueueImp::run()
{
- for (const auto test : tests)
+ for (const auto& test : tests)
test->run();
makeFinalOutput();
@@ -19,7 +19,7 @@ void TestQueueImp::makeFinalOutput()
calcTestNumbers();
colorOutput->makeFinalTestOutputHead(numberOfTests, numberOfExecutedTest, numberOfPassedTest, numberOfFailedTest,
numberOfErrorTest, numberOfNotExecutedTest);
- for (int i = 0; i < tests.size(); i++)
+ for (uint i = 0; i < tests.size(); i++)
tests.at(i)->makeConsoleOutput();
colorOutput->makeFinalTestOutputFoot(numberOfTests, numberOfExecutedTest, numberOfPassedTest, numberOfFailedTest,
numberOfErrorTest, numberOfNotExecutedTest);
@@ -54,7 +54,7 @@ void TestQueueImp::calcTestNumbers()
numberOfErrorTest = 0;
numberOfNotExecutedTest = 0;
- for (int i = 0; i < tests.size(); i++) {
+ for (uint i = 0; i < tests.size(); i++) {
switch (tests.at(i)->getTestStatus()) {
case passed:
numberOfPassedTest++;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.h b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.h
index 89952773f810a983d34f9e35e9508e9d0d7e3ce3..386b5805fb1ff7068ee75e764d6374f2e2fda767 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.h
@@ -13,7 +13,7 @@ class TestQueueImp : public TestQueue
{
public:
TestSuiteResult run() override;
- void makeFinalOutput();
+ void makeFinalOutput() override;
int getNumberOfFailedTests() const noexcept override;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulation.h b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulation.h
index 729ca06a3a57bfc1202d4f93728a68b18a57f8db..1f356304f05b1d08a52ed8c1842959af8f2965c1 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulation.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulation.h
@@ -15,6 +15,7 @@ class Parameter;
class TestSimulation
{
public:
+ virtual ~TestSimulation() = default;
virtual void run() = 0;
virtual void makeSimulationHeadOutput() = 0;
virtual void startPostProcessing() = 0;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp
index dc4aca9b35b0bea92b3d8e3e5b07cb8ed3e054d5..2dd40ef77149c408e3f8ded6f3a7349761fa3a0b 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp
@@ -87,7 +87,7 @@ std::vector<std::string> TestSimulationImp::getDataToCalcTests()
void TestSimulationImp::notifyObserver()
{
- for (int i = 0; i < simObserver.size(); i++)
+ for (uint i = 0; i < simObserver.size(); i++)
simObserver.at(i)->update();
}
diff --git a/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.h b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.h
index b876cb079f241226bbb3455f7b4bc97b80039131..2a36fda25912ea15f2ee5a8b64d6fe0f7a982180 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.h
@@ -5,7 +5,7 @@
#include "Utilities/NumericalTestSimulation/NumericalTestSimulation.h"
#include <functional>
-#include <time.h>
+#include <ctime>
#include <vector>
class ToVectorWriter;
@@ -28,20 +28,20 @@ public:
std::shared_ptr<ColorConsoleOutput> colorOutput);
void run() override;
- std::shared_ptr<SimulationParameter> getSimulationParameter();
+ std::shared_ptr<SimulationParameter> getSimulationParameter() override;
std::shared_ptr<SimulationInfo> getSimulationInfo();
- std::shared_ptr<TimeTracking> getTimeTracking();
+ std::shared_ptr<TimeTracking> getTimeTracking() override;
- SimulationStatus getSimulationStatus();
+ SimulationStatus getSimulationStatus() override;
- void makeSimulationHeadOutput();
- void startPostProcessing();
+ void makeSimulationHeadOutput() override;
+ void startPostProcessing() override;
- void setParameter(std::shared_ptr<Parameter> para);
+ void setParameter(std::shared_ptr<Parameter> para) override;
std::shared_ptr<SimulationResults> getSimulationResults();
std::shared_ptr<AnalyticalResults> getAnalyticalResults();
- void registerSimulationObserver(std::shared_ptr<SimulationObserver> simObserver);
+ void registerSimulationObserver(std::shared_ptr<SimulationObserver> simObserver) override;
std::vector<std::string> getDataToCalcTests();
private:
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Time/TimeImp.h b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeImp.h
index 87e14e74fb08f6e7f0ceba7923e3adf4db39d455..f6f6c39ef9e641c67af5ae8a7c5af220f68c7c66 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Time/TimeImp.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeImp.h
@@ -5,26 +5,26 @@
#include "TimeTracking.h"
#include <memory>
-#include <time.h>
+#include <ctime>
class TimeImp : public TimeTracking, public TimeInfo
{
public:
static std::shared_ptr<TimeImp> getNewInstance();
- void setSimulationStartTime();
- void setSimulationEndTime();
- void setTestStartTime();
- void setTestEndTime();
- void setAnalyticalResultWriteStartTime();
- void setAnalyticalResultWriteEndTime();
- void setResultCheckStartTime();
- void setResultCheckEndTime();
+ void setSimulationStartTime() override;
+ void setSimulationEndTime() override;
+ void setTestStartTime() override;
+ void setTestEndTime() override;
+ void setAnalyticalResultWriteStartTime() override;
+ void setAnalyticalResultWriteEndTime() override;
+ void setResultCheckStartTime() override;
+ void setResultCheckEndTime() override;
- std::string getSimulationTime();
- std::string getResultCheckTime();
- std::string getTestTime();
- std::string getAnalyticalResultWriteTime();
+ std::string getSimulationTime() override;
+ std::string getResultCheckTime() override;
+ std::string getTestTime() override;
+ std::string getAnalyticalResultWriteTime() override;
private:
TimeImp();
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Time/TimeInfo.h b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeInfo.h
index 11e49b28406ecf08f83f13cfc5cbe09c3ebd8a84..02cf14c5c6db3de64595e58e51acf6771baa1e21 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Time/TimeInfo.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeInfo.h
@@ -6,9 +6,10 @@
class TimeInfo
{
public:
- virtual std::string getSimulationTime() = 0;
- virtual std::string getResultCheckTime() = 0;
- virtual std::string getTestTime() = 0;
- virtual std::string getAnalyticalResultWriteTime() = 0;
+ virtual ~TimeInfo() = default;
+ virtual std::string getSimulationTime() = 0;
+ virtual std::string getResultCheckTime() = 0;
+ virtual std::string getTestTime() = 0;
+ virtual std::string getAnalyticalResultWriteTime() = 0;
};
-#endif
\ No newline at end of file
+#endif
diff --git a/apps/gpu/tests/NumericalTests/Utilities/Time/TimeTracking.h b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeTracking.h
index 736ca764116934dc31e18d7d7c910ead554b253b..663456d6a2c0d428f23a373448ac3c93ad19067f 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/Time/TimeTracking.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeTracking.h
@@ -4,6 +4,7 @@
class TimeTracking
{
public:
+ virtual ~TimeTracking() = default;
virtual void setSimulationStartTime() = 0;
virtual void setSimulationEndTime() = 0;
@@ -16,4 +17,4 @@ public:
virtual void setAnalyticalResultWriteStartTime() = 0;
virtual void setAnalyticalResultWriteEndTime() = 0;
};
-#endif
\ No newline at end of file
+#endif
diff --git a/src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h
index 0c3adfb893bef12351c686e88bf907ecf6e12d99..2996ceeece9710079e898d02b0cceff447479d39 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h
@@ -34,7 +34,7 @@
#ifndef Block3DVisitor_h
#define Block3DVisitor_h
-#include <PointerDefinitions.h>
+#include <basics/PointerDefinitions.h>
class Block3D;
class Grid3D;
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h
index 329662ec8aeb6405c8f8f4b06645c9d1500a59e6..17fa5b2ebb2b7230955e9ce4209a3cb341369326 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h
@@ -1,7 +1,7 @@
#ifndef SetUndefinedNodesBlockVisitor_h
#define SetUndefinedNodesBlockVisitor_h
-#include <PointerDefinitions.h>
+#include <basics/PointerDefinitions.h>
#include "Block3DVisitor.h"