mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Merge pull request #666 from akva2/drop_unused_macro
changed: get rid of OPM_UNUSED macro usage
This commit is contained in:
commit
f4dab07a68
@ -257,8 +257,8 @@ public:
|
||||
/*!
|
||||
* \brief Return how much a Newton-Raphson update is considered an error
|
||||
*/
|
||||
static Scalar computeUpdateError(const PrimaryVariables& oldPv OPM_UNUSED,
|
||||
const EqVector& delta OPM_UNUSED)
|
||||
static Scalar computeUpdateError(const PrimaryVariables&,
|
||||
const EqVector&)
|
||||
{
|
||||
// do not consider consider the change of Brine primary variables for
|
||||
// convergence
|
||||
@ -400,9 +400,9 @@ class BlackOilBrineIntensiveQuantities<TypeTag, false>
|
||||
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
|
||||
|
||||
public:
|
||||
void updateSaltConcentration_(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned dofIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void updateSaltConcentration_(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
|
||||
const Evaluation& saltConcentration() const
|
||||
|
@ -70,10 +70,10 @@ public:
|
||||
* integration point.
|
||||
*/
|
||||
template <class Context>
|
||||
static void addDiffusiveFlux(RateVector& flux OPM_UNUSED,
|
||||
const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
static void addDiffusiveFlux(RateVector&,
|
||||
const Context&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{}
|
||||
};
|
||||
|
||||
@ -179,7 +179,7 @@ public:
|
||||
* \brief Returns the tortuousity of the sub-domain of a fluid
|
||||
* phase in the porous medium.
|
||||
*/
|
||||
Scalar tortuosity(unsigned phaseIdx OPM_UNUSED) const
|
||||
Scalar tortuosity(unsigned) const
|
||||
{
|
||||
throw std::logic_error("Method tortuosity() does not make sense "
|
||||
"if diffusion is disabled");
|
||||
@ -189,7 +189,7 @@ public:
|
||||
* \brief Returns the molecular diffusion coefficient for a
|
||||
* component in a phase.
|
||||
*/
|
||||
Scalar diffusionCoefficient(unsigned phaseIdx OPM_UNUSED, unsigned compIdx OPM_UNUSED) const
|
||||
Scalar diffusionCoefficient(unsigned, unsigned) const
|
||||
{
|
||||
throw std::logic_error("Method diffusionCoefficient() does not "
|
||||
"make sense if diffusion is disabled");
|
||||
@ -199,7 +199,7 @@ public:
|
||||
* \brief Returns the effective molecular diffusion coefficient of
|
||||
* the porous medium for a component in a phase.
|
||||
*/
|
||||
Scalar effectiveDiffusionCoefficient(unsigned phaseIdx OPM_UNUSED, unsigned compIdx OPM_UNUSED) const
|
||||
Scalar effectiveDiffusionCoefficient(unsigned, unsigned) const
|
||||
{
|
||||
throw std::logic_error("Method effectiveDiffusionCoefficient() "
|
||||
"does not make sense if diffusion is disabled");
|
||||
@ -211,11 +211,11 @@ protected:
|
||||
* mass fluxes.
|
||||
*/
|
||||
template <class FluidState>
|
||||
void update_(FluidState& fs OPM_UNUSED,
|
||||
typename FluidSystem::template ParameterCache<typename FluidState::Scalar>& paramCache OPM_UNUSED,
|
||||
const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned dofIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void update_(FluidState&,
|
||||
typename FluidSystem::template ParameterCache<typename FluidState::Scalar>&,
|
||||
const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
};
|
||||
|
||||
@ -331,16 +331,16 @@ protected:
|
||||
* \brief Update the quantities required to calculate
|
||||
* the diffusive mass fluxes.
|
||||
*/
|
||||
void update_(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned faceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void update_(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{}
|
||||
|
||||
template <class Context, class FluidState>
|
||||
void updateBoundary_(const Context& context OPM_UNUSED,
|
||||
unsigned bfIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED,
|
||||
const FluidState& fluidState OPM_UNUSED)
|
||||
void updateBoundary_(const Context&,
|
||||
unsigned,
|
||||
unsigned,
|
||||
const FluidState&)
|
||||
{}
|
||||
|
||||
public:
|
||||
@ -350,8 +350,8 @@ public:
|
||||
* \copydoc Doxygen::phaseIdxParam
|
||||
* \copydoc Doxygen::compIdxParam
|
||||
*/
|
||||
const Evaluation& moleFractionGradientNormal(unsigned phaseIdx OPM_UNUSED,
|
||||
unsigned compIdx OPM_UNUSED) const
|
||||
const Evaluation& moleFractionGradientNormal(unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("The method moleFractionGradient() does not "
|
||||
"make sense if diffusion is disabled.");
|
||||
@ -364,8 +364,8 @@ public:
|
||||
* \copydoc Doxygen::phaseIdxParam
|
||||
* \copydoc Doxygen::compIdxParam
|
||||
*/
|
||||
const Evaluation& effectiveDiffusionCoefficient(unsigned phaseIdx OPM_UNUSED,
|
||||
unsigned compIdx OPM_UNUSED) const
|
||||
const Evaluation& effectiveDiffusionCoefficient(unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("The method effectiveDiffusionCoefficient() "
|
||||
"does not make sense if diffusion is disabled.");
|
||||
@ -441,10 +441,10 @@ protected:
|
||||
}
|
||||
|
||||
template <class Context, class FluidState>
|
||||
void updateBoundary_(const Context& context OPM_UNUSED,
|
||||
unsigned bfIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED,
|
||||
const FluidState& fluidState OPM_UNUSED)
|
||||
void updateBoundary_(const Context&,
|
||||
unsigned,
|
||||
unsigned,
|
||||
const FluidState&)
|
||||
{
|
||||
throw std::runtime_error("Not implemented: Diffusion across boundary not implemented for blackoil");
|
||||
}
|
||||
|
@ -232,7 +232,7 @@ public:
|
||||
* \brief Assign the energy specific primary variables to a PrimaryVariables object
|
||||
*/
|
||||
static void assignPrimaryVars(PrimaryVariables& priVars,
|
||||
Scalar temperature OPM_UNUSED)
|
||||
Scalar)
|
||||
{
|
||||
if (!enableEnergy)
|
||||
return;
|
||||
@ -270,8 +270,8 @@ public:
|
||||
/*!
|
||||
* \brief Return how much a Newton-Raphson update is considered an error
|
||||
*/
|
||||
static Scalar computeUpdateError(const PrimaryVariables& oldPv OPM_UNUSED,
|
||||
const EqVector& delta OPM_UNUSED)
|
||||
static Scalar computeUpdateError(const PrimaryVariables&,
|
||||
const EqVector&)
|
||||
{
|
||||
// do not consider consider the cange of energy primary variables for
|
||||
// convergence
|
||||
@ -429,10 +429,10 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void updateEnergyQuantities_(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned dofIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED,
|
||||
const typename FluidSystem::template ParameterCache<Evaluation>& paramCache OPM_UNUSED)
|
||||
void updateEnergyQuantities_(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned,
|
||||
const typename FluidSystem::template ParameterCache<Evaluation>&)
|
||||
{ }
|
||||
|
||||
const Evaluation& rockInternalEnergy() const
|
||||
@ -601,16 +601,16 @@ class BlackOilEnergyExtensiveQuantities<TypeTag, false>
|
||||
using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
|
||||
|
||||
public:
|
||||
void updateEnergy(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned scvfIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void updateEnergy(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{}
|
||||
|
||||
template <class Context, class BoundaryFluidState>
|
||||
void updateEnergyBoundary(const Context& ctx OPM_UNUSED,
|
||||
unsigned scvfIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED,
|
||||
const BoundaryFluidState& boundaryFs OPM_UNUSED)
|
||||
void updateEnergyBoundary(const Context&,
|
||||
unsigned,
|
||||
unsigned,
|
||||
const BoundaryFluidState&)
|
||||
{}
|
||||
|
||||
const Evaluation& energyFlux() const
|
||||
|
@ -450,8 +450,8 @@ public:
|
||||
/*!
|
||||
* \brief Return how much a Newton-Raphson update is considered an error
|
||||
*/
|
||||
static Scalar computeUpdateError(const PrimaryVariables& oldPv OPM_UNUSED,
|
||||
const EqVector& delta OPM_UNUSED)
|
||||
static Scalar computeUpdateError(const PrimaryVariables&,
|
||||
const EqVector&)
|
||||
{
|
||||
// do not consider consider the cange of solvent primary variables for
|
||||
// convergence
|
||||
@ -842,9 +842,9 @@ public:
|
||||
void zPvtUpdate_()
|
||||
{ }
|
||||
|
||||
void zFractionUpdate_(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned scvIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void zFractionUpdate_(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
|
||||
const Evaluation& xVolume() const
|
||||
|
@ -237,8 +237,8 @@ public:
|
||||
/*!
|
||||
* \brief Register all foam specific VTK and ECL output modules.
|
||||
*/
|
||||
static void registerOutputModules(Model& model OPM_UNUSED,
|
||||
Simulator& simulator OPM_UNUSED)
|
||||
static void registerOutputModules(Model&,
|
||||
Simulator&)
|
||||
{
|
||||
if (!enableFoam)
|
||||
// foam have been disabled at compile time
|
||||
@ -364,8 +364,8 @@ public:
|
||||
/*!
|
||||
* \brief Return how much a Newton-Raphson update is considered an error
|
||||
*/
|
||||
static Scalar computeUpdateError(const PrimaryVariables& oldPv OPM_UNUSED,
|
||||
const EqVector& delta OPM_UNUSED)
|
||||
static Scalar computeUpdateError(const PrimaryVariables&,
|
||||
const EqVector&)
|
||||
{
|
||||
// do not consider the change of foam primary variables for convergence
|
||||
// TODO: maybe this should be changed
|
||||
@ -593,9 +593,9 @@ class BlackOilFoamIntensiveQuantities<TypeTag, false>
|
||||
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
|
||||
|
||||
public:
|
||||
void foamPropertiesUpdate_(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned scvIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void foamPropertiesUpdate_(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
|
||||
|
||||
|
@ -685,8 +685,8 @@ public:
|
||||
/*!
|
||||
* \brief Return how much a Newton-Raphson update is considered an error
|
||||
*/
|
||||
static Scalar computeUpdateError(const PrimaryVariables& oldPv OPM_UNUSED,
|
||||
const EqVector& delta OPM_UNUSED)
|
||||
static Scalar computeUpdateError(const PrimaryVariables&,
|
||||
const EqVector&)
|
||||
{
|
||||
// do not consider consider the cange of polymer primary variables for
|
||||
// convergence
|
||||
@ -1162,9 +1162,9 @@ class BlackOilPolymerIntensiveQuantities<TypeTag, false>
|
||||
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
|
||||
|
||||
public:
|
||||
void polymerPropertiesUpdate_(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned scvIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void polymerPropertiesUpdate_(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
|
||||
const Evaluation& polymerMoleWeight() const
|
||||
@ -1228,9 +1228,9 @@ public:
|
||||
*/
|
||||
template <class Dummy = bool> // we need to make this method a template to avoid
|
||||
// compiler errors if it is not instantiated!
|
||||
void updateShearMultipliersPerm(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned scvfIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void updateShearMultipliersPerm(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{
|
||||
throw std::runtime_error("The extension of the blackoil model for polymers is not yet "
|
||||
"implemented for problems specified using permeabilities.");
|
||||
@ -1327,14 +1327,14 @@ class BlackOilPolymerExtensiveQuantities<TypeTag, false>
|
||||
using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
|
||||
|
||||
public:
|
||||
void updateShearMultipliers(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned scvfIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void updateShearMultipliers(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
|
||||
void updateShearMultipliersPerm(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned scvfIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void updateShearMultipliersPerm(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
|
||||
const Evaluation& polymerShearFactor() const
|
||||
|
@ -66,7 +66,7 @@ public:
|
||||
*
|
||||
* This is required for the DRSDT keyword.
|
||||
*/
|
||||
Scalar maxGasDissolutionFactor(unsigned timeIdx OPM_UNUSED, unsigned globalDofIdx OPM_UNUSED) const
|
||||
Scalar maxGasDissolutionFactor(unsigned, unsigned) const
|
||||
{ return std::numeric_limits<Scalar>::max()/2; }
|
||||
|
||||
/*!
|
||||
@ -75,7 +75,7 @@ public:
|
||||
*
|
||||
* This is required for the DRVDT keyword.
|
||||
*/
|
||||
Scalar maxOilVaporizationFactor(unsigned timeIdx OPM_UNUSED, unsigned globalDofIdx OPM_UNUSED) const
|
||||
Scalar maxOilVaporizationFactor(unsigned, unsigned) const
|
||||
{ return std::numeric_limits<Scalar>::max()/2; }
|
||||
|
||||
/*!
|
||||
@ -84,61 +84,61 @@ public:
|
||||
*
|
||||
* This is required for the VAPPARS keyword.
|
||||
*/
|
||||
Scalar maxOilSaturation(unsigned globalDofIdx OPM_UNUSED) const
|
||||
Scalar maxOilSaturation(unsigned) const
|
||||
{ return 1.0; }
|
||||
|
||||
/*!
|
||||
* \brief Returns the index of the relevant region for thermodynmic properties
|
||||
*/
|
||||
template <class Context>
|
||||
unsigned pvtRegionIndex(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
unsigned pvtRegionIndex(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{ return 0; }
|
||||
|
||||
/*!
|
||||
* \brief Returns the index of the relevant region for saturation functions
|
||||
*/
|
||||
template <class Context>
|
||||
unsigned satnumRegionIndex(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
unsigned satnumRegionIndex(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{ return 0; }
|
||||
|
||||
/*!
|
||||
* \brief Returns the index of the relevant region for solvent mixing functions
|
||||
*/
|
||||
template <class Context>
|
||||
unsigned miscnumRegionIndex(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
unsigned miscnumRegionIndex(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{ return 0; }
|
||||
|
||||
/*!
|
||||
* \brief Returns the index of the relevant region for polymer mixing functions
|
||||
*/
|
||||
template <class Context>
|
||||
unsigned plmixnumRegionIndex(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
unsigned plmixnumRegionIndex(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{ return 0; }
|
||||
|
||||
/*!
|
||||
* \brief Returns the compressibility of the porous medium of a cell
|
||||
*/
|
||||
template <class Context>
|
||||
Scalar rockCompressibility(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
Scalar rockCompressibility(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{ return 0.0; }
|
||||
|
||||
/*!
|
||||
* \brief Returns the reference pressure for rock the compressibility of a cell
|
||||
*/
|
||||
template <class Context>
|
||||
Scalar rockReferencePressure(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
Scalar rockReferencePressure(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{ return 1e5; }
|
||||
|
||||
/*!
|
||||
@ -157,8 +157,8 @@ public:
|
||||
* method.
|
||||
*/
|
||||
template <class Evaluation>
|
||||
Scalar rockCompPoroMultiplier(const IntensiveQuantities& intQuants OPM_UNUSED,
|
||||
unsigned globalSpaceIdx OPM_UNUSED) const
|
||||
Scalar rockCompPoroMultiplier(const IntensiveQuantities&,
|
||||
unsigned) const
|
||||
{ return 1.0; }
|
||||
|
||||
private:
|
||||
|
@ -625,8 +625,8 @@ public:
|
||||
/*!
|
||||
* \brief Return how much a Newton-Raphson update is considered an error
|
||||
*/
|
||||
static Scalar computeUpdateError(const PrimaryVariables& oldPv OPM_UNUSED,
|
||||
const EqVector& delta OPM_UNUSED)
|
||||
static Scalar computeUpdateError(const PrimaryVariables&,
|
||||
const EqVector&)
|
||||
{
|
||||
// do not consider consider the cange of solvent primary variables for
|
||||
// convergence
|
||||
@ -1267,19 +1267,19 @@ class BlackOilSolventIntensiveQuantities<TypeTag, false>
|
||||
|
||||
|
||||
public:
|
||||
void solventPreSatFuncUpdate_(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned scvIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void solventPreSatFuncUpdate_(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
|
||||
void solventPostSatFuncUpdate_(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned scvIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void solventPostSatFuncUpdate_(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
|
||||
void solventPvtUpdate_(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned scvIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void solventPvtUpdate_(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
|
||||
const Evaluation& solventSaturation() const
|
||||
@ -1541,14 +1541,14 @@ class BlackOilSolventExtensiveQuantities<TypeTag, false>
|
||||
using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
|
||||
|
||||
public:
|
||||
void updateVolumeFluxPerm(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned scvfIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void updateVolumeFluxPerm(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
|
||||
void updateVolumeFluxTrans(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned scvfIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void updateVolumeFluxTrans(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
|
||||
unsigned solventUpstreamIndex() const
|
||||
|
@ -89,9 +89,9 @@ class DarcyIntensiveQuantities
|
||||
{
|
||||
using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
|
||||
protected:
|
||||
void update_(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned dofIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void update_(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
};
|
||||
|
||||
|
@ -69,10 +69,10 @@ public:
|
||||
* integration point.
|
||||
*/
|
||||
template <class Context>
|
||||
static void addDiffusiveFlux(RateVector& flux OPM_UNUSED,
|
||||
const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
static void addDiffusiveFlux(RateVector&,
|
||||
const Context&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{}
|
||||
};
|
||||
|
||||
@ -155,7 +155,7 @@ public:
|
||||
* \brief Returns the tortuousity of the sub-domain of a fluid
|
||||
* phase in the porous medium.
|
||||
*/
|
||||
Scalar tortuosity(unsigned phaseIdx OPM_UNUSED) const
|
||||
Scalar tortuosity(unsigned) const
|
||||
{
|
||||
throw std::logic_error("Method tortuosity() does not make sense "
|
||||
"if diffusion is disabled");
|
||||
@ -165,7 +165,7 @@ public:
|
||||
* \brief Returns the molecular diffusion coefficient for a
|
||||
* component in a phase.
|
||||
*/
|
||||
Scalar diffusionCoefficient(unsigned phaseIdx OPM_UNUSED, unsigned compIdx OPM_UNUSED) const
|
||||
Scalar diffusionCoefficient(unsigned, unsigned) const
|
||||
{
|
||||
throw std::logic_error("Method diffusionCoefficient() does not "
|
||||
"make sense if diffusion is disabled");
|
||||
@ -175,7 +175,7 @@ public:
|
||||
* \brief Returns the effective molecular diffusion coefficient of
|
||||
* the porous medium for a component in a phase.
|
||||
*/
|
||||
Scalar effectiveDiffusionCoefficient(unsigned phaseIdx OPM_UNUSED, unsigned compIdx OPM_UNUSED) const
|
||||
Scalar effectiveDiffusionCoefficient(unsigned, unsigned) const
|
||||
{
|
||||
throw std::logic_error("Method effectiveDiffusionCoefficient() "
|
||||
"does not make sense if diffusion is disabled");
|
||||
@ -187,11 +187,11 @@ protected:
|
||||
* mass fluxes.
|
||||
*/
|
||||
template <class FluidState>
|
||||
void update_(FluidState& fs OPM_UNUSED,
|
||||
typename FluidSystem::template ParameterCache<typename FluidState::Scalar>& paramCache OPM_UNUSED,
|
||||
const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned dofIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void update_(FluidState&,
|
||||
typename FluidSystem::template ParameterCache<typename FluidState::Scalar>&,
|
||||
const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
};
|
||||
|
||||
@ -301,16 +301,16 @@ protected:
|
||||
* \brief Update the quantities required to calculate
|
||||
* the diffusive mass fluxes.
|
||||
*/
|
||||
void update_(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned faceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void update_(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{}
|
||||
|
||||
template <class Context, class FluidState>
|
||||
void updateBoundary_(const Context& context OPM_UNUSED,
|
||||
unsigned bfIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED,
|
||||
const FluidState& fluidState OPM_UNUSED)
|
||||
void updateBoundary_(const Context&,
|
||||
unsigned,
|
||||
unsigned,
|
||||
const FluidState&)
|
||||
{}
|
||||
|
||||
public:
|
||||
@ -320,8 +320,8 @@ public:
|
||||
* \copydoc Doxygen::phaseIdxParam
|
||||
* \copydoc Doxygen::compIdxParam
|
||||
*/
|
||||
const Evaluation& moleFractionGradientNormal(unsigned phaseIdx OPM_UNUSED,
|
||||
unsigned compIdx OPM_UNUSED) const
|
||||
const Evaluation& moleFractionGradientNormal(unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("The method moleFractionGradient() does not "
|
||||
"make sense if diffusion is disabled.");
|
||||
@ -334,8 +334,8 @@ public:
|
||||
* \copydoc Doxygen::phaseIdxParam
|
||||
* \copydoc Doxygen::compIdxParam
|
||||
*/
|
||||
const Evaluation& effectiveDiffusionCoefficient(unsigned phaseIdx OPM_UNUSED,
|
||||
unsigned compIdx OPM_UNUSED) const
|
||||
const Evaluation& effectiveDiffusionCoefficient(unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("The method effectiveDiffusionCoefficient() "
|
||||
"does not make sense if diffusion is disabled.");
|
||||
|
@ -79,7 +79,7 @@ public:
|
||||
* string if the specified primary variable index does not belong to
|
||||
* the energy module.
|
||||
*/
|
||||
static std::string primaryVarName(unsigned pvIdx OPM_UNUSED)
|
||||
static std::string primaryVarName(unsigned)
|
||||
{ return ""; }
|
||||
|
||||
/*!
|
||||
@ -87,32 +87,32 @@ public:
|
||||
* string if the specified equation index does not belong to
|
||||
* the energy module.
|
||||
*/
|
||||
static std::string eqName(unsigned eqIdx OPM_UNUSED)
|
||||
static std::string eqName(unsigned)
|
||||
{ return ""; }
|
||||
|
||||
/*!
|
||||
* \brief Returns the relative weight of a primary variable for
|
||||
* calculating relative errors.
|
||||
*/
|
||||
static Scalar primaryVarWeight(const Model& model OPM_UNUSED,
|
||||
unsigned globalDofIdx OPM_UNUSED,
|
||||
unsigned pvIdx OPM_UNUSED)
|
||||
static Scalar primaryVarWeight(const Model&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ return -1; }
|
||||
|
||||
/*!
|
||||
* \brief Returns the relative weight of a equation of the residual.
|
||||
*/
|
||||
static Scalar eqWeight(const Model& model OPM_UNUSED,
|
||||
unsigned globalDofIdx OPM_UNUSED,
|
||||
unsigned eqIdx OPM_UNUSED)
|
||||
static Scalar eqWeight(const Model&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ return -1; }
|
||||
|
||||
/*!
|
||||
* \brief Given a fluid state, set the temperature in the primary variables
|
||||
*/
|
||||
template <class FluidState>
|
||||
static void setPriVarTemperatures(PrimaryVariables& priVars OPM_UNUSED,
|
||||
const FluidState& fs OPM_UNUSED)
|
||||
static void setPriVarTemperatures(PrimaryVariables&,
|
||||
const FluidState&)
|
||||
{}
|
||||
|
||||
/*!
|
||||
@ -120,30 +120,30 @@ public:
|
||||
* from a volumetric rate.
|
||||
*/
|
||||
template <class RateVector, class FluidState>
|
||||
static void setEnthalpyRate(RateVector& rateVec OPM_UNUSED,
|
||||
const FluidState& fluidState OPM_UNUSED,
|
||||
unsigned phaseIdx OPM_UNUSED,
|
||||
const Evaluation& volume OPM_UNUSED)
|
||||
static void setEnthalpyRate(RateVector&,
|
||||
const FluidState&,
|
||||
unsigned,
|
||||
const Evaluation&)
|
||||
{}
|
||||
|
||||
/*!
|
||||
* \brief Add the rate of the enthalpy flux to a rate vector.
|
||||
*/
|
||||
static void setEnthalpyRate(RateVector& rateVec OPM_UNUSED,
|
||||
const Evaluation& rate OPM_UNUSED)
|
||||
static void setEnthalpyRate(RateVector&,
|
||||
const Evaluation&)
|
||||
{}
|
||||
|
||||
/*!
|
||||
* \brief Add the rate of the enthalpy flux to a rate vector.
|
||||
*/
|
||||
static void addToEnthalpyRate(RateVector& rateVec OPM_UNUSED,
|
||||
const Evaluation& rate OPM_UNUSED)
|
||||
static void addToEnthalpyRate(RateVector&,
|
||||
const Evaluation&)
|
||||
{}
|
||||
|
||||
/*!
|
||||
* \brief Add the rate of the conductive energy flux to a rate vector.
|
||||
*/
|
||||
static Scalar thermalConductionRate(const ExtensiveQuantities& extQuants OPM_UNUSED)
|
||||
static Scalar thermalConductionRate(const ExtensiveQuantities&)
|
||||
{ return 0.0; }
|
||||
|
||||
/*!
|
||||
@ -151,9 +151,9 @@ public:
|
||||
* vector
|
||||
*/
|
||||
template <class LhsEval>
|
||||
static void addPhaseStorage(Dune::FieldVector<LhsEval, numEq>& storage OPM_UNUSED,
|
||||
const IntensiveQuantities& intQuants OPM_UNUSED,
|
||||
unsigned phaseIdx OPM_UNUSED)
|
||||
static void addPhaseStorage(Dune::FieldVector<LhsEval, numEq>&,
|
||||
const IntensiveQuantities&,
|
||||
unsigned)
|
||||
{}
|
||||
|
||||
/*!
|
||||
@ -161,10 +161,10 @@ public:
|
||||
* vector
|
||||
*/
|
||||
template <class LhsEval, class Scv>
|
||||
static void addFracturePhaseStorage(Dune::FieldVector<LhsEval, numEq>& storage OPM_UNUSED,
|
||||
const IntensiveQuantities& intQuants OPM_UNUSED,
|
||||
const Scv& scv OPM_UNUSED,
|
||||
unsigned phaseIdx OPM_UNUSED)
|
||||
static void addFracturePhaseStorage(Dune::FieldVector<LhsEval, numEq>&,
|
||||
const IntensiveQuantities&,
|
||||
const Scv&,
|
||||
unsigned)
|
||||
{}
|
||||
|
||||
/*!
|
||||
@ -172,8 +172,8 @@ public:
|
||||
* equation vector
|
||||
*/
|
||||
template <class LhsEval>
|
||||
static void addSolidEnergyStorage(Dune::FieldVector<LhsEval, numEq>& storage OPM_UNUSED,
|
||||
const IntensiveQuantities& intQuants OPM_UNUSED)
|
||||
static void addSolidEnergyStorage(Dune::FieldVector<LhsEval, numEq>&,
|
||||
const IntensiveQuantities&)
|
||||
{}
|
||||
|
||||
/*!
|
||||
@ -183,10 +183,10 @@ public:
|
||||
* This method is called by compute flux (base class)
|
||||
*/
|
||||
template <class Context>
|
||||
static void addAdvectiveFlux(RateVector& flux OPM_UNUSED,
|
||||
const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
static void addAdvectiveFlux(RateVector&,
|
||||
const Context&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{}
|
||||
|
||||
/*!
|
||||
@ -195,10 +195,10 @@ public:
|
||||
* volume and adds the result in the flux vector.
|
||||
*/
|
||||
template <class Context>
|
||||
static void handleFractureFlux(RateVector& flux OPM_UNUSED,
|
||||
const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
static void handleFractureFlux(RateVector&,
|
||||
const Context&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{}
|
||||
|
||||
/*!
|
||||
@ -208,10 +208,10 @@ public:
|
||||
* This method is called by compute flux (base class)
|
||||
*/
|
||||
template <class Context>
|
||||
static void addDiffusiveFlux(RateVector& flux OPM_UNUSED,
|
||||
const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
static void addDiffusiveFlux(RateVector&,
|
||||
const Context&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{}
|
||||
};
|
||||
|
||||
@ -287,8 +287,8 @@ public:
|
||||
/*!
|
||||
* \brief Returns the relative weight of a equation.
|
||||
*/
|
||||
static Scalar eqWeight(const Model& model OPM_UNUSED,
|
||||
unsigned globalDofIdx OPM_UNUSED,
|
||||
static Scalar eqWeight(const Model&,
|
||||
unsigned,
|
||||
unsigned eqIdx)
|
||||
{
|
||||
if (eqIdx != energyEqIdx)
|
||||
@ -581,11 +581,11 @@ protected:
|
||||
* energy fluxes.
|
||||
*/
|
||||
template <class FluidState>
|
||||
void update_(FluidState& fs OPM_UNUSED,
|
||||
typename FluidSystem::template ParameterCache<typename FluidState::Scalar>& paramCache OPM_UNUSED,
|
||||
const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned dofIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void update_(FluidState&,
|
||||
typename FluidSystem::template ParameterCache<typename FluidState::Scalar>&,
|
||||
const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
};
|
||||
|
||||
@ -708,16 +708,16 @@ protected:
|
||||
* \brief Update the quantities required to calculate
|
||||
* energy fluxes.
|
||||
*/
|
||||
void update_(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned faceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void update_(const ElementContext&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{}
|
||||
|
||||
template <class Context, class FluidState>
|
||||
void updateBoundary_(const Context& context OPM_UNUSED,
|
||||
unsigned bfIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED,
|
||||
const FluidState& fs OPM_UNUSED)
|
||||
void updateBoundary_(const Context&,
|
||||
unsigned,
|
||||
unsigned,
|
||||
const FluidState&)
|
||||
{}
|
||||
|
||||
public:
|
||||
|
@ -93,9 +93,9 @@ public:
|
||||
* turbolence.
|
||||
*/
|
||||
template <class Context>
|
||||
Scalar ergunCoefficient(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
Scalar ergunCoefficient(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("Not implemented: Problem::ergunCoefficient()");
|
||||
}
|
||||
|
@ -155,7 +155,7 @@ public:
|
||||
*
|
||||
* \param phaseIdx The index of the fluid phase
|
||||
*/
|
||||
Scalar upstreamWeight(unsigned phaseIdx OPM_UNUSED) const
|
||||
Scalar upstreamWeight(unsigned) const
|
||||
{ return 1.0; }
|
||||
|
||||
/*!
|
||||
|
@ -191,7 +191,7 @@ public:
|
||||
*
|
||||
* \param phaseIdx The index of the fluid phase in question
|
||||
*/
|
||||
bool phaseIsConsidered(unsigned phaseIdx OPM_UNUSED) const
|
||||
bool phaseIsConsidered(unsigned) const
|
||||
{ return true; }
|
||||
|
||||
/*!
|
||||
|
@ -132,9 +132,9 @@ public:
|
||||
* \param timeIdx The index used by the time discretization.
|
||||
*/
|
||||
template <class Context>
|
||||
const DimMatrix& intrinsicPermeability(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
const DimMatrix& intrinsicPermeability(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("Not implemented: Problem::intrinsicPermeability()");
|
||||
}
|
||||
@ -149,9 +149,9 @@ public:
|
||||
* \param timeIdx The index used by the time discretization.
|
||||
*/
|
||||
template <class Context>
|
||||
Scalar porosity(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
Scalar porosity(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("Not implemented: Problem::porosity()");
|
||||
}
|
||||
@ -167,9 +167,9 @@ public:
|
||||
*/
|
||||
template <class Context>
|
||||
const SolidEnergyLawParams&
|
||||
solidEnergyParams(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
solidEnergyParams(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("Not implemented: Problem::solidEnergyParams()");
|
||||
}
|
||||
@ -185,9 +185,9 @@ public:
|
||||
*/
|
||||
template <class Context>
|
||||
const ThermalConductionLawParams&
|
||||
thermalConductionParams(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
thermalConductionParams(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("Not implemented: Problem::thermalConductionParams()");
|
||||
}
|
||||
@ -201,9 +201,9 @@ public:
|
||||
* \param timeIdx The index used by the time discretization.
|
||||
*/
|
||||
template <class Context>
|
||||
Scalar tortuosity(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
Scalar tortuosity(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("Not implemented: Problem::tortuosity()");
|
||||
}
|
||||
@ -217,9 +217,9 @@ public:
|
||||
* \param timeIdx The index used by the time discretization.
|
||||
*/
|
||||
template <class Context>
|
||||
Scalar dispersivity(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
Scalar dispersivity(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("Not implemented: Problem::dispersivity()");
|
||||
}
|
||||
@ -239,9 +239,9 @@ public:
|
||||
*/
|
||||
template <class Context>
|
||||
const MaterialLawParams &
|
||||
materialLawParams(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
materialLawParams(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
static MaterialLawParams dummy;
|
||||
return dummy;
|
||||
@ -256,9 +256,9 @@ public:
|
||||
* \param timeIdx The index used by the time discretization.
|
||||
*/
|
||||
template <class Context>
|
||||
Scalar temperature(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
Scalar temperature(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{ return asImp_().temperature(); }
|
||||
|
||||
/*!
|
||||
@ -281,9 +281,9 @@ public:
|
||||
* \param timeIdx The index used by the time discretization.
|
||||
*/
|
||||
template <class Context>
|
||||
const DimVector& gravity(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
const DimVector& gravity(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{ return asImp_().gravity(); }
|
||||
|
||||
/*!
|
||||
|
@ -103,9 +103,9 @@ public:
|
||||
* \param timeIdx The index used by the time discretization.
|
||||
*/
|
||||
template <class Context>
|
||||
const DimMatrix& fractureIntrinsicPermeability(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
const DimMatrix& fractureIntrinsicPermeability(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("Not implemented: Problem::fractureIntrinsicPermeability()");
|
||||
}
|
||||
@ -119,9 +119,9 @@ public:
|
||||
* \param timeIdx The index used by the time discretization.
|
||||
*/
|
||||
template <class Context>
|
||||
Scalar fracturePorosity(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
Scalar fracturePorosity(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("Not implemented: Problem::fracturePorosity()");
|
||||
}
|
||||
|
@ -117,7 +117,7 @@ public:
|
||||
*
|
||||
* It is intended to implement stuff like Schur complements.
|
||||
*/
|
||||
virtual void postSolve(GlobalEqVector& residual OPM_UNUSED)
|
||||
virtual void postSolve(GlobalEqVector&)
|
||||
{};
|
||||
|
||||
private:
|
||||
|
@ -259,7 +259,7 @@ protected:
|
||||
/*!
|
||||
* \brief Reset the all relevant internal attributes to 0
|
||||
*/
|
||||
void reset_(const ElementContext& elemCtx OPM_UNUSED)
|
||||
void reset_(const ElementContext&)
|
||||
{
|
||||
residual_ = 0.0;
|
||||
jacobian_ = 0.0;
|
||||
|
@ -252,7 +252,7 @@ public:
|
||||
*
|
||||
* \param boundaryFaceIdx The local index of the boundary segment
|
||||
*/
|
||||
const Intersection intersection(unsigned boundaryFaceIdx OPM_UNUSED) const
|
||||
const Intersection intersection(unsigned) const
|
||||
{ return *intersectionIt_; }
|
||||
|
||||
/*!
|
||||
|
@ -386,7 +386,7 @@ class FvBaseDiscretization
|
||||
protected:
|
||||
SolutionVector blockVector_;
|
||||
public:
|
||||
BlockVectorWrapper(const std::string& name OPM_UNUSED, const size_t size)
|
||||
BlockVectorWrapper(const std::string&, const size_t size)
|
||||
: blockVector_(size)
|
||||
{}
|
||||
|
||||
@ -649,7 +649,7 @@ public:
|
||||
* \brief Allows to improve the performance by prefetching all data which is
|
||||
* associated with a given element.
|
||||
*/
|
||||
void prefetch(const Element& elem OPM_UNUSED) const
|
||||
void prefetch(const Element&) const
|
||||
{
|
||||
// do nothing by default
|
||||
}
|
||||
@ -1222,7 +1222,7 @@ public:
|
||||
* \param globalVertexIdx The global index of the vertex
|
||||
* \param eqIdx The index of the equation
|
||||
*/
|
||||
Scalar eqWeight(unsigned globalVertexIdx OPM_UNUSED, unsigned eqIdx OPM_UNUSED) const
|
||||
Scalar eqWeight(unsigned, unsigned) const
|
||||
{ return 1.0; }
|
||||
|
||||
/*!
|
||||
@ -1452,7 +1452,7 @@ public:
|
||||
* \param res The serializer object
|
||||
*/
|
||||
template <class Restarter>
|
||||
void serialize(Restarter& res OPM_UNUSED)
|
||||
void serialize(Restarter&)
|
||||
{
|
||||
throw std::runtime_error("Not implemented: The discretization chosen for this problem "
|
||||
"does not support restart files. (serialize() method unimplemented)");
|
||||
@ -1466,7 +1466,7 @@ public:
|
||||
* \param res The serializer object
|
||||
*/
|
||||
template <class Restarter>
|
||||
void deserialize(Restarter& res OPM_UNUSED)
|
||||
void deserialize(Restarter&)
|
||||
{
|
||||
throw std::runtime_error("Not implemented: The discretization chosen for this problem "
|
||||
"does not support restart files. (deserialize() method unimplemented)");
|
||||
@ -1611,7 +1611,7 @@ public:
|
||||
*
|
||||
* \copydetails Doxygen::ecfvElemCtxParam
|
||||
*/
|
||||
void updatePVWeights(const ElementContext& elemCtx OPM_UNUSED) const
|
||||
void updatePVWeights(const ElementContext&) const
|
||||
{ }
|
||||
|
||||
/*!
|
||||
@ -1893,10 +1893,10 @@ protected:
|
||||
}
|
||||
}
|
||||
template <class Context>
|
||||
void supplementInitialSolution_(PrimaryVariables& priVars OPM_UNUSED,
|
||||
const Context& context OPM_UNUSED,
|
||||
unsigned dofIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED)
|
||||
void supplementInitialSolution_(PrimaryVariables&,
|
||||
const Context&,
|
||||
unsigned,
|
||||
unsigned)
|
||||
{ }
|
||||
|
||||
/*!
|
||||
|
@ -338,7 +338,7 @@ public:
|
||||
* \param timeIdx The index of the solution vector used by the
|
||||
* time discretization.
|
||||
*/
|
||||
const Stencil& stencil(unsigned timeIdx OPM_UNUSED) const
|
||||
const Stencil& stencil(unsigned) const
|
||||
{ return stencil_; }
|
||||
|
||||
/*!
|
||||
@ -349,7 +349,7 @@ public:
|
||||
* \param timeIdx The index of the solution vector used by the
|
||||
* time discretization.
|
||||
*/
|
||||
const GlobalPosition& pos(unsigned dofIdx, unsigned timeIdx OPM_UNUSED) const
|
||||
const GlobalPosition& pos(unsigned dofIdx, unsigned) const
|
||||
{ return stencil_.subControlVolume(dofIdx).globalPos(); }
|
||||
|
||||
/*!
|
||||
@ -522,7 +522,7 @@ public:
|
||||
* extensive quantities are requested
|
||||
* \param timeIdx The index of the solution vector used by the time discretization.
|
||||
*/
|
||||
const ExtensiveQuantities& extensiveQuantities(unsigned fluxIdx, unsigned timeIdx OPM_UNUSED) const
|
||||
const ExtensiveQuantities& extensiveQuantities(unsigned fluxIdx, unsigned) const
|
||||
{ return extensiveQuantities_[fluxIdx]; }
|
||||
|
||||
/*!
|
||||
|
@ -92,7 +92,7 @@ public:
|
||||
void updateBoundary(const Context& context,
|
||||
unsigned bfIdx,
|
||||
unsigned timeIdx,
|
||||
const FluidState& fluidState OPM_UNUSED)
|
||||
const FluidState&)
|
||||
{
|
||||
unsigned dofIdx = context.interiorScvIndex(bfIdx, timeIdx);
|
||||
interiorScvIdx_ = static_cast<unsigned short>(dofIdx);
|
||||
|
@ -79,7 +79,7 @@ public:
|
||||
* \param timeIdx The index used by the time discretization.
|
||||
*/
|
||||
template <bool prepareValues = true, bool prepareGradients = true>
|
||||
void prepare(const ElementContext& elemCtx OPM_UNUSED, unsigned timeIdx OPM_UNUSED)
|
||||
void prepare(const ElementContext&, unsigned)
|
||||
{ /* noting to do */ }
|
||||
|
||||
/*!
|
||||
@ -262,8 +262,8 @@ public:
|
||||
* freedom
|
||||
*/
|
||||
template <class QuantityCallback>
|
||||
auto calculateBoundaryValue(const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned fapIdx OPM_UNUSED,
|
||||
auto calculateBoundaryValue(const ElementContext&,
|
||||
unsigned,
|
||||
const QuantityCallback& quantityCallback)
|
||||
-> decltype(quantityCallback.boundaryValue())
|
||||
{ return quantityCallback.boundaryValue(); }
|
||||
|
@ -373,10 +373,10 @@ public:
|
||||
* \copydetails Doxygen::storageParam
|
||||
* \copydetails Doxygen::ecfvScvCtxParams
|
||||
*/
|
||||
void computeStorage(EqVector& storage OPM_UNUSED,
|
||||
const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned dofIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
void computeStorage(EqVector&,
|
||||
const ElementContext&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("Not implemented: The local residual "+Dune::className<Implementation>()
|
||||
+" does not implement the required method 'computeStorage()'");
|
||||
@ -389,10 +389,10 @@ public:
|
||||
* \copydetails Doxygen::areaFluxParam
|
||||
* \copydetails Doxygen::ecfvScvfCtxParams
|
||||
*/
|
||||
void computeFlux(RateVector& flux OPM_UNUSED,
|
||||
const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned scvfIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
void computeFlux(RateVector&,
|
||||
const ElementContext&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("Not implemented: The local residual "+Dune::className<Implementation>()
|
||||
+" does not implement the required method 'computeFlux()'");
|
||||
@ -404,10 +404,10 @@ public:
|
||||
* \copydoc Doxygen::sourceParam
|
||||
* \copydoc Doxygen::ecfvScvCtxParams
|
||||
*/
|
||||
void computeSource(RateVector& source OPM_UNUSED,
|
||||
const ElementContext& elemCtx OPM_UNUSED,
|
||||
unsigned dofIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
void computeSource(RateVector&,
|
||||
const ElementContext&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{
|
||||
throw std::logic_error("Not implemented: The local residual "+Dune::className<Implementation>()
|
||||
+" does not implement the required method 'computeSource()'");
|
||||
|
@ -111,7 +111,7 @@ public:
|
||||
* from the primary variables.)
|
||||
*/
|
||||
template <class FluidState>
|
||||
void assignNaive(const FluidState& fluidState OPM_UNUSED)
|
||||
void assignNaive(const FluidState&)
|
||||
{
|
||||
throw std::runtime_error("The PrimaryVariables class does not define "
|
||||
"an assignNaive() method");
|
||||
|
@ -229,7 +229,7 @@ public:
|
||||
*
|
||||
* If the returned string is empty, no help message will be generated.
|
||||
*/
|
||||
static std::string helpPreamble(int argc OPM_UNUSED,
|
||||
static std::string helpPreamble(int,
|
||||
const char **argv)
|
||||
{
|
||||
std::string desc = Implementation::briefDescription();
|
||||
@ -268,12 +268,12 @@ public:
|
||||
* the next regular parameter. If this is less than 1, it indicated that the
|
||||
* positional parameter was invalid.
|
||||
*/
|
||||
static int handlePositionalParameter(std::set<std::string>& seenParams OPM_UNUSED,
|
||||
static int handlePositionalParameter(std::set<std::string>&,
|
||||
std::string& errorMsg,
|
||||
int argc OPM_UNUSED,
|
||||
int,
|
||||
const char** argv,
|
||||
int paramIdx,
|
||||
int posParamIdx OPM_UNUSED)
|
||||
int)
|
||||
{
|
||||
errorMsg = std::string("Illegal parameter \"")+argv[paramIdx]+"\".";
|
||||
return 0;
|
||||
@ -291,7 +291,7 @@ public:
|
||||
* \brief Allows to improve the performance by prefetching all data which is
|
||||
* associated with a given element.
|
||||
*/
|
||||
void prefetch(const Element& elem OPM_UNUSED) const
|
||||
void prefetch(const Element&) const
|
||||
{
|
||||
// do nothing by default
|
||||
}
|
||||
@ -318,10 +318,10 @@ public:
|
||||
* \param timeIdx The index used for the time discretization
|
||||
*/
|
||||
template <class Context>
|
||||
void boundary(BoundaryRateVector& values OPM_UNUSED,
|
||||
const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
void boundary(BoundaryRateVector&,
|
||||
const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{ throw std::logic_error("Problem does not provide a boundary() method"); }
|
||||
|
||||
/*!
|
||||
@ -335,10 +335,10 @@ public:
|
||||
* \param timeIdx The index used for the time discretization
|
||||
*/
|
||||
template <class Context>
|
||||
void constraints(Constraints& constrs OPM_UNUSED,
|
||||
const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
void constraints(Constraints&,
|
||||
const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{ throw std::logic_error("Problem does not provide a constraints() method"); }
|
||||
|
||||
/*!
|
||||
@ -354,10 +354,10 @@ public:
|
||||
* \param timeIdx The index used for the time discretization
|
||||
*/
|
||||
template <class Context>
|
||||
void source(RateVector& rate OPM_UNUSED,
|
||||
const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
void source(RateVector&,
|
||||
const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{ throw std::logic_error("Problem does not provide a source() method"); }
|
||||
|
||||
/*!
|
||||
@ -371,10 +371,10 @@ public:
|
||||
* \param timeIdx The index used for the time discretization
|
||||
*/
|
||||
template <class Context>
|
||||
void initial(PrimaryVariables& values OPM_UNUSED,
|
||||
const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
void initial(PrimaryVariables&,
|
||||
const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{ throw std::logic_error("Problem does not provide a initial() method"); }
|
||||
|
||||
/*!
|
||||
@ -393,9 +393,9 @@ public:
|
||||
* \param timeIdx The index used for the time discretization
|
||||
*/
|
||||
template <class Context>
|
||||
Scalar extrusionFactor(const Context& context OPM_UNUSED,
|
||||
unsigned spaceIdx OPM_UNUSED,
|
||||
unsigned timeIdx OPM_UNUSED) const
|
||||
Scalar extrusionFactor(const Context&,
|
||||
unsigned,
|
||||
unsigned) const
|
||||
{ return asImp_().extrusionFactor(); }
|
||||
|
||||
Scalar extrusionFactor() const
|
||||
|
@ -64,7 +64,7 @@ namespace Opm
|
||||
* \note If this ratio is set, it is assume to be constant.
|
||||
*/
|
||||
template <class Field>
|
||||
void setFatherChildWeight(const Field& weight OPM_UNUSED) const
|
||||
void setFatherChildWeight(const Field&) const
|
||||
{}
|
||||
|
||||
//! restrict data to father
|
||||
@ -84,7 +84,7 @@ namespace Opm
|
||||
template< class Entity, class LocalGeometry >
|
||||
void restrictLocal(const Entity& father,
|
||||
const Entity& son,
|
||||
const LocalGeometry& geometryInFather OPM_UNUSED,
|
||||
const LocalGeometry&,
|
||||
bool initialize) const
|
||||
{ restrictLocal(father, son, initialize); }
|
||||
|
||||
@ -92,7 +92,7 @@ namespace Opm
|
||||
template< class Entity >
|
||||
void prolongLocal(const Entity& father,
|
||||
const Entity& son,
|
||||
bool initialize OPM_UNUSED) const
|
||||
bool) const
|
||||
{
|
||||
container_.resize();
|
||||
assert( container_.codimension() == 0 );
|
||||
@ -104,7 +104,7 @@ namespace Opm
|
||||
template< class Entity, class LocalGeometry >
|
||||
void prolongLocal(const Entity& father,
|
||||
const Entity& son,
|
||||
const LocalGeometry& geometryInFather OPM_UNUSED,
|
||||
const LocalGeometry&,
|
||||
bool initialize) const
|
||||
{ prolongLocal(father, son, initialize); }
|
||||
|
||||
@ -112,7 +112,7 @@ namespace Opm
|
||||
* \param[in] comm Communicator to add the discrete functions to
|
||||
*/
|
||||
template< class Communicator >
|
||||
void addToList(Communicator& comm OPM_UNUSED)
|
||||
void addToList(Communicator&)
|
||||
{
|
||||
// TODO
|
||||
}
|
||||
@ -121,7 +121,7 @@ namespace Opm
|
||||
* \param[in] lb LoadBalancer to add the discrete functions to
|
||||
*/
|
||||
template< class LoadBalancer >
|
||||
void addToLoadBalancer(LoadBalancer& lb OPM_UNUSED)
|
||||
void addToLoadBalancer(LoadBalancer&)
|
||||
{
|
||||
// TODO
|
||||
}
|
||||
@ -152,51 +152,51 @@ namespace Opm
|
||||
* \note If this ratio is set, it is assume to be constant.
|
||||
*/
|
||||
template <class Field>
|
||||
void setFatherChildWeight(const Field& weight OPM_UNUSED) const
|
||||
void setFatherChildWeight(const Field&) const
|
||||
{ }
|
||||
|
||||
//! restrict data to father
|
||||
template< class Entity >
|
||||
void restrictLocal(const Entity& father OPM_UNUSED,
|
||||
const Entity& son OPM_UNUSED,
|
||||
bool initialize OPM_UNUSED) const
|
||||
void restrictLocal(const Entity&,
|
||||
const Entity&,
|
||||
bool) const
|
||||
{ }
|
||||
|
||||
//! restrict data to father
|
||||
template< class Entity, class LocalGeometry >
|
||||
void restrictLocal(const Entity& father OPM_UNUSED,
|
||||
const Entity& son OPM_UNUSED,
|
||||
const LocalGeometry& geometryInFather OPM_UNUSED,
|
||||
bool initialize OPM_UNUSED) const
|
||||
void restrictLocal(const Entity&,
|
||||
const Entity&,
|
||||
const LocalGeometry&,
|
||||
bool) const
|
||||
{ }
|
||||
|
||||
//! prolong data to children
|
||||
template< class Entity >
|
||||
void prolongLocal(const Entity& father OPM_UNUSED,
|
||||
const Entity& son OPM_UNUSED,
|
||||
bool initialize OPM_UNUSED) const
|
||||
void prolongLocal(const Entity&,
|
||||
const Entity&,
|
||||
bool) const
|
||||
{ }
|
||||
|
||||
//! prolong data to children
|
||||
template< class Entity, class LocalGeometry >
|
||||
void prolongLocal(const Entity& father OPM_UNUSED,
|
||||
const Entity& son OPM_UNUSED,
|
||||
const LocalGeometry& geometryInFather OPM_UNUSED,
|
||||
bool initialize OPM_UNUSED) const
|
||||
void prolongLocal(const Entity&,
|
||||
const Entity&,
|
||||
const LocalGeometry&,
|
||||
bool) const
|
||||
{ }
|
||||
|
||||
/** \brief add discrete function to communicator
|
||||
* \param[in] comm Communicator to add the discrete functions to
|
||||
*/
|
||||
template< class Communicator >
|
||||
void addToList(Communicator& comm OPM_UNUSED)
|
||||
void addToList(Communicator&)
|
||||
{ }
|
||||
|
||||
/** \brief add discrete function to load balancer
|
||||
* \param[in] lb LoadBalancer to add the discrete functions to
|
||||
*/
|
||||
template< class LoadBalancer >
|
||||
void addToLoadBalancer(LoadBalancer& lb OPM_UNUSED)
|
||||
void addToLoadBalancer(LoadBalancer&)
|
||||
{ }
|
||||
};
|
||||
|
||||
|
@ -114,7 +114,7 @@ class VcfvScvGeometries<Scalar, /*dim=*/1, ElementType::simplex>
|
||||
public:
|
||||
using ScvLocalGeometry = QuadrialteralQuadratureGeometry<Scalar, dim>;
|
||||
|
||||
static const ScvLocalGeometry& get(unsigned scvIdx OPM_UNUSED)
|
||||
static const ScvLocalGeometry& get(unsigned)
|
||||
{
|
||||
throw std::logic_error("Not implemented: VcfvScvGeometries<Scalar, 1, ElementType::simplex>");
|
||||
}
|
||||
|
@ -99,8 +99,8 @@ public:
|
||||
*/
|
||||
template <class FluidState>
|
||||
void assignMassConservative(const FluidState& fluidState,
|
||||
const MaterialLawParams& matParams OPM_UNUSED,
|
||||
bool isInEquilibrium OPM_UNUSED= false)
|
||||
const MaterialLawParams&,
|
||||
bool = false)
|
||||
{
|
||||
// there is no difference between naive and mass conservative
|
||||
// assignment in the flash model. (we only need the total
|
||||
|
@ -513,12 +513,12 @@ private:
|
||||
|
||||
// make sure the field is well defined if running under valgrind
|
||||
// and make sure that all values can be displayed by paraview
|
||||
void sanitizeScalarBuffer_(ScalarBuffer& b OPM_UNUSED)
|
||||
void sanitizeScalarBuffer_(ScalarBuffer&)
|
||||
{
|
||||
// nothing to do: this is done by VtkScalarFunction
|
||||
}
|
||||
|
||||
void sanitizeVectorBuffer_(VectorBuffer& b OPM_UNUSED)
|
||||
void sanitizeVectorBuffer_(VectorBuffer&)
|
||||
{
|
||||
// nothing to do: this is done by VtkVectorFunction
|
||||
}
|
||||
|
@ -76,7 +76,7 @@ public:
|
||||
virtual int ncomps() const
|
||||
{ return 1; }
|
||||
|
||||
virtual double evaluate(int mycomp OPM_UNUSED,
|
||||
virtual double evaluate(int,
|
||||
const Element& e,
|
||||
const Dune::FieldVector<ctype, dim>& xi) const
|
||||
{
|
||||
|
@ -83,7 +83,7 @@ protected:
|
||||
friend ParentType;
|
||||
friend NewtonMethod<TypeTag>;
|
||||
|
||||
void preSolve_(const SolutionVector& currentSolution OPM_UNUSED,
|
||||
void preSolve_(const SolutionVector&,
|
||||
const GlobalEqVector& currentResidual)
|
||||
{
|
||||
const auto& constraintsMap = this->model().linearizer().constraintsMap();
|
||||
@ -131,7 +131,7 @@ protected:
|
||||
PrimaryVariables& nextValue,
|
||||
const PrimaryVariables& currentValue,
|
||||
const EqVector& update,
|
||||
const EqVector& currentResidual OPM_UNUSED)
|
||||
const EqVector&)
|
||||
{
|
||||
// normal Newton-Raphson update
|
||||
nextValue = currentValue;
|
||||
|
@ -596,7 +596,7 @@ protected:
|
||||
*
|
||||
* \param u The initial solution
|
||||
*/
|
||||
void begin_(const SolutionVector& u OPM_UNUSED)
|
||||
void begin_(const SolutionVector&)
|
||||
{
|
||||
numIterations_ = 0;
|
||||
|
||||
@ -647,7 +647,7 @@ protected:
|
||||
model().linearizer().finalize();
|
||||
}
|
||||
|
||||
void preSolve_(const SolutionVector& currentSolution OPM_UNUSED,
|
||||
void preSolve_(const SolutionVector&,
|
||||
const GlobalEqVector& currentResidual)
|
||||
{
|
||||
const auto& constraintsMap = model().linearizer().constraintsMap();
|
||||
@ -696,9 +696,9 @@ protected:
|
||||
* iteration's solution.
|
||||
* \param solutionUpdate The difference between the current and the next solution
|
||||
*/
|
||||
void postSolve_(const SolutionVector& currentSolution OPM_UNUSED,
|
||||
const GlobalEqVector& currentResidual OPM_UNUSED,
|
||||
GlobalEqVector& solutionUpdate OPM_UNUSED)
|
||||
void postSolve_(const SolutionVector&,
|
||||
const GlobalEqVector&,
|
||||
GlobalEqVector& solutionUpdate)
|
||||
{
|
||||
// loop over the auxiliary modules and ask them to post process the solution
|
||||
// vector.
|
||||
@ -790,7 +790,7 @@ protected:
|
||||
/*!
|
||||
* \brief Update the primary variables for a degree of freedom which is constraint.
|
||||
*/
|
||||
void updateConstraintDof_(unsigned globalDofIdx OPM_UNUSED,
|
||||
void updateConstraintDof_(unsigned,
|
||||
PrimaryVariables& nextValue,
|
||||
const Constraints& constraints)
|
||||
{ nextValue = constraints; }
|
||||
@ -798,11 +798,11 @@ protected:
|
||||
/*!
|
||||
* \brief Update a single primary variables object.
|
||||
*/
|
||||
void updatePrimaryVariables_(unsigned globalDofIdx OPM_UNUSED,
|
||||
void updatePrimaryVariables_(unsigned,
|
||||
PrimaryVariables& nextValue,
|
||||
const PrimaryVariables& currentValue,
|
||||
const EqVector& update,
|
||||
const EqVector& currentResidual OPM_UNUSED)
|
||||
const EqVector&)
|
||||
{
|
||||
nextValue = currentValue;
|
||||
nextValue -= update;
|
||||
@ -830,8 +830,8 @@ protected:
|
||||
* \param nextSolution The solution after the current Newton iteration
|
||||
* \param currentSolution The solution at the beginning of the current Newton iteration
|
||||
*/
|
||||
void endIteration_(const SolutionVector& nextSolution OPM_UNUSED,
|
||||
const SolutionVector& currentSolution OPM_UNUSED)
|
||||
void endIteration_(const SolutionVector&,
|
||||
const SolutionVector&)
|
||||
{
|
||||
++numIterations_;
|
||||
|
||||
|
@ -54,7 +54,7 @@ class NullConvergenceWriter
|
||||
using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
|
||||
|
||||
public:
|
||||
NullConvergenceWriter(NewtonMethod& method OPM_UNUSED)
|
||||
NullConvergenceWriter(NewtonMethod&)
|
||||
{}
|
||||
|
||||
/*!
|
||||
@ -80,8 +80,8 @@ public:
|
||||
* \param deltaU The negative difference between the solution
|
||||
* vectors of the previous and the current iteration.
|
||||
*/
|
||||
void writeFields(const SolutionVector& uLastIter OPM_UNUSED,
|
||||
const GlobalEqVector& deltaU OPM_UNUSED)
|
||||
void writeFields(const SolutionVector&,
|
||||
const GlobalEqVector&)
|
||||
{}
|
||||
|
||||
/*!
|
||||
|
@ -51,14 +51,14 @@ public:
|
||||
: mapper_(mapper), container_(container)
|
||||
{}
|
||||
|
||||
bool contains(int dim OPM_UNUSED, int codim) const
|
||||
bool contains(int, int codim) const
|
||||
{
|
||||
// return true if the codim is the same as the codim which we
|
||||
// are asked to communicate with.
|
||||
return codim == commCodim;
|
||||
}
|
||||
|
||||
bool fixedsize(int dim OPM_UNUSED, int codim OPM_UNUSED) const
|
||||
bool fixedsize(int, int) const
|
||||
{
|
||||
// for each DOF we communicate a single value which has a
|
||||
// fixed size
|
||||
@ -66,7 +66,7 @@ public:
|
||||
}
|
||||
|
||||
template <class EntityType>
|
||||
size_t size(const EntityType& e OPM_UNUSED) const
|
||||
size_t size(const EntityType&) const
|
||||
{
|
||||
// communicate a field type per entity
|
||||
return 1;
|
||||
@ -80,7 +80,7 @@ public:
|
||||
}
|
||||
|
||||
template <class MessageBufferImp, class EntityType>
|
||||
void scatter(MessageBufferImp& buff, const EntityType& e, size_t n OPM_UNUSED)
|
||||
void scatter(MessageBufferImp& buff, const EntityType& e, size_t)
|
||||
{
|
||||
unsigned dofIdx = static_cast<unsigned>(mapper_.index(e));
|
||||
|
||||
@ -111,14 +111,14 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
bool contains(int dim OPM_UNUSED, int codim) const
|
||||
bool contains(int, int codim) const
|
||||
{
|
||||
// return true if the codim is the same as the codim which we
|
||||
// are asked to communicate with.
|
||||
return codim == commCodim;
|
||||
}
|
||||
|
||||
bool fixedsize(int dim OPM_UNUSED, int codim OPM_UNUSED) const
|
||||
bool fixedsize(int, int) const
|
||||
{
|
||||
// for each DOF we communicate a single value which has a
|
||||
// fixed size
|
||||
@ -126,7 +126,7 @@ public:
|
||||
}
|
||||
|
||||
template <class EntityType>
|
||||
size_t size(const EntityType& e OPM_UNUSED) const
|
||||
size_t size(const EntityType&) const
|
||||
{
|
||||
// communicate a field type per entity
|
||||
return 1;
|
||||
@ -140,7 +140,7 @@ public:
|
||||
}
|
||||
|
||||
template <class MessageBufferImp, class EntityType>
|
||||
void scatter(MessageBufferImp& buff, const EntityType& e, size_t n OPM_UNUSED)
|
||||
void scatter(MessageBufferImp& buff, const EntityType& e, size_t)
|
||||
{
|
||||
unsigned dofIdx = static_cast<unsigned>(mapper_.index(e));
|
||||
buff.read(container_[dofIdx]);
|
||||
@ -166,14 +166,14 @@ public:
|
||||
: mapper_(mapper), container_(container)
|
||||
{}
|
||||
|
||||
bool contains(int dim OPM_UNUSED, int codim) const
|
||||
bool contains(int, int codim) const
|
||||
{
|
||||
// return true if the codim is the same as the codim which we
|
||||
// are asked to communicate with.
|
||||
return codim == commCodim;
|
||||
}
|
||||
|
||||
bool fixedsize(int dim OPM_UNUSED, int codim OPM_UNUSED) const
|
||||
bool fixedsize(int, int) const
|
||||
{
|
||||
// for each DOF we communicate a single value which has a
|
||||
// fixed size
|
||||
@ -181,7 +181,7 @@ public:
|
||||
}
|
||||
|
||||
template <class EntityType>
|
||||
size_t size(const EntityType& e OPM_UNUSED) const
|
||||
size_t size(const EntityType&) const
|
||||
{
|
||||
// communicate a field type per entity
|
||||
return 1;
|
||||
@ -195,7 +195,7 @@ public:
|
||||
}
|
||||
|
||||
template <class MessageBufferImp, class EntityType>
|
||||
void scatter(MessageBufferImp& buff, const EntityType& e, size_t n OPM_UNUSED)
|
||||
void scatter(MessageBufferImp& buff, const EntityType& e, size_t)
|
||||
{
|
||||
unsigned dofIdx = static_cast<unsigned>(mapper_.index(e));
|
||||
FieldType tmp;
|
||||
@ -223,14 +223,14 @@ public:
|
||||
: mapper_(mapper), container_(container)
|
||||
{}
|
||||
|
||||
bool contains(int dim OPM_UNUSED, int codim) const
|
||||
bool contains(int, int codim) const
|
||||
{
|
||||
// return true if the codim is the same as the codim which we
|
||||
// are asked to communicate with.
|
||||
return codim == commCodim;
|
||||
}
|
||||
|
||||
bool fixedsize(int dim OPM_UNUSED, int codim OPM_UNUSED) const
|
||||
bool fixedsize(int, int) const
|
||||
{
|
||||
// for each DOF we communicate a single value which has a
|
||||
// fixed size
|
||||
@ -238,7 +238,7 @@ public:
|
||||
}
|
||||
|
||||
template <class EntityType>
|
||||
size_t size(const EntityType& e OPM_UNUSED) const
|
||||
size_t size(const EntityType&) const
|
||||
{
|
||||
// communicate a field type per entity
|
||||
return 1;
|
||||
@ -252,7 +252,7 @@ public:
|
||||
}
|
||||
|
||||
template <class MessageBufferImp, class EntityType>
|
||||
void scatter(MessageBufferImp& buff, const EntityType& e, size_t n OPM_UNUSED)
|
||||
void scatter(MessageBufferImp& buff, const EntityType& e, size_t)
|
||||
{
|
||||
unsigned dofIdx = static_cast<unsigned>(mapper_.index(e));
|
||||
FieldType tmp;
|
||||
|
@ -76,11 +76,11 @@ protected:
|
||||
/*!
|
||||
* \copydoc FvBaseNewtonMethod::updatePrimaryVariables_
|
||||
*/
|
||||
void updatePrimaryVariables_(unsigned globalDofIdx OPM_UNUSED,
|
||||
void updatePrimaryVariables_(unsigned,
|
||||
PrimaryVariables& nextValue,
|
||||
const PrimaryVariables& currentValue,
|
||||
const EqVector& update,
|
||||
const EqVector& currentResidual OPM_UNUSED)
|
||||
const EqVector&)
|
||||
{
|
||||
// normal Newton-Raphson update
|
||||
nextValue = currentValue;
|
||||
|
@ -332,7 +332,7 @@ public:
|
||||
/*!
|
||||
* \copydoc FvBaseDiscretization::primaryVarWeight
|
||||
*/
|
||||
Scalar primaryVarWeight(unsigned globalDofIdx OPM_UNUSED, unsigned pvIdx) const
|
||||
Scalar primaryVarWeight(unsigned, unsigned pvIdx) const
|
||||
{
|
||||
if (Indices::pressureWIdx == pvIdx) {
|
||||
return 10 / referencePressure_;
|
||||
@ -344,10 +344,9 @@ public:
|
||||
/*!
|
||||
* \copydoc FvBaseDiscretization::eqWeight
|
||||
*/
|
||||
Scalar eqWeight(unsigned globalDofIdx OPM_UNUSED, unsigned OPM_OPTIM_UNUSED eqIdx) const
|
||||
Scalar eqWeight(unsigned, [[maybe_unused]] unsigned eqIdx) const
|
||||
{
|
||||
unsigned OPM_OPTIM_UNUSED compIdx = eqIdx - Indices::contiEqIdx;
|
||||
assert(compIdx <= FluidSystem::numPhases);
|
||||
assert((eqIdx - Indices::contiEqIdx) <= FluidSystem::numPhases);
|
||||
|
||||
// make all kg equal
|
||||
return 1.0;
|
||||
|
@ -79,7 +79,7 @@ protected:
|
||||
PrimaryVariables& nextValue,
|
||||
const PrimaryVariables& currentValue,
|
||||
const EqVector& update,
|
||||
const EqVector& currentResidual OPM_UNUSED)
|
||||
const EqVector&)
|
||||
{
|
||||
// normal Newton-Raphson update
|
||||
nextValue = currentValue;
|
||||
|
@ -154,7 +154,7 @@ public:
|
||||
template <class FluidState>
|
||||
void assignMassConservative(const FluidState& fluidState,
|
||||
const MaterialLawParams& matParams,
|
||||
bool isInEquilibrium OPM_UNUSED= false)
|
||||
bool = false)
|
||||
{
|
||||
ComponentVector globalMolarities(0.0);
|
||||
for (unsigned compIdx = 0; compIdx < numComponents; ++compIdx) {
|
||||
|
@ -78,7 +78,7 @@ public:
|
||||
{ peerBlackLists_[peerRank] = peerBlackList; }
|
||||
|
||||
template <class DomesticOverlap>
|
||||
void updateNativeToDomesticMap(const DomesticOverlap& domesticOverlap OPM_UNUSED_NOMPI)
|
||||
void updateNativeToDomesticMap([[maybe_unused]] const DomesticOverlap& domesticOverlap)
|
||||
{
|
||||
#if HAVE_MPI
|
||||
auto peerListIt = peerBlackLists_.begin();
|
||||
|
@ -185,7 +185,7 @@ public:
|
||||
|
||||
private:
|
||||
// update the weighted absolute residual
|
||||
void updateErrors_(const Vector& curSol OPM_UNUSED, const Vector& changeIndicator, const Vector& curResid)
|
||||
void updateErrors_(const Vector&, const Vector& changeIndicator, const Vector& curResid)
|
||||
{
|
||||
lastResidualError_ = residualError_;
|
||||
residualError_ = 0.0;
|
||||
|
@ -134,7 +134,7 @@ public:
|
||||
*
|
||||
* \param os The output stream to which the message gets written.
|
||||
*/
|
||||
virtual void printInitial(std::ostream& os OPM_UNUSED= std::cout) const
|
||||
virtual void printInitial(std::ostream& = std::cout) const
|
||||
{}
|
||||
|
||||
/*!
|
||||
@ -145,7 +145,7 @@ public:
|
||||
* are chosen by the linear solver.
|
||||
* \param os The output stream to which the message gets written.
|
||||
*/
|
||||
virtual void print(Scalar iter OPM_UNUSED, std::ostream& os OPM_UNUSED = std::cout) const
|
||||
virtual void print(Scalar, std::ostream& = std::cout) const
|
||||
{}
|
||||
};
|
||||
|
||||
|
@ -81,14 +81,14 @@ class ElementBorderListFromGrid
|
||||
}
|
||||
|
||||
// data handle methods
|
||||
bool contains(int dim OPM_UNUSED, int codim) const
|
||||
bool contains(int, int codim) const
|
||||
{ return codim == 0; }
|
||||
|
||||
bool fixedsize(int dim OPM_UNUSED, int codim OPM_UNUSED) const
|
||||
bool fixedsize(int, int) const
|
||||
{ return true; }
|
||||
|
||||
template <class EntityType>
|
||||
size_t size(const EntityType& e OPM_UNUSED) const
|
||||
size_t size(const EntityType&) const
|
||||
{ return 2; }
|
||||
|
||||
template <class MessageBufferImp, class EntityType>
|
||||
@ -102,7 +102,7 @@ class ElementBorderListFromGrid
|
||||
template <class MessageBufferImp>
|
||||
void scatter(MessageBufferImp& buff,
|
||||
const Element& e,
|
||||
size_t n OPM_UNUSED)
|
||||
size_t)
|
||||
{
|
||||
// discard the index if it is not on the process boundary
|
||||
bool isInteriorNeighbor = false;
|
||||
@ -142,9 +142,9 @@ class ElementBorderListFromGrid
|
||||
// entities (i.e., elements) but the dune grid uses some code which causes the
|
||||
// compiler to invoke the scatter method for every codim...
|
||||
template <class MessageBufferImp, class EntityType>
|
||||
void scatter(MessageBufferImp& buff OPM_UNUSED,
|
||||
const EntityType& e OPM_UNUSED,
|
||||
size_t n OPM_UNUSED)
|
||||
void scatter(MessageBufferImp&,
|
||||
const EntityType&,
|
||||
size_t)
|
||||
{ }
|
||||
|
||||
const std::set<ProcessRank>& peerSet() const
|
||||
@ -171,14 +171,14 @@ class ElementBorderListFromGrid
|
||||
{}
|
||||
|
||||
// data handle methods
|
||||
bool contains(int dim OPM_UNUSED, int codim) const
|
||||
bool contains(int, int codim) const
|
||||
{ return codim == 0; }
|
||||
|
||||
bool fixedsize(int dim OPM_UNUSED, int codim OPM_UNUSED) const
|
||||
bool fixedsize(int, int) const
|
||||
{ return true; }
|
||||
|
||||
template <class EntityType>
|
||||
size_t size(const EntityType& e OPM_UNUSED) const
|
||||
size_t size(const EntityType&) const
|
||||
{ return 2; }
|
||||
|
||||
template <class MessageBufferImp, class EntityType>
|
||||
@ -189,7 +189,7 @@ class ElementBorderListFromGrid
|
||||
}
|
||||
|
||||
template <class MessageBufferImp, class EntityType>
|
||||
void scatter(MessageBufferImp& buff, const EntityType& e, size_t n OPM_UNUSED)
|
||||
void scatter(MessageBufferImp& buff, const EntityType& e, size_t)
|
||||
{
|
||||
int peerRank;
|
||||
int peerIdx;
|
||||
|
@ -128,7 +128,7 @@ public:
|
||||
/*!
|
||||
* \copydoc ConvergenceCriterion::setInitial(const Vector&, const Vector&)
|
||||
*/
|
||||
void setInitial(const Vector& curSol, const Vector& curResid OPM_UNUSED)
|
||||
void setInitial(const Vector& curSol, const Vector&)
|
||||
{
|
||||
lastSol_ = curSol;
|
||||
delta_ = 1000 * tolerance_;
|
||||
@ -138,8 +138,8 @@ public:
|
||||
* \copydoc ConvergenceCriterion::update(const Vector&, const Vector&, const Vector&)
|
||||
*/
|
||||
void update(const Vector& curSol,
|
||||
const Vector& changeIndicator OPM_UNUSED,
|
||||
const Vector& curResid OPM_UNUSED)
|
||||
const Vector&,
|
||||
const Vector&)
|
||||
{
|
||||
assert(curSol.size() == lastSol_.size());
|
||||
|
||||
|
@ -466,9 +466,9 @@ protected:
|
||||
}
|
||||
|
||||
template <class BCRSMatrix>
|
||||
void addNonNeighborOverlapIndices_(const BCRSMatrix& A OPM_UNUSED,
|
||||
SeedList& seedList OPM_UNUSED_NOMPI,
|
||||
BorderDistance borderDist OPM_UNUSED_NOMPI)
|
||||
void addNonNeighborOverlapIndices_(const BCRSMatrix&,
|
||||
[[maybe_unused]] SeedList& seedList,
|
||||
[[maybe_unused]] BorderDistance borderDist)
|
||||
{
|
||||
// TODO: this probably does not work! (the matrix A is unused, but it is needed
|
||||
// from a logical POV.)
|
||||
|
@ -136,9 +136,9 @@ public:
|
||||
/*!
|
||||
* \brief Send a border index to a remote process.
|
||||
*/
|
||||
void sendBorderIndex(ProcessRank peerRank OPM_UNUSED_NOMPI,
|
||||
Index domesticIdx OPM_UNUSED_NOMPI,
|
||||
Index peerLocalIdx OPM_UNUSED_NOMPI)
|
||||
void sendBorderIndex([[maybe_unused]] ProcessRank peerRank,
|
||||
[[maybe_unused]] Index domesticIdx,
|
||||
[[maybe_unused]] Index peerLocalIdx)
|
||||
{
|
||||
#if HAVE_MPI
|
||||
PeerIndexGlobalIndex sendBuf;
|
||||
@ -157,7 +157,7 @@ public:
|
||||
* \brief Receive an index on the border from a remote
|
||||
* process and add it the translation maps.
|
||||
*/
|
||||
void receiveBorderIndex(ProcessRank peerRank OPM_UNUSED_NOMPI)
|
||||
void receiveBorderIndex([[maybe_unused]] ProcessRank peerRank)
|
||||
{
|
||||
#if HAVE_MPI
|
||||
PeerIndexGlobalIndex recvBuf;
|
||||
@ -282,7 +282,7 @@ protected:
|
||||
#endif // HAVE_MPI
|
||||
}
|
||||
|
||||
void sendBorderTo_(ProcessRank peerRank OPM_UNUSED_NOMPI)
|
||||
void sendBorderTo_([[maybe_unused]] ProcessRank peerRank)
|
||||
{
|
||||
#if HAVE_MPI
|
||||
// send (local index on myRank, global index) pairs to the
|
||||
@ -305,7 +305,7 @@ protected:
|
||||
#endif // HAVE_MPI
|
||||
}
|
||||
|
||||
void receiveBorderFrom_(ProcessRank peerRank OPM_UNUSED_NOMPI)
|
||||
void receiveBorderFrom_([[maybe_unused]] ProcessRank peerRank)
|
||||
{
|
||||
#if HAVE_MPI
|
||||
// retrieve the global indices for which we are not master
|
||||
|
@ -52,7 +52,7 @@ class NullBorderListCreator
|
||||
{
|
||||
public:
|
||||
NullBorderListCreator(const GridView& gridView,
|
||||
const DofMapper& map OPM_UNUSED)
|
||||
const DofMapper&)
|
||||
{
|
||||
if (gridView.comm().size() > 1)
|
||||
throw std::runtime_error("The used model is not usable for parallel computations");
|
||||
|
@ -91,9 +91,9 @@ public:
|
||||
|
||||
// this constructor is required to make the class compatible with the SeqILU class of
|
||||
// Dune >= 2.7.
|
||||
OverlappingBCRSMatrix(size_t numRows OPM_UNUSED,
|
||||
size_t numCols OPM_UNUSED,
|
||||
typename BCRSMatrix::BuildMode buildMode OPM_UNUSED)
|
||||
OverlappingBCRSMatrix(size_t,
|
||||
size_t,
|
||||
typename BCRSMatrix::BuildMode)
|
||||
{ throw std::logic_error("OverlappingBCRSMatrix objects cannot be build from scratch!"); }
|
||||
|
||||
~OverlappingBCRSMatrix()
|
||||
@ -448,8 +448,8 @@ private:
|
||||
|
||||
// send the overlap indices to a peer
|
||||
template <class NativeBCRSMatrix>
|
||||
void sendIndices_(const NativeBCRSMatrix& nativeMatrix OPM_UNUSED_NOMPI,
|
||||
ProcessRank peerRank OPM_UNUSED_NOMPI)
|
||||
void sendIndices_([[maybe_unused]] const NativeBCRSMatrix& nativeMatrix,
|
||||
[[maybe_unused]] ProcessRank peerRank)
|
||||
{
|
||||
#if HAVE_MPI
|
||||
// send size of foreign overlap to peer
|
||||
@ -531,7 +531,7 @@ private:
|
||||
}
|
||||
|
||||
// receive the overlap indices to a peer
|
||||
void receiveIndices_(ProcessRank peerRank OPM_UNUSED_NOMPI)
|
||||
void receiveIndices_([[maybe_unused]] ProcessRank peerRank)
|
||||
{
|
||||
#if HAVE_MPI
|
||||
// receive size of foreign overlap to peer
|
||||
@ -579,7 +579,7 @@ private:
|
||||
#endif // HAVE_MPI
|
||||
}
|
||||
|
||||
void sendEntries_(ProcessRank peerRank OPM_UNUSED_NOMPI)
|
||||
void sendEntries_([[maybe_unused]] ProcessRank peerRank)
|
||||
{
|
||||
#if HAVE_MPI
|
||||
auto &mpiSendBuff = *entryValuesSendBuff_[peerRank];
|
||||
@ -608,7 +608,7 @@ private:
|
||||
#endif // HAVE_MPI
|
||||
}
|
||||
|
||||
void receiveAddEntries_(ProcessRank peerRank OPM_UNUSED_NOMPI)
|
||||
void receiveAddEntries_([[maybe_unused]] ProcessRank peerRank)
|
||||
{
|
||||
#if HAVE_MPI
|
||||
auto &mpiRecvBuff = *entryValuesRecvBuff_[peerRank];
|
||||
@ -636,7 +636,7 @@ private:
|
||||
#endif // HAVE_MPI
|
||||
}
|
||||
|
||||
void receiveCopyEntries_(int peerRank OPM_UNUSED_NOMPI)
|
||||
void receiveCopyEntries_([[maybe_unused]] int peerRank)
|
||||
{
|
||||
#if HAVE_MPI
|
||||
MpiBuffer<block_type> &mpiRecvBuff = *entryValuesRecvBuff_[peerRank];
|
||||
|
@ -76,7 +76,7 @@ public:
|
||||
/*!
|
||||
* \copydoc ConvergenceCriterion::setInitial(const Vector& , const Vector& )
|
||||
*/
|
||||
void setInitial(const Vector& curSol OPM_UNUSED, const Vector& curResid)
|
||||
void setInitial(const Vector&, const Vector& curResid)
|
||||
{
|
||||
static constexpr Scalar eps = std::numeric_limits<Scalar>::min()*1e10;
|
||||
|
||||
@ -90,8 +90,8 @@ public:
|
||||
/*!
|
||||
* \copydoc ConvergenceCriterion::update(const Vector& , const Vector& )
|
||||
*/
|
||||
void update(const Vector& curSol OPM_UNUSED,
|
||||
const Vector& changeIndicator OPM_UNUSED,
|
||||
void update(const Vector&,
|
||||
const Vector&,
|
||||
const Vector& curResid)
|
||||
{
|
||||
lastDefect_ = curDefect_;
|
||||
|
@ -64,7 +64,7 @@ class SuperLUBackend
|
||||
"The SuperLU linear solver backend requires the IstlSparseMatrixAdapter");
|
||||
|
||||
public:
|
||||
SuperLUBackend(Simulator& simulator OPM_UNUSED)
|
||||
SuperLUBackend(Simulator&)
|
||||
{}
|
||||
|
||||
static void registerParameters()
|
||||
|
@ -83,11 +83,11 @@ public:
|
||||
bool contains(int dim, int codim) const
|
||||
{ return dim == codim; }
|
||||
|
||||
bool fixedsize(int dim OPM_UNUSED, int codim OPM_UNUSED) const
|
||||
bool fixedsize(int, int) const
|
||||
{ return true; }
|
||||
|
||||
template <class EntityType>
|
||||
size_t size(const EntityType& e OPM_UNUSED) const
|
||||
size_t size(const EntityType&) const
|
||||
{ return 2; }
|
||||
|
||||
template <class MessageBufferImp, class EntityType>
|
||||
@ -98,7 +98,7 @@ public:
|
||||
}
|
||||
|
||||
template <class MessageBufferImp, class EntityType>
|
||||
void scatter(MessageBufferImp& buff, const EntityType& e, size_t n OPM_UNUSED)
|
||||
void scatter(MessageBufferImp& buff, const EntityType& e, size_t)
|
||||
{
|
||||
BorderIndex bIdx;
|
||||
|
||||
|
@ -185,7 +185,7 @@ public:
|
||||
* \copydoc ConvergenceCriterion::update(const Vector& , const Vector& )
|
||||
*/
|
||||
void update(const Vector& curSol,
|
||||
const Vector& changeIndicator OPM_UNUSED,
|
||||
const Vector&,
|
||||
const Vector& curResid)
|
||||
{
|
||||
lastResidualError_ = residualError_;
|
||||
|
Loading…
Reference in New Issue
Block a user