diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/2p2c_comparison_problem.hh b/test/porousmediumflow/2p2c/implicit/mpnccomparison/2p2c_comparison_problem.hh
index e78ee80d4be9265c9ab75cab87ce77ed13562d30..be7623bebbe573f844ba7056cc3dae76bb22a201 100644
--- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/2p2c_comparison_problem.hh
+++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/2p2c_comparison_problem.hh
@@ -34,7 +34,6 @@
#include <dumux/material/fluidsystems/h2on2.hh>
#include <dumux/material/fluidstates/compositional.hh>
-#include <dumux/material/constraintsolvers/computefromreferencephase.hh>
#include "2p2c_comparison_spatialparams.hh"
#include "vtkoutputfields.hh"
@@ -92,19 +91,13 @@ class TwoPTwoCComparisonProblem
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 NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
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 SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
- using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
- using ParameterCache = typename FluidSystem::ParameterCache;
// world dimension
enum {dimWorld = GridView::dimensionworld};
@@ -122,9 +115,7 @@ class TwoPTwoCComparisonProblem
contiN2EqIdx = Indices::contiNEqIdx
};
-
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using PhaseVector = Dune::FieldVector<Scalar, numPhases>;
static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
public:
@@ -173,21 +164,8 @@ public:
Scalar temperature() const
{ return temperature_; }
- /*!
- * \brief Write a restart file?
- */
- bool shouldWriteRestartFile() const
- {
- return ParentType::shouldWriteRestartFile();
- }
-
- // \}
-
/*!
* \name Boundary conditions
- */
- // \{
- /*!
* \brief Specifies which kind of boundary condition should be
* used for which equation on a given boundary segment
*
@@ -232,9 +210,8 @@ public:
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf) const
-
{
- PrimaryVariables values(0.0);
+ NeumannFluxes values(0.0);
const auto& globalPos = scvf.ipGlobal();
Scalar injectedAirMass = -1e-3;
Scalar injectedAirMolarMass = injectedAirMass/FluidSystem::molarMass(nCompIdx);
@@ -247,32 +224,6 @@ public:
// \}
- /*!
- * \name Volume terms
- */
- // \{
-
- /*!
- * \brief Evaluate the source term for all balance equations within a given
- * sub-control-volume.
- *
- * \param values Stores the solution for the conservation equations in
- * \f$ [ \textnormal{unit of primary variable} / (m^\textrm{dim} \cdot s )] \f$
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- *
- * Positive values mean that mass is created, negative ones mean that it vanishes.
- */
- //! \copydoc Dumux::ImplicitProblem::source()
- PrimaryVariables source(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolume &scv) const
- {
- return PrimaryVariables(0.0);
- }
-
/*!
* \brief Evaluate the initial value for a control volume.
*
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh
index e8b55df56b3b88bcfb702fdb9f9fd644f542d5db..95aeaa8d947cbddaf729411ccc8f7dedbdb75369 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh
@@ -93,16 +93,13 @@ class MPNCComparisonProblem
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 NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
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 SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using ParameterCache = typename FluidSystem::ParameterCache;
@@ -168,14 +165,6 @@ public:
Scalar temperature() const
{ return temperature_; }
- /*!
- * \brief Write a restart file?
- */
- bool shouldWriteRestartFile() const
- {
- return ParentType::shouldWriteRestartFile();
- }
-
// \}
/*!
@@ -223,12 +212,12 @@ public:
*
* Negative values mean influx.
*/
- PrimaryVariables neumann(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf) const
+ NeumannFluxes neumann(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace& scvf) const
{
- PrimaryVariables values(0.0);
+ NeumannFluxes values(0.0);
const auto& globalPos = scvf.ipGlobal();
Scalar injectedAirMass = -1e-3;
Scalar injectedAirMolarMass = injectedAirMass/FluidSystem::molarMass(nCompIdx);
@@ -246,27 +235,6 @@ public:
*/
// \{
- /*!
- * \brief Evaluate the source term for all balance equations within a given
- * sub-control-volume.
- *
- * \param values Stores the solution for the conservation equations in
- * \f$ [ \textnormal{unit of primary variable} / (m^\textrm{dim} \cdot s )] \f$
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- *
- * Positive values mean that mass is created, negative ones mean that it vanishes.
- */
- //! \copydoc Dumux::ImplicitProblem::source()
- PrimaryVariables source(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolume &scv) const
- {
- return PrimaryVariables(0.0);
- }
-
/*!
* \brief Evaluate the initial value for a control volume.
*
@@ -287,7 +255,7 @@ private:
// the internal method for the initial condition
PrimaryVariables initial_(const GlobalPosition &globalPos) const
{
- PrimaryVariables values(0.0);
+ PrimaryVariables values(0.0);
FluidState fs;
// set the fluid temperatures