Commit 49e72151 authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

[cleanup] Doxygen, whitespace, superfluous semicolons.

Small cleanup in stokes(nc,ncni).
(reviewed by fetzer)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14913 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 8fff13af
......@@ -73,7 +73,7 @@ public:
{
calculateValues_(problem, element, elemVolVars);
determineUpwindDirection_(elemVolVars);
};
}
protected:
void calculateValues_(const Problem &problem,
......@@ -139,7 +139,7 @@ protected:
Valgrind::CheckDefined(pressureGrad_);
Valgrind::CheckDefined(velocityGrad_);
// Valgrind::CheckDefined(velocityDiv_);
};
}
void determineUpwindDirection_(const ElementVolumeVariables &elemVolVars)
{
......@@ -150,7 +150,7 @@ protected:
if (normalVelocity() < 0)
std::swap(upstreamIdx_, downstreamIdx_);
};
}
public:
/*!
......
......@@ -97,7 +97,7 @@ protected:
massUpwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
stabilizationAlpha_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Stokes, StabilizationAlpha);
stabilizationBeta_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Stokes, StabilizationBeta);
};
}
/*!
* \brief Evaluates the amount of all conservation quantities
......
......@@ -90,7 +90,7 @@ public:
* This method MUST be overwritten by the actual problem.
*/
Scalar temperature() const
{ DUNE_THROW(Dune::NotImplemented, "temperature() method not implemented by the actual problem"); };
{ DUNE_THROW(Dune::NotImplemented, "temperature() method not implemented by the actual problem"); }
/*!
* \brief Returns the acceleration due to gravity.
......
......@@ -71,15 +71,10 @@ SET_PROP(BoxStokes, NumEq) //!< set the number of equations
SET_SCALAR_PROP(BoxStokes, Scaling, 1); //!< set scaling to 1 by default
//! Use the Stokes local residual function for the Stokes model
SET_TYPE_PROP(BoxStokes,
LocalResidual,
StokesLocalResidual<TypeTag>);
SET_TYPE_PROP(BoxStokes, LocalResidual, StokesLocalResidual<TypeTag>);
//! Use the Stokes specific newton controller for the Stokes model
SET_PROP(BoxStokes, NewtonController)
{public:
typedef StokesNewtonController<TypeTag> type;
};
SET_TYPE_PROP(BoxStokes, NewtonController, StokesNewtonController<TypeTag>);
#if HAVE_SUPERLU
SET_TYPE_PROP(BoxStokes, LinearSolver, SuperLUBackend<TypeTag>);
......
......@@ -49,50 +49,51 @@ namespace Properties
// Properties
//////////////////////////////////////////////////////////////////
//!< Define that mole fractions are used in the balance equations
//! Define that mole fractions are used in the balance equations
SET_BOOL_PROP(BoxStokesnc, UseMoles, true);
SET_PROP(BoxStokesnc, NumEq) //!< set the number of equations
//! set the number of equations
SET_PROP(BoxStokesnc, NumEq)
{
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
static const int dim = Grid::dimension;
public:
static constexpr int value = FluidSystem::numComponents + dim;
static const int dim = Grid::dimension;
public:
static constexpr int value = FluidSystem::numComponents + dim;
};
//! Use the Stokes nc local residual function for the Stokes model
SET_TYPE_PROP(BoxStokesnc, LocalResidual, StokesncLocalResidual<TypeTag>);
//! the Model property
SET_TYPE_PROP(BoxStokesnc, Model, StokesncModel<TypeTag>);
//! the VolumeVariables property
SET_TYPE_PROP(BoxStokesnc, VolumeVariables, StokesncVolumeVariables<TypeTag>);
//! the FluxVariables property
SET_TYPE_PROP(BoxStokesnc, FluxVariables, StokesncFluxVariables<TypeTag>);
//! Set the Indices for the Stokes2c model.
//! Set the Indices for the Stokes nc model.
SET_TYPE_PROP(BoxStokesnc, Indices, StokesncCommonIndices<TypeTag>);
//! Choose the type of the employed fluid state
SET_PROP(BoxStokesnc, FluidState)
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
};
//! Choose the considered phase (single-phase system); the gas phase is used
SET_PROP(BoxStokesnc, PhaseIdx)
{
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
static constexpr int value = FluidSystem::nPhaseIdx;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
static constexpr int value = FluidSystem::nPhaseIdx;
};
} // namespace Properties
} // namespace Dumux
......
......@@ -52,13 +52,10 @@ SET_PROP(BoxStokesncni, NumEq) //!< set the number of equations
static const int dim = Grid::dimension;
public:
static constexpr int value = dim + FluidSystem::numComponents +/*energyequation*/1;
};
//! Use the stokesncni local jacobian operator for the compositional stokes model
SET_TYPE_PROP(BoxStokesncni,
LocalResidual,
StokesncniLocalResidual<TypeTag>);
SET_TYPE_PROP(BoxStokesncni, LocalResidual, StokesncniLocalResidual<TypeTag>);
//! the Model property
SET_TYPE_PROP(BoxStokesncni, Model, StokesncniModel<TypeTag>);
......@@ -69,7 +66,7 @@ SET_TYPE_PROP(BoxStokesncni, VolumeVariables, StokesncniVolumeVariables<TypeTag>
//! the FluxVariables property
SET_TYPE_PROP(BoxStokesncni, FluxVariables, StokesncniFluxVariables<TypeTag>);
// Set the indices for the Stokesncni model
//! Set the indices for the Stokesncni model
SET_TYPE_PROP(BoxStokesncni, Indices, StokesncniCommonIndices<TypeTag>);
}
}
......
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