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

[porousmediumFlow] Export indices in all volVars

parent f8684c0c
......@@ -49,7 +49,6 @@ class OnePVolumeVariables
using EnergyVolVars = EnergyVolumeVariables<Traits, OnePVolumeVariables<Traits> >;
using Scalar = typename Traits::PrimaryVariables::value_type;
using Indices = typename Traits::ModelTraits::Indices;
using PermeabilityType = typename Traits::PermeabilityType;
static constexpr int numFluidComps = ParentType::numFluidComponents();
public:
......@@ -57,6 +56,8 @@ public:
using FluidSystem = typename Traits::FluidSystem;
//! Export the fluid state type
using FluidState = typename Traits::FluidState;
//! Export the indices
using Indices = typename Traits::ModelTraits::Indices;
//! Export type of solid state
using SolidState = typename Traits::SolidState;
//! Export type of solid system
......
......@@ -47,14 +47,14 @@ class TwoPVolumeVariables
using EnergyVolVars = EnergyVolumeVariables<Traits, TwoPVolumeVariables<Traits> >;
using PermeabilityType = typename Traits::PermeabilityType;
using ModelTraits = typename Traits::ModelTraits;
using Indices = typename ModelTraits::Indices;
using Idx = typename ModelTraits::Indices;
using Scalar = typename Traits::PrimaryVariables::value_type;
using FS = typename Traits::FluidSystem;
static constexpr int numFluidComps = ParentType::numFluidComponents();
enum
{
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
pressureIdx = Idx::pressureIdx,
saturationIdx = Idx::saturationIdx,
phase0Idx = FS::phase0Idx,
phase1Idx = FS::phase1Idx
......@@ -67,6 +67,8 @@ public:
using FluidSystem = typename Traits::FluidSystem;
//! Export type of fluid state
using FluidState = typename Traits::FluidState;
//! Export the indices
using Indices = typename ModelTraits::Indices;
//! Export type of solid state
using SolidState = typename Traits::SolidState;
//! Export type of solid system
......
......@@ -107,6 +107,8 @@ public:
using FluidState = typename Traits::FluidState;
//! The fluid system used here
using FluidSystem = typename Traits::FluidSystem;
//! Export the indices
using Indices = typename ModelTraits::Indices;
//! Export type of solid state
using SolidState = typename Traits::SolidState;
//! Export type of solid system
......
......@@ -98,6 +98,8 @@ public:
using FluidState = typename Traits::FluidState;
//! Export fluid system type
using FluidSystem = typename Traits::FluidSystem;
//! Export the indices
using Indices = typename ModelTraits::Indices;
//! Export type of solid state
using SolidState = typename Traits::SolidState;
//! Export type of solid system
......
......@@ -47,7 +47,7 @@ class ThreePVolumeVariables
using Scalar = typename Traits::PrimaryVariables::value_type;
using PermeabilityType = typename Traits::PermeabilityType;
using Indices = typename Traits::ModelTraits::Indices;
using Idx = typename Traits::ModelTraits::Indices;
using FS = typename Traits::FluidSystem;
static constexpr int numFluidComps = ParentType::numFluidComponents();
......@@ -56,9 +56,9 @@ class ThreePVolumeVariables
gPhaseIdx = FS::gPhaseIdx,
nPhaseIdx = FS::nPhaseIdx,
swIdx = Indices::swIdx,
snIdx = Indices::snIdx,
pressureIdx = Indices::pressureIdx
swIdx = Idx::swIdx,
snIdx = Idx::snIdx,
pressureIdx = Idx::pressureIdx
};
public:
......@@ -66,6 +66,8 @@ public:
using FluidState = typename Traits::FluidState;
//! Export fluid system type
using FluidSystem = typename Traits::FluidSystem;
//! Export the indices
using Indices = Idx;
//! Export type of solid state
using SolidState = typename Traits::SolidState;
//! Export type of solid system
......
......@@ -95,6 +95,8 @@ public:
using FluidState = typename Traits::FluidState;
//! The fluid system used here
using FluidSystem = typename Traits::FluidSystem;
//! Export the indices
using Indices = typename ModelTraits::Indices;
//! Export type of solid state
using SolidState = typename Traits::SolidState;
//! Export type of solid system
......
......@@ -278,7 +278,6 @@ class NonEquilibriumVolumeVariablesImplementation<Traits,
using Scalar = typename Traits::PrimaryVariables::value_type;
using ModelTraits = typename Traits::ModelTraits;
using Indices = typename ModelTraits::Indices;
using FS = typename Traits::FluidSystem;
static constexpr auto numEnergyEqFluid = ModelTraits::numEnergyEqFluid();
static constexpr auto numEnergyEqSolid = ModelTraits::numEnergyEqSolid();
......@@ -288,7 +287,9 @@ class NonEquilibriumVolumeVariablesImplementation<Traits,
using NumFluidPhasesArray = std::array<Scalar, ModelTraits::numFluidPhases()>;
public:
using Indices = typename ModelTraits::Indices;
using FluidState = typename Traits::FluidState;
/*!
* \brief Update all quantities for a given control volume
*
......@@ -603,7 +604,6 @@ class NonEquilibriumVolumeVariablesImplementation<Traits,
using Scalar = typename Traits::PrimaryVariables::value_type;
using ModelTraits = typename Traits::ModelTraits;
using Indices = typename ModelTraits::Indices;
static constexpr auto numEnergyEqFluid = ModelTraits::numEnergyEqFluid();
static constexpr auto numEnergyEqSolid = ModelTraits::numEnergyEqSolid();
......@@ -621,6 +621,8 @@ class NonEquilibriumVolumeVariablesImplementation<Traits,
ModelTraits::numFluidPhases()+numEnergyEqSolid>;
public:
using Indices = typename ModelTraits::Indices;
/*!
* \brief Update all quantities for a given control volume
*
......
......@@ -158,9 +158,13 @@ class EnergyVolumeVariablesImplementation<Traits, Impl, true>
public:
// export the fluidstate
using FluidState = typename Traits::FluidState;
using SolidState = typename Traits::SolidState;
//! export the underlying fluid system
using FluidSystem = typename Traits::FluidSystem;
//! Export the indices
using Indices = Idx;
// export the solidstate
using SolidState = typename Traits::SolidState;
//! export the underlying solid system
using SolidSystem = typename Traits::SolidSystem;
//! The temperature is obtained from the problem as a constant for isothermal models
......
......@@ -63,9 +63,12 @@ class TracerVolumeVariables
static constexpr int numFluidComps = ParentType::numFluidComponents();
public:
//! Export fluid system type
//! Export the fluid system type
using FluidSystem = typename Traits::FluidSystem;
//! Export the solid state type
using SolidState = typename Traits::SolidState;
//! Export the indices
using Indices = typename Traits::ModelTraits::Indices;
/*!
* \brief Updates all quantities for a given control volume.
......
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