From 5b9e60c3512b9a6c24e6fe5e9490e3f5dd8cc1c4 Mon Sep 17 00:00:00 2001
From: Timon Habenicht <t.habenicht@tu-bs.de>
Date: Fri, 18 May 2018 14:04:31 +0200
Subject: [PATCH] adds rho0
---
.../Utilities/ConfigFileReader/ConfigFileReader.cpp | 5 +++--
.../Utilities/ConfigFileReader/ConfigFileReader.h | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp b/targets/tests/NumericalTests/Utilities/ConfigFileReader/ConfigFileReader.cpp
index 93fbbf5eb..1a2a6bf34 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 bb5bb69d8..ccc2c0655 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;
--
GitLab