From b6f4a3a94c7c6d0b91eee8d549d462f402eeb1d9 Mon Sep 17 00:00:00 2001
From: Sina Ackermann <sina.ackermann@iws.uni-stuttgart.de>
Date: Wed, 31 Jan 2018 12:51:44 +0100
Subject: [PATCH] [test][freeflow] Use NumEqVector for sources and neumann
---
test/freeflow/navierstokes/angelitestproblem.hh | 6 +++---
test/freeflow/navierstokes/channeltestproblem.hh | 6 +++---
test/freeflow/navierstokes/closedsystemtestproblem.hh | 6 +++---
test/freeflow/navierstokes/doneatestproblem.hh | 6 +++---
test/freeflow/navierstokes/kovasznaytestproblem.hh | 6 +++---
test/freeflow/navierstokesnc/channeltestproblem.hh | 6 +++---
test/freeflow/navierstokesnc/densityflowproblem.hh | 6 +++---
test/freeflow/navierstokesnc/msfreeflowtestproblem.hh | 6 +++---
8 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/test/freeflow/navierstokes/angelitestproblem.hh b/test/freeflow/navierstokes/angelitestproblem.hh
index a4d1305c66..a6561feb94 100644
--- a/test/freeflow/navierstokes/angelitestproblem.hh
+++ b/test/freeflow/navierstokes/angelitestproblem.hh
@@ -98,7 +98,7 @@ class AngeliTestProblem : public NavierStokesProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using TimeLoopPtr = std::shared_ptr<TimeLoop<Scalar>>;
@@ -161,9 +161,9 @@ public:
*
* \param globalPos The global position
*/
- SourceValues sourceAtPos(const GlobalPosition &globalPos) const
+ NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
{
- return SourceValues(0.0);
+ return NumEqVector(0.0);
}
// \}
diff --git a/test/freeflow/navierstokes/channeltestproblem.hh b/test/freeflow/navierstokes/channeltestproblem.hh
index bc893ef8cb..8dfe135e62 100644
--- a/test/freeflow/navierstokes/channeltestproblem.hh
+++ b/test/freeflow/navierstokes/channeltestproblem.hh
@@ -110,7 +110,7 @@ class ChannelTestProblem : public NavierStokesProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using TimeLoopPtr = std::shared_ptr<CheckPointTimeLoop<Scalar>>;
@@ -145,9 +145,9 @@ public:
*
* \param globalPos The global position
*/
- SourceValues sourceAtPos(const GlobalPosition &globalPos) const
+ NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
{
- return SourceValues(0.0);
+ return NumEqVector(0.0);
}
// \}
/*!
diff --git a/test/freeflow/navierstokes/closedsystemtestproblem.hh b/test/freeflow/navierstokes/closedsystemtestproblem.hh
index 35c455f70e..3ecf2fcbe8 100644
--- a/test/freeflow/navierstokes/closedsystemtestproblem.hh
+++ b/test/freeflow/navierstokes/closedsystemtestproblem.hh
@@ -91,7 +91,7 @@ class ClosedSystemTestProblem : public NavierStokesProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
public:
@@ -130,9 +130,9 @@ public:
* \param values Stores the source values, acts as return value
* \param globalPos The global position
*/
- SourceValues sourceAtPos(const GlobalPosition &globalPos) const
+ NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
{
- return SourceValues(0.0);
+ return NumEqVector(0.0);
}
// \}
/*!
diff --git a/test/freeflow/navierstokes/doneatestproblem.hh b/test/freeflow/navierstokes/doneatestproblem.hh
index 1613a194de..5ba0d15881 100644
--- a/test/freeflow/navierstokes/doneatestproblem.hh
+++ b/test/freeflow/navierstokes/doneatestproblem.hh
@@ -103,7 +103,7 @@ class DoneaTestProblem : public NavierStokesProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
@@ -172,9 +172,9 @@ public:
*
* \param globalPos The global position
*/
- SourceValues sourceAtPos(const GlobalPosition &globalPos) const
+ NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
{
- SourceValues source(0.0);
+ NumEqVector source(0.0);
Scalar x = globalPos[0];
Scalar y = globalPos[1];
diff --git a/test/freeflow/navierstokes/kovasznaytestproblem.hh b/test/freeflow/navierstokes/kovasznaytestproblem.hh
index 27f3925dd8..ce99d609fd 100644
--- a/test/freeflow/navierstokes/kovasznaytestproblem.hh
+++ b/test/freeflow/navierstokes/kovasznaytestproblem.hh
@@ -96,7 +96,7 @@ class KovasznayTestProblem : public NavierStokesProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
@@ -164,9 +164,9 @@ public:
*
* \param globalPos The global position
*/
- SourceValues sourceAtPos(const GlobalPosition &globalPos) const
+ NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
{
- return SourceValues(0.0);
+ return NumEqVector(0.0);
}
// \}
diff --git a/test/freeflow/navierstokesnc/channeltestproblem.hh b/test/freeflow/navierstokesnc/channeltestproblem.hh
index f999ee6f8e..5cebba5386 100644
--- a/test/freeflow/navierstokesnc/channeltestproblem.hh
+++ b/test/freeflow/navierstokesnc/channeltestproblem.hh
@@ -122,7 +122,7 @@ class ChannelNCTestProblem : public NavierStokesProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using TimeLoopPtr = std::shared_ptr<CheckPointTimeLoop<Scalar>>;
using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
@@ -161,9 +161,9 @@ public:
*
* \param globalPos The global position
*/
- SourceValues sourceAtPos(const GlobalPosition &globalPos) const
+ NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
{
- return SourceValues(0.0);
+ return NumEqVector(0.0);
}
// \}
/*!
diff --git a/test/freeflow/navierstokesnc/densityflowproblem.hh b/test/freeflow/navierstokesnc/densityflowproblem.hh
index 3af036a487..bd6fc5e410 100644
--- a/test/freeflow/navierstokesnc/densityflowproblem.hh
+++ b/test/freeflow/navierstokesnc/densityflowproblem.hh
@@ -111,7 +111,7 @@ class DensityDrivenFlowProblem : public NavierStokesProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
@@ -152,9 +152,9 @@ public:
*
* \param globalPos The global position
*/
- SourceValues sourceAtPos(const GlobalPosition &globalPos) const
+ NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
{
- return SourceValues(0.0);
+ return NumEqVector(0.0);
}
// \}
/*!
diff --git a/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh b/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh
index 9f55cb50b2..9f008b1fb0 100644
--- a/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh
+++ b/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh
@@ -207,7 +207,7 @@ class MaxwellStefanNCTestProblem : public NavierStokesProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
@@ -352,9 +352,9 @@ public:
*
* \param globalPos The global position
*/
- SourceValues sourceAtPos(const GlobalPosition &globalPos) const
+ NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
{
- return SourceValues(0.0);
+ return NumEqVector(0.0);
}
// \}
--
GitLab