diff --git a/targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp b/targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp index c15936673368d884e2ac45b7177fa341421ca575..9e65a223cafc41cb3fdd869ac99b864078051b9c 100644 --- a/targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp +++ b/targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp @@ -1,8 +1,8 @@ #include "ShearWaveLogFileInformation.h" -std::shared_ptr<LogFileInformation> ShearWaveInformation::getNewInstance(double u0, double v0, std::vector< bool> tests, std::vector< real> l) +std::shared_ptr<ShearWaveInformation> ShearWaveInformation::getNewInstance(double u0, double v0, std::vector< bool> tests, std::vector< real> l, int l0) { - return std::shared_ptr<LogFileInformation>(new ShearWaveInformation(u0, v0, tests, l)); + return std::shared_ptr<ShearWaveInformation>(new ShearWaveInformation(u0, v0, tests, l, l0)); } std::string ShearWaveInformation::getOutput() @@ -19,7 +19,14 @@ std::string ShearWaveInformation::getOutput() return oss.str(); } -ShearWaveInformation::ShearWaveInformation(double u0, double v0, std::vector< bool> tests, std::vector< real> l) : u0(u0), v0(v0), tests(tests), l(l) +std::string ShearWaveInformation::getFilePathExtension() { - l0 = 32; + std::ostringstream oss; + oss << "ShearWave\\u0_" << u0 << "_v0_" << v0; + return oss.str(); +} + +ShearWaveInformation::ShearWaveInformation(double u0, double v0, std::vector< bool> tests, std::vector< real> l, int l0) : u0(u0), v0(v0), tests(tests), l(l), l0(l0) +{ + } \ No newline at end of file diff --git a/targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h b/targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h index bc34349d29c05f589c69c117a88c4442eaf89eab..ae34fee7017b5b86c23967f225318ae910175a9f 100644 --- a/targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h +++ b/targets/tests/NumericalTests/Simulation/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h @@ -2,21 +2,24 @@ #define SHEAR_WAVE_INFORMATION_H #include "Utilities/LogFileInformation/LogFileInformationImp.h" +#include "Utilities\LogFileInformation\SimulationLogFileInformation\SimulationLogFileInformation.h" #include "LBM\LB.h" #include <memory> #include <vector> -class ShearWaveInformation : public LogFileInformationImp +class ShearWaveInformation : public LogFileInformationImp, public SimulationLogFileInformation { public: - static std::shared_ptr<LogFileInformation> getNewInstance(double u0, double v0, std::vector< bool> tests, std::vector< real> l); + static std::shared_ptr<ShearWaveInformation> getNewInstance(double u0, double v0, std::vector< bool> tests, std::vector< real> l, int l0); + std::string getOutput(); + std::string getFilePathExtension(); private: ShearWaveInformation() {}; - ShearWaveInformation(double u0, double v0, std::vector< bool> tests, std::vector< real> l); + ShearWaveInformation(double u0, double v0, std::vector< bool> tests, std::vector< real> l, int l0); double u0; double v0; diff --git a/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.cpp b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.cpp index 2afc5cb73b79b568d34e9fd7fa8465d0ae1ff36c..c5704afae9963ac4e5116258ca4633a8ba975598 100644 --- a/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.cpp +++ b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.cpp @@ -1,8 +1,8 @@ #include "TaylorGreenLogFileInformation.h" -std::shared_ptr<LogFileInformation> TaylorGreenInformation::getNewInstance(double u0, double amplitude, std::vector< bool> tests, std::vector< real> l) +std::shared_ptr<TaylorGreenInformation> TaylorGreenInformation::getNewInstance(double u0, double amplitude, std::vector< bool> tests, std::vector<double> l, int l0) { - return std::shared_ptr<LogFileInformation>(new TaylorGreenInformation(u0, amplitude, tests, l)); + return std::shared_ptr<TaylorGreenInformation>(new TaylorGreenInformation(u0, amplitude, tests, l, l0)); } std::string TaylorGreenInformation::getOutput() @@ -20,7 +20,13 @@ std::string TaylorGreenInformation::getOutput() return oss.str(); } -TaylorGreenInformation::TaylorGreenInformation(double u0, double amplitude, std::vector< bool> tests, std::vector< real> l) : u0(u0), amplitude(amplitude), tests(tests), l(l) +std::string TaylorGreenInformation::getFilePathExtension() +{ + std::ostringstream oss; + oss <<"TaylorGreenVortex\\u0_ " << u0 << "_Amplitude_ " << amplitude; + return oss.str(); +} + +TaylorGreenInformation::TaylorGreenInformation(double u0, double amplitude, std::vector< bool> tests, std::vector< double> l, int l0) : u0(u0), amplitude(amplitude), tests(tests), l(l), l0(l0) { - l0 = 32; } diff --git a/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.h b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.h index 294f8caeaea1eb83215659456fb8cf06f630b4f4..953f1a5f0d851e2fe602fcdb737d3822c57d6f41 100644 --- a/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.h +++ b/targets/tests/NumericalTests/Simulation/TaylorGreenVortex/LogFileInformation/TaylorGreenLogFileInformation.h @@ -2,26 +2,27 @@ #define TAYLOR_GREEN_INFORMATION_H #include "Utilities/LogFileInformation/LogFileInformationImp.h" - -#include "LBM\LB.h" +#include "Utilities\LogFileInformation\SimulationLogFileInformation\SimulationLogFileInformation.h" #include <memory> #include <vector> -class TaylorGreenInformation : public LogFileInformationImp +class TaylorGreenInformation : public LogFileInformationImp, public SimulationLogFileInformation { public: - static std::shared_ptr<LogFileInformation> getNewInstance(double u0, double amplitude, std::vector< bool> tests, std::vector< real> l); + static std::shared_ptr<TaylorGreenInformation> getNewInstance(double u0, double amplitude, std::vector< bool> tests, std::vector< double> l, int l0); + std::string getOutput(); + std::string getFilePathExtension(); private: TaylorGreenInformation() {}; - TaylorGreenInformation(double u0, double amplitude, std::vector< bool> tests, std::vector< real> l); + TaylorGreenInformation(double u0, double amplitude, std::vector< bool> tests, std::vector< double> l, int l0); double u0; double amplitude; std::vector< bool> tests; - std::vector< real> l; + std::vector< double> l; int l0; }; #endif \ No newline at end of file