From 7966c8604c7cc6a9cc9a63b908fb04493d1c648e Mon Sep 17 00:00:00 2001
From: Sina Ackermann <sina.ackermann@iws.uni-stuttgart.de>
Date: Wed, 31 Jan 2018 12:10:52 +0100
Subject: [PATCH] [test][2p] Use NumEqVector for sources and neumann
---
test/porousmediumflow/2p/implicit/fracture/problem.hh | 9 +++++----
.../2p/implicit/incompressible/problem.hh | 6 +++---
.../2p/implicit/nonisothermal/problem.hh | 11 +++++------
.../2p1c/implicit/steaminjectionproblem.hh | 11 +++++------
.../2p2c/implicit/injectionproblem.hh | 6 +++---
.../porousmediumflow/2p2c/implicit/waterairproblem.hh | 6 +++---
.../2pnc/implicit/2pncdiffusionproblem.hh | 6 +++---
.../porousmediumflow/2pnc/implicit/fuelcellproblem.hh | 6 +++---
.../2pncmin/implicit/dissolutionproblem.hh | 6 +++---
9 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/test/porousmediumflow/2p/implicit/fracture/problem.hh b/test/porousmediumflow/2p/implicit/fracture/problem.hh
index 7dab629e6f..859ea96a76 100644
--- a/test/porousmediumflow/2p/implicit/fracture/problem.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/problem.hh
@@ -90,6 +90,7 @@ class FractureProblem : public PorousMediumFlowProblem<TypeTag>
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
enum {
@@ -147,9 +148,9 @@ public:
* \f$ [ \textnormal{unit of primary variable} / (m^\textrm{dim} \cdot s )] \f$
* \param globalPos The global position
*/
- PrimaryVariables sourceAtPos(const GlobalPosition &globalPos) const
+ NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
{
- return PrimaryVariables(0.0);
+ return NumEqVector(0.0);
}
// \}
@@ -208,9 +209,9 @@ public:
* For this method, the \a values parameter stores the mass flux
* in normal direction of each phase. Negative values mean influx.
*/
- PrimaryVariables neumannAtPos(const GlobalPosition &globalPos) const
+ NumEqVector neumannAtPos(const GlobalPosition &globalPos) const
{
- PrimaryVariables values(0.0);
+ NumEqVector values(0.0);
if (onInlet_(globalPos)) {
values[contiNEqIdx] = -0.04; // kg / (m * s)
}
diff --git a/test/porousmediumflow/2p/implicit/incompressible/problem.hh b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
index 5abe543119..a3de10baaa 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/problem.hh
+++ b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
@@ -90,7 +90,7 @@ class TwoPTestProblem : public PorousMediumFlowProblem<TypeTag>
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimensionworld>;
- using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
pwIdx = Indices::pwIdx,
@@ -161,9 +161,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);
if (onInlet_(globalPos))
values[contiNEqIdx] = -0.04; // kg / (m * s)
return values;
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
index 0fc40e9725..f35f3dd1f7 100644
--- a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
@@ -121,8 +121,7 @@ class InjectionProblem2PNI : public PorousMediumFlowProblem<TypeTag>
};
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
- using Sources = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
@@ -176,9 +175,9 @@ public:
* \f$ [ \textnormal{unit of primary variable} / (m^\textrm{dim} \cdot s )] \f$
* \param globalPos The global position
*/
- Sources sourceAtPos(const GlobalPosition &globalPos) const
+ NumEqVector sourceAtPos(const GlobalPosition &globalPos) const
{
- Sources values(0.0);
+ NumEqVector values(0.0);
values = 0;
return values;
}
@@ -242,12 +241,12 @@ public:
* The \a values store the mass flux of each phase normal to the boundary.
* Negative values indicate an inflow.
*/
- NeumannFluxes neumann(const Element &element,
+ NumEqVector neumann(const Element &element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf) const
{
- NeumannFluxes values(0.0);
+ NumEqVector values(0.0);
const auto globalPos = scvf.ipGlobal();
if (globalPos[1] < 13.75 + eps_ && globalPos[1] > 6.875 - eps_)
diff --git a/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh b/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
index b8b515e9d5..124a0f56e9 100644
--- a/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
+++ b/test/porousmediumflow/2p1c/implicit/steaminjectionproblem.hh
@@ -86,7 +86,7 @@ class InjectionProblem : public PorousMediumFlowProblem<TypeTag>
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using Sources = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -94,7 +94,6 @@ class InjectionProblem : public PorousMediumFlowProblem<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
// copy some indices for convenience
enum {
@@ -130,12 +129,12 @@ public:
//! \copydoc Dumux::FVProblem::source()
- Sources source(const Element &element,
+ NumEqVector source(const Element &element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolume &scv) const
{
- return Sources(0.0);
+ return NumEqVector(0.0);
}
/*!
@@ -191,12 +190,12 @@ public:
* in normal direction of each phase. Negative values mean influx.
* E.g. for the mass balance that would the mass flux in \f$ [ kg / (m^2 \cdot s)] \f$.
*/
- ResidualVector neumann(const Element& element,
+ NumEqVector neumann(const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf) const
{
- ResidualVector values(0.0);
+ NumEqVector values(0.0);
const auto& ipGlobal = scvf.ipGlobal();
diff --git a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
index a1420e0e56..e39f4765ae 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
@@ -121,7 +121,7 @@ class InjectionProblem : 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 ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using Element = typename GridView::template Codim<0>::Entity;
@@ -241,12 +241,12 @@ public:
* The \a values store the mass flux of each phase normal to the boundary.
* Negative values indicate an inflow.
*/
- NeumannFluxes neumann(const Element& element,
+ NumEqVector neumann(const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf) const
{
- NeumannFluxes values(0.0);
+ NumEqVector values(0.0);
const auto& globalPos = scvf.ipGlobal();
diff --git a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
index 60797abd7c..1fb629d567 100644
--- a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
@@ -128,7 +128,7 @@ class WaterAirProblem : 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;
@@ -232,12 +232,12 @@ public:
*
* The units must be according to either using mole or mass fractions. (mole/(m^2*s) or kg/(m^2*s))
*/
- NeumannFluxes neumann(const Element& element,
+ NumEqVector neumann(const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf) const
{
- NeumannFluxes values(0.0);
+ NumEqVector values(0.0);
const auto& globalPos = scvf.ipGlobal();
diff --git a/test/porousmediumflow/2pnc/implicit/2pncdiffusionproblem.hh b/test/porousmediumflow/2pnc/implicit/2pncdiffusionproblem.hh
index 3539d15ebf..33de974b75 100644
--- a/test/porousmediumflow/2pnc/implicit/2pncdiffusionproblem.hh
+++ b/test/porousmediumflow/2pnc/implicit/2pncdiffusionproblem.hh
@@ -107,7 +107,7 @@ class TwoPNCDiffusionProblem : 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 GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
@@ -212,9 +212,9 @@ public:
*
* The units must be according to either using mole or mass fractions. (mole/(m^2*s) or kg/(m^2*s))
*/
- NeumannFluxes neumannAtPos(const GlobalPosition& globalPos) const
+ NumEqVector neumannAtPos(const GlobalPosition& globalPos) const
{
- NeumannFluxes values(0.0);
+ NumEqVector values(0.0);
return values;
}
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh b/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
index b0312a144d..71b18bad20 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
@@ -84,7 +84,7 @@ class FuelCellProblem : public PorousMediumFlowProblem<TypeTag>
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using Sources = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -167,12 +167,12 @@ public:
{ return temperature_; }
//! \copydoc Dumux::FVProblem::source()
- Sources source(const Element &element,
+ NumEqVector source(const Element &element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolume &scv) const
{
- Sources values(0.0);
+ NumEqVector values(0.0);
const auto& globalPos = scv.dofPosition();
//reaction sources from electro chemistry
diff --git a/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh b/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
index 9a720af2b9..0e83673507 100644
--- a/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
+++ b/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
@@ -125,7 +125,7 @@ class DissolutionProblem : public PorousMediumFlowProblem<TypeTag>
};
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using Sources = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using Element = typename GridView::template Codim<0>::Entity;
@@ -314,12 +314,12 @@ public:
* that the conserved quantity is created, negative ones mean that it vanishes.
* E.g. for the mass balance that would be a mass rate in \f$ [ kg / (m^3 \cdot s)] \f$.
*/
- Sources source(const Element &element,
+ NumEqVector source(const Element &element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolume &scv) const
{
- Sources source(0.0);
+ NumEqVector source(0.0);
const auto& volVars = elemVolVars[scv];
--
GitLab