Commit b212e37f authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

Second part of Friday's renaming.

(Review and improvements by kathinka)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8201 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 5905ae0b
......@@ -62,8 +62,10 @@ NEW_PROP_TAG(StabilizationAlpha); //!< The parameter for the stabilization
NEW_PROP_TAG(StabilizationBeta); //!< The parameter for the stabilization at boundaries
NEW_PROP_TAG(EnableNavierStokes); //!< Returns whether Navier-Stokes should be solved instead of plain Stokes
NEW_PROP_TAG(PhaseIndex); //!< A phase index in case that a two-phase fluidsystem is used
NEW_PROP_TAG(SpatialParameters); //!< The type of the spatial parameters
NEW_PROP_TAG(PhaseIndex); //!< DEPRECATED A phase index in case that a two-phase fluidsystem is used
NEW_PROP_TAG(PhaseIdx); //!< A phase index in case that a two-phase fluidsystem is used
NEW_PROP_TAG(SpatialParameters); //!< DEPRECATED The type of the spatial parameters
NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
NEW_PROP_TAG(Scaling); //!Defines Scaling of the model
}
}
......
......@@ -134,9 +134,12 @@ public:
};
//! Set the phaseIndex per default to zero (important for two-phase fluidsystems).
//! DEPRECATED Set the phaseIndex per default to zero (important for two-phase fluidsystems).
SET_INT_PROP(BoxStokes, PhaseIndex, 0);
//! Set the phaseIndex per default to zero (important for two-phase fluidsystems).
SET_INT_PROP(BoxStokes, PhaseIdx, 0);
//! Set calculation to Stokes, not Navier-Stokes
SET_BOOL_PROP(BoxStokes, EnableNavierStokes, false);
}
......
......@@ -62,7 +62,7 @@ class StokesVolumeVariables : public BoxVolumeVariables<TypeTag>
pressureIdx = Indices::pressureIdx
};
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx) };
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
......
......@@ -67,7 +67,8 @@ class Stokes2cFluxVariables : public StokesFluxVariables<TypeTag>
enum { dim = GridView::dimension };
enum { comp1Idx = Indices::comp1Idx };
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
enum { lCompIdx = comp1Idx } DUMUX_DEPRECATED_MSG("use comp1Idx instead");
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx) };
typedef typename GridView::template Codim<0>::Entity Element;
typedef Dune::FieldVector<Scalar, dim> DimVector;
......
......@@ -51,10 +51,14 @@ public:
// Phase indices
static const int wPhaseIdx = FluidSystem::lPhaseIdx; //!< Index of the wetting phase
static const int nPhaseIdx = FluidSystem::gPhaseIdx; //!< Index of the non-wetting phase
static const int lPhaseIdx DUMUX_DEPRECATED_MSG("use wPhaseIdx instead") = wPhaseIdx; //!< \deprecated use wPhaseIdx instead
static const int gPhaseIdx DUMUX_DEPRECATED_MSG("use nPhaseIdx instead") = nPhaseIdx; //!< \deprecated use nPhaseIdx instead
// Component indices
static const int comp1Idx = 0; //!< Index of the wetting's primary component
static const int comp0Idx = 1; //!< Index of the non-wetting's primary component
static const int lCompIdx = comp1Idx; //!< Index of the wetting's primary component
static const int gCompIdx = comp0Idx; //!< Index of the non-wetting's primary component
// equation and primary variable indices
static const int dim = StokesCommonIndices<TypeTag>::dim;
......
......@@ -55,7 +55,8 @@ class Stokes2cLocalResidual : public StokesLocalResidual<TypeTag>
enum { dim = GridView::dimension };
enum { transportIdx = Indices::transportIdx }; //!< Index of the transport equation
enum { comp1Idx = Indices::comp1Idx }; //!< Index of the transported component
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex)}; //!< Index of the considered phase (only of interest when using two-phase fluidsystems)
enum { lCompIdx = comp1Idx } DUMUX_DEPRECATED_MSG("use comp1Idx instead");
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx)}; //!< Index of the considered phase (only of interest when using two-phase fluidsystems)
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
......
......@@ -76,7 +76,8 @@ class Stokes2cModel : public StokesModel<TypeTag>
enum { dim = GridView::dimension };
enum { comp1Idx = Indices::comp1Idx };
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
enum { lCompIdx = comp1Idx } DUMUX_DEPRECATED_MSG("use comp1Idx instead");
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx) };
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
......@@ -110,7 +111,7 @@ public:
unsigned numElements = this->gridView_().size(0);
ScalarField &rank = *writer.allocateManagedBuffer(numElements);
FVElementGeometry fvElemGeom;
FVElementGeometry fvGeometry;
VolumeVariables volVars;
ElementBoundaryTypes elemBcTypes;
......@@ -121,8 +122,8 @@ public:
int idx = this->elementMapper().map(*elemIt);
rank[idx] = this->gridView_().comm().rank();
fvElemGeom.update(this->gridView_(), *elemIt);
elemBcTypes.update(this->problem_(), *elemIt, fvElemGeom);
fvGeometry.update(this->gridView_(), *elemIt);
elemBcTypes.update(this->problem_(), *elemIt, fvGeometry);
int numLocalVerts = elemIt->template count<dim>();
for (int i = 0; i < numLocalVerts; ++i)
......@@ -131,7 +132,7 @@ public:
volVars.update(sol[globalIdx],
this->problem_(),
*elemIt,
fvElemGeom,
fvGeometry,
i,
false);
......
......@@ -91,7 +91,7 @@ public:
};
//! Choose the considered phase (single-phase system); the gas phase is used
//! DEPRECATED Choose the considered phase (single-phase system); the gas phase is used
SET_PROP(BoxStokes2c, PhaseIndex)
{
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices;
......@@ -99,6 +99,14 @@ public:
static constexpr int value = Indices::nPhaseIdx;
};
//! Choose the considered phase (single-phase system); the gas phase is used
SET_PROP(BoxStokes2c, PhaseIdx)
{
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices;
public:
static constexpr int value = Indices::nPhaseIdx;
};
}
}
......
......@@ -60,8 +60,12 @@ class Stokes2cVolumeVariables : public StokesVolumeVariables<TypeTag>
comp1Idx = Indices::comp1Idx,
comp0Idx = Indices::comp0Idx
};
enum {
lCompIdx = comp1Idx,
gCompIdx = comp0Idx
} DUMUX_DEPRECATED_MSG("use comp1Idx instead");
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx) };
enum { transportIdx = Indices::transportIdx };
public:
......
......@@ -86,6 +86,7 @@ class Stokes2cniModel : public Stokes2cModel<TypeTag>
enum { dim = GridView::dimension };
enum { comp1Idx = Indices::comp1Idx };
enum { lCompIdx = comp1Idx } DUMUX_DEPRECATED_MSG("use comp1Idx instead");
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
......
......@@ -54,7 +54,7 @@ class Stokes2cniVolumeVariables : public Stokes2cVolumeVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx) };
enum { energyIdx = Indices::energyIdx };
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
......@@ -68,7 +68,7 @@ public:
void update(const PrimaryVariables &priVars,
const Problem &problem,
const Element &element,
const FVElementGeometry &elemGeom,
const FVElementGeometry &fvGeometry,
const int scvIdx,
bool isOldSol)
{
......@@ -80,7 +80,7 @@ public:
ParentType::update(priVars,
problem,
element,
elemGeom,
fvGeometry,
scvIdx,
isOldSol);
};
......@@ -115,7 +115,7 @@ protected:
static Scalar temperature_(const PrimaryVariables &priVars,
const Problem& problem,
const Element &element,
const FVElementGeometry &elemGeom,
const FVElementGeometry &fvGeometry,
const int scvIdx)
{
return priVars[energyIdx];
......
Markdown is supported
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