Commit a9e10f66 authored by Kilian Weishaupt's avatar Kilian Weishaupt
Browse files

[porousmediumflow] Use correct volVars in all ported models

parent d8adbd42
......@@ -26,14 +26,14 @@
#define DUMUX_1PNC_VOLUME_VARIABLES_HH
#include <dumux/common/properties.hh>
#include <dumux/discretization/volumevariables.hh>
#include <dumux/porousmediumflow/volumevariables.hh>
namespace Dumux
{
/*!
* \ingroup OnePNCModel
* \ingroup ImplicitVolumeVariables
* \ingroup PorousMediumFlowVolumeVariables
* \brief Contains the quantities which are are constant within a
* finite volume in the one-phase, n-component model.
*
......@@ -45,9 +45,9 @@ namespace Dumux
* model by specifying which phase is present through the DuMuX property system.
*/
template <class TypeTag>
class OnePNCVolumeVariables : public ImplicitVolumeVariables<TypeTag>
class OnePNCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
{
using ParentType = ImplicitVolumeVariables<TypeTag>;
using ParentType = PorousMediumFlowVolumeVariables<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
......
......@@ -26,21 +26,21 @@
#define DUMUX_2P_VOLUME_VARIABLES_HH
#include <dumux/common/properties.hh>
#include <dumux/discretization/volumevariables.hh>
#include <dumux/porousmediumflow/volumevariables.hh>
#include <dune/common/fvector.hh>
namespace Dumux
{
/*!
* \ingroup TwoPModel
* \ingroup ImplicitVolumeVariables
* \ingroup PorousMediumFlowVolumeVariables
* \brief Contains the quantities which are are constant within a
* finite volume in the two-phase model.
*/
template <class TypeTag>
class TwoPVolumeVariables : public ImplicitVolumeVariables<TypeTag>
class TwoPVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
{
using ParentType = ImplicitVolumeVariables<TypeTag>;
using ParentType = PorousMediumFlowVolumeVariables<TypeTag>;
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
......
......@@ -32,7 +32,7 @@
#include <dumux/common/properties.hh>
#include <dumux/material/fluidstates/compositional.hh>
#include <dumux/discretization/volumevariables.hh>
#include <dumux/porousmediumflow/volumevariables.hh>
#include <dumux/material/constraintsolvers/computefromreferencephase.hh>
#include <dumux/material/constraintsolvers/miscible2pnccomposition.hh>
......@@ -43,14 +43,14 @@ namespace Dumux
/*!
* \ingroup TwoPNCModel
* \ingroup ImplicitVolumeVariables
* \ingroup PorousMediumFlowVolumeVariables
* \brief Contains the quantities which are are constant within a
* finite volume in the two-phase, n-component model.
*/
template <class TypeTag>
class TwoPNCVolumeVariables : public ImplicitVolumeVariables<TypeTag>
class TwoPNCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
{
using ParentType = ImplicitVolumeVariables<TypeTag>;
using ParentType = PorousMediumFlowVolumeVariables<TypeTag>;
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
......
......@@ -28,7 +28,7 @@
#include <dumux/common/properties.hh>
#include <dumux/material/constants.hh>
#include <dumux/material/fluidstates/immiscible.hh>
#include <dumux/discretization/volumevariables.hh>
#include <dumux/porousmediumflow/volumevariables.hh>
#include <dumux/discretization/methods.hh>
namespace Dumux
......@@ -36,14 +36,14 @@ namespace Dumux
/*!
* \ingroup ThreePModel
* \ingroup ImplicitVolumeVariables
* \ingroup PorousMediumFlowVolumeVariables
* \brief Contains the quantities which are are constant within a
* finite volume in three-phase model.
*/
template <class TypeTag>
class ThreePVolumeVariables : public ImplicitVolumeVariables<TypeTag>
class ThreePVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
{
using ParentType = ImplicitVolumeVariables<TypeTag>;
using ParentType = PorousMediumFlowVolumeVariables<TypeTag>;
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
......
......@@ -30,7 +30,7 @@
#include <dumux/material/fluidstates/compositional.hh>
#include <dumux/material/constraintsolvers/computefromreferencephase.hh>
#include <dumux/material/constraintsolvers/misciblemultiphasecomposition.hh>
#include <dumux/discretization/volumevariables.hh>
#include <dumux/porousmediumflow/volumevariables.hh>
#include <dumux/discretization/methods.hh>
namespace Dumux
......@@ -38,14 +38,14 @@ namespace Dumux
/*!
* \ingroup ThreePThreeCModel
* \ingroup ImplicitVolumeVariables
* \ingroup PorousMediumFlowVolumeVariables
* \brief Contains the quantities which are are constant within a
* finite volume in the three-phase three-component model.
*/
template <class TypeTag>
class ThreePThreeCVolumeVariables : public ImplicitVolumeVariables<TypeTag>
class ThreePThreeCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
{
using ParentType = ImplicitVolumeVariables<TypeTag>;
using ParentType = PorousMediumFlowVolumeVariables<TypeTag>;
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
......
......@@ -25,7 +25,7 @@
#define DUMUX_RICHARDS_VOLUME_VARIABLES_HH
#include <dumux/common/properties.hh>
#include <dumux/discretization/volumevariables.hh>
#include <dumux/porousmediumflow/volumevariables.hh>
#include <dumux/material/idealgas.hh>
#include <dumux/material/constants.hh>
......@@ -34,16 +34,16 @@ namespace Dumux
/*!
* \ingroup RichardsModel
* \ingroup ImplicitVolumeVariables
* \ingroup PorousMediumFlowVolumeVariables
* \brief Volume averaged quantities required by the Richards model.
*
* This contains the quantities which are are constant within a finite
* volume in the Richards model
*/
template <class TypeTag>
class RichardsVolumeVariables : public ImplicitVolumeVariables<TypeTag>
class RichardsVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
{
using ParentType = ImplicitVolumeVariables<TypeTag>;
using ParentType = PorousMediumFlowVolumeVariables<TypeTag>;
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
......
......@@ -24,21 +24,21 @@
#define DUMUX_TRACER_VOLUME_VARIABLES_HH
#include <dumux/common/properties.hh>
#include <dumux/discretization/volumevariables.hh>
#include <dumux/porousmediumflow/volumevariables.hh>
namespace Dumux
{
/*!
* \ingroup TracerModel
* \ingroup ImplicitVolumeVariables
* \ingroup PorousMediumFlowVolumeVariables
* \brief Contains the quantities which are constant within a
* finite volume for the tracer model.
*/
template <class TypeTag>
class TracerVolumeVariables : public ImplicitVolumeVariables<TypeTag>
class TracerVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
{
using ParentType = ImplicitVolumeVariables<TypeTag>;
using ParentType = PorousMediumFlowVolumeVariables<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment