From c63886fddb4936f73926fba2d1898f4ef8f9dc96 Mon Sep 17 00:00:00 2001
From: Sina Ackermann <sina.ackermann@iws.uni-stuttgart.de>
Date: Wed, 31 Jan 2018 12:11:32 +0100
Subject: [PATCH] [test][3p] Use NumEqVector for sources and neumann
---
.../3p/implicit/3pniconductionproblem.hh | 10 +++++-----
.../3p/implicit/3pniconvectionproblem.hh | 5 +++--
.../3p/implicit/infiltration3pproblem.hh | 6 +++---
.../3p3c/implicit/columnxylolproblem.hh | 6 +++---
.../3p3c/implicit/infiltration3p3cproblem.hh | 6 +++---
test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh | 6 +++---
6 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
index d93cd2d90b..648ee3c044 100644
--- a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
+++ b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
@@ -116,7 +116,7 @@ class ThreePNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using IapwsH2O = H2O<Scalar>;
- using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
@@ -262,9 +262,9 @@ public:
* For this method, the \a values parameter stores the mass flux
* in normal direction of each phase. Negative values mean influx.
*/
- NeumannFluxes neumannAtPos(const GlobalPosition &globalPos) const
+ NumEqVector neumannAtPos(const GlobalPosition &globalPos) const
{
- return NeumannFluxes(0.0);
+ return NumEqVector(0.0);
}
// \}
@@ -286,9 +286,9 @@ public:
*
* The units must be according to either using mole or mass fractions. (mole/(m^3*s) or kg/(m^3*s))
*/
- PrimaryVariables sourceAtPos(const GlobalPosition &globalPos) const
+ NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
{
- return PrimaryVariables(0.0);
+ return NumEqVector(0.0);
}
/*!
diff --git a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
index 67a0383bcb..05d9674f39 100644
--- a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
+++ b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
@@ -108,6 +108,7 @@ class ThreePNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
@@ -266,12 +267,12 @@ public:
* \param scvf The subcontrolvolume face
* Negative values mean influx.
*/
- PrimaryVariables neumann(const Element &element,
+ NumEqVector neumann(const Element &element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf) const
{
- PrimaryVariables values(0.0);
+ NumEqVector values(0.0);
const auto globalPos = scvf.ipGlobal();
const auto& volVars = elemVolVars[scvf.insideScvIdx()];
diff --git a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
index c7f7e9a8ea..86e8ad3d56 100644
--- a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
@@ -113,7 +113,7 @@ class InfiltrationThreePProblem : public PorousMediumFlowProblem<TypeTag>
};
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
@@ -222,9 +222,9 @@ public:
* For this method, the \a values parameter stores the mass flux
* in normal direction of each phase. Negative values mean influx.
*/
- NeumannFluxes neumannAtPos(const GlobalPosition &globalPos) const
+ NumEqVector neumannAtPos(const GlobalPosition &globalPos) const
{
- NeumannFluxes values(0.0);
+ NumEqVector values(0.0);
// negative values for injection
if (time_ < 2592000.0 - eps_)
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh b/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
index cf209daa1d..6b266e6163 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
@@ -114,7 +114,7 @@ class ColumnProblem : public PorousMediumFlowProblem<TypeTag>
};
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using Element = typename GridView::template Codim<0>::Entity;
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
@@ -202,12 +202,12 @@ public:
* For this method, the \a values parameter stores the mass flux
* in normal direction of each phase. Negative values mean influx.
*/
- NeumannFluxes neumann(const Element& element,
+ NumEqVector neumann(const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf) const
{
- PrimaryVariables values(0.0);
+ NumEqVector values(0.0);
const auto& globalPos = scvf.ipGlobal();
// negative values for injection
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh b/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh
index 2ac4f5212d..e3394126f1 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/infiltration3p3cproblem.hh
@@ -120,7 +120,7 @@ class InfiltrationThreePThreeCProblem : public PorousMediumFlowProblem<TypeTag>
};
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
@@ -223,9 +223,9 @@ public:
* For this method, the \a values parameter stores the mass flux
* in normal direction of each phase. Negative values mean influx.
*/
- NeumannFluxes neumannAtPos(const GlobalPosition &globalPos) const
+ NumEqVector neumannAtPos(const GlobalPosition &globalPos) const
{
- NeumannFluxes values(0.0);
+ NumEqVector values(0.0);
// negative values for injection
if ((globalPos[0] < 80.0 + eps_) && (globalPos[0] > 55.0 - eps_) && (globalPos[1] > 10.0 - eps_))
diff --git a/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh b/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
index 63d53d14e7..eca71a0930 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
@@ -130,7 +130,7 @@ class KuevetteProblem : public PorousMediumFlowProblem<TypeTag>
};
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using Element = typename GridView::template Codim<0>::Entity;
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
@@ -219,12 +219,12 @@ public:
* For this method, the \a values parameter stores the mass flux
* in normal direction of each phase. Negative values mean influx.
*/
- NeumannFluxes neumann(const Element& element,
+ NumEqVector neumann(const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf) const
{
- PrimaryVariables values(0.0);
+ NumEqVector values(0.0);
const auto& globalPos = scvf.ipGlobal();
// negative values for injection
--
GitLab