diff --git a/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp b/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp index 93fbbf5eb48ffcdc205a3c79556f9119926daf8c..1a2a6bf349b7c9845926e7c08005492c93decc0d 100644 --- a/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp +++ b/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp @@ -129,6 +129,7 @@ ConfigFileReader::ConfigFileReader() lz.at(4) = lx.at(4) * 3.0 / 2.0; l0 = 32.0; + rho0 = 1.0; maxLevel = 0; numberOfGridLevels = 1; @@ -161,7 +162,7 @@ void ConfigFileReader::makeTestParameter() tests.push_back(tgvTestResults); for (int i = 0; i < tgv.size(); i++) { if (tgv.at(i)) { - testParameter.push_back(TaylorGreenTestParameter::getNewInstance(u0TGV, amplitudeTGV, viscosity, 1.0, lx.at(i), lz.at(i), l0, numberOfTimeSteps, basisTimeStepLength, startStepCalculation, ySliceForCalculation, grids.at(i), maxLevel, numberOfGridLevels, writeFiles, startStepFileWriter, filePath, tgvTestResults, devices)); + testParameter.push_back(TaylorGreenTestParameter::getNewInstance(u0TGV, amplitudeTGV, viscosity, rho0, lx.at(i), lz.at(i), l0, numberOfTimeSteps, basisTimeStepLength, startStepCalculation, ySliceForCalculation, grids.at(i), maxLevel, numberOfGridLevels, writeFiles, startStepFileWriter, filePath, tgvTestResults, devices)); } } } @@ -172,7 +173,7 @@ void ConfigFileReader::makeTestParameter() for (int i = 0; i < sw.size(); i++) { if (sw.at(i)) { - testParameter.push_back(ShearWaveTestParameter::getNewInstance(u0SW, v0SW, viscosity, 1.0, lx.at(i), lz.at(i), l0, numberOfTimeSteps, basisTimeStepLength, startStepCalculation, ySliceForCalculation, grids.at(i), maxLevel, numberOfGridLevels, writeFiles, startStepFileWriter, filePath, swTestResults, devices)); + testParameter.push_back(ShearWaveTestParameter::getNewInstance(u0SW, v0SW, viscosity, rho0, lx.at(i), lz.at(i), l0, numberOfTimeSteps, basisTimeStepLength, startStepCalculation, ySliceForCalculation, grids.at(i), maxLevel, numberOfGridLevels, writeFiles, startStepFileWriter, filePath, swTestResults, devices)); } } } diff --git a/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.h b/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.h index bb5bb69d8ce5a2a8d95f6257c03dbbc48ceb9f16..ccc2c0655b717f66d95f00917a41d8ca3c63cd6b 100644 --- a/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.h +++ b/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.h @@ -36,7 +36,7 @@ private: void makeTestResults(); bool testShouldRun(std::vector<bool> test); - real viscosity; + real viscosity, rho0; real u0SW, v0SW; real amplitudeTGV, u0TGV; real l0; @@ -51,7 +51,7 @@ private: std::string logFilePath; std::vector< std::string> grids; std::vector< real> lx; - std::vector< real> lx; + std::vector< real> lz; std::vector< int> devices; std::vector< bool> tgv; std::vector< bool> sw;