OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-21 16:57:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove use of Unused.hpp

Browse Source
This commit is contained in:
Arne Morten Kvarving 2022-08-02 10:40:48 +02:00
parent 02a91bf216
commit d6c378e6a9
59 changed files with 161 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
examples/problems/co2injectionproblem.hh
View File

@ -44,7 +44,6 @@
#include <opm/material/thermal/ConstantSolidHeatCapLaw.hpp>
#include <opm/material/binarycoefficients/Brine_CO2.hpp>
#include <opm/material/common/UniformTabulated2DFunction.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
@ -505,9 +504,9 @@ public:
*/
template <class Context>
const SolidEnergyLawParams&
solidEnergyLawParams(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
solidEnergyLawParams(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return solidEnergyLawParams_; }
/*!
@ -604,9 +603,9 @@ public:
*/
template <class Context>
void source(RateVector& rate,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ rate = Scalar(0.0); }
//! \}

19
examples/problems/cuvetteproblem.hh
View File

@ -40,7 +40,6 @@
#include <opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp>
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
@ -353,9 +352,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::temperature
*/
template <class Context>
Scalar temperature(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar temperature(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return 293.15; /* [K] */ }
/*!
@ -403,9 +402,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& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return thermalCondParams_; }
//! \}
@ -487,9 +486,9 @@ public:
*/
template <class Context>
void source(RateVector& rate,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ rate = Scalar(0.0); }
//! \}

37
examples/problems/diffusionproblem.hh
View File

@ -37,7 +37,6 @@
#include <opm/material/fluidsystems/H2ON2FluidSystem.hpp>
#include <opm/material/fluidstates/CompositionalFluidState.hpp>
#include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/common/version.hh>
@ -275,18 +274,18 @@ public:
* \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability
*/
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& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return K_; }
/*!
* \copydoc FvBaseMultiPhaseProblem::porosity
*/
template <class Context>
Scalar porosity(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar porosity(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return 0.35; }
/*!
@ -294,18 +293,18 @@ public:
*/
template <class Context>
const MaterialLawParams&
materialLawParams(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
materialLawParams(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return materialParams_; }
/*!
* \copydoc FvBaseMultiPhaseProblem::temperature
*/
template <class Context>
Scalar temperature(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar temperature(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return temperature_; }
//! \}
@ -322,9 +321,9 @@ public:
*/
template <class Context>
void boundary(BoundaryRateVector& values,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ values.setNoFlow(); }
//! \}
@ -358,9 +357,9 @@ public:
*/
template <class Context>
void source(RateVector& rate,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ rate = Scalar(0.0); }
//! \}

25
examples/problems/groundwaterproblem.hh
View File

@ -34,7 +34,6 @@
#include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/fluidsystems/LiquidPhase.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
@ -334,18 +333,18 @@ public:
* \copydoc FvBaseMultiPhaseProblem::temperature
*/
template <class Context>
Scalar temperature(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar temperature(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return 273.15 + 10; } // 10C
/*!
* \copydoc FvBaseMultiPhaseProblem::porosity
*/
template <class Context>
Scalar porosity(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar porosity(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return 0.4; }
/*!
@ -419,9 +418,9 @@ public:
*/
template <class Context>
void initial(PrimaryVariables& values,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{
// const GlobalPosition& globalPos = context.pos(spaceIdx, timeIdx);
values[pressure0Idx] = 1.0e+5; // + 9.81*1.23*(20-globalPos[dim-1]);
@ -432,9 +431,9 @@ public:
*/
template <class Context>
void source(RateVector& rate,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ rate = Scalar(0.0); }
//! \}

25
examples/problems/infiltrationproblem.hh
View File

@ -35,7 +35,6 @@
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
@ -284,9 +283,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::temperature
*/
template <class Context>
Scalar temperature(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar temperature(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return temperature_; }
/*!
@ -308,9 +307,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::porosity
*/
template <class Context>
Scalar porosity(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar porosity(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return porosity_; }
/*!
@ -318,9 +317,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& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return materialParams_; }
//! \}
@ -392,9 +391,9 @@ public:
*/
template <class Context>
void source(RateVector& rate,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ rate = Scalar(0.0); }
//! \}

19
examples/problems/lensproblem.hh
View File

@ -41,7 +41,6 @@
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/Dnapl.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/version.hh>
#include <dune/common/fvector.hh>
@ -438,9 +437,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::porosity
*/
template <class Context>
Scalar porosity(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar porosity(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return 0.4; }
/*!
@ -461,9 +460,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::temperature
*/
template <class Context>
Scalar temperature(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar temperature(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return temperature_; }
//! \}
@ -660,9 +659,9 @@ public:
*/
template <class Context>
void source(RateVector& rate,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ rate = Scalar(0.0); }
//! \}

19
examples/problems/obstacleproblem.hh
View File

@ -39,7 +39,6 @@
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/material/thermal/ConstantSolidHeatCapLaw.hpp>
#include <opm/material/thermal/SomertonThermalConductionLaw.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
@ -328,9 +327,9 @@ public:
* This problem simply assumes a constant temperature.
*/
template <class Context>
Scalar temperature(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar temperature(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return temperature_; }
/*!
@ -385,9 +384,9 @@ public:
*/
template <class Context>
const SolidEnergyLawParams&
solidEnergyLawParams(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
solidEnergyLawParams(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return solidEnergyLawParams_; }
/*!
@ -459,9 +458,9 @@ public:
*/
template <class Context>
void source(RateVector& rate,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ rate = 0.0; }
//! \}

25
examples/problems/outflowproblem.hh
View File

@ -31,7 +31,6 @@
#include <opm/material/fluidstates/CompositionalFluidState.hpp>
#include <opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
@ -217,9 +216,9 @@ public:
* This problem assumes a temperature.
*/
template <class Context>
Scalar temperature(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar temperature(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return temperature_; } // in [K]
/*!
@ -228,9 +227,9 @@ public:
* This problem uses a constant intrinsic permeability.
*/
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& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return perm_; }
/*!
@ -239,9 +238,9 @@ public:
* This problem uses a constant porosity.
*/
template <class Context>
Scalar porosity(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar porosity(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return porosity_; }
#if 0
@ -342,9 +341,9 @@ public:
*/
template <class Context>
void source(RateVector& rate,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ rate = Scalar(0.0); }
//! \}

43
examples/problems/powerinjectionproblem.hh
View File

@ -39,7 +39,6 @@
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/Air.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
@ -314,27 +313,27 @@ public:
* \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability
*/
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& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return K_; }
/*!
* \copydoc ForchheimerBaseProblem::ergunCoefficient
*/
template <class Context>
Scalar ergunCoefficient(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar ergunCoefficient(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return 0.3866; }
/*!
* \copydoc FvBaseMultiPhaseProblem::porosity
*/
template <class Context>
Scalar porosity(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar porosity(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return 0.558; }
/*!
@ -342,18 +341,18 @@ public:
*/
template <class Context>
const MaterialLawParams&
materialLawParams(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
materialLawParams(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return materialParams_; }
/*!
* \copydoc FvBaseMultiPhaseProblem::temperature
*/
template <class Context>
Scalar temperature(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar temperature(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return temperature_; }
//! \}
@ -404,9 +403,9 @@ public:
*/
template <class Context>
void initial(PrimaryVariables& values,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{
// assign the primary variables
values.assignNaive(initialFluidState_);
@ -420,9 +419,9 @@ public:
*/
template <class Context>
void source(RateVector& rate,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ rate = Scalar(0.0); }
//! \}

25
examples/problems/reservoirproblem.hh
View File

@ -38,7 +38,6 @@
#include <opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp>
#include <opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp>
#include <opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
@ -532,9 +531,9 @@ public:
* will need it one day?
*/
template <class Context>
Scalar temperature(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar temperature(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return temperature_; }
// \}
@ -552,9 +551,9 @@ public:
*/
template <class Context>
void boundary(BoundaryRateVector& values,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{
// no flow on top and bottom
values.setNoFlow();
@ -575,9 +574,9 @@ public:
*/
template <class Context>
void initial(PrimaryVariables& values,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{
values.assignNaive(initialFluidState_);
@ -622,9 +621,9 @@ public:
*/
template <class Context>
void source(RateVector& rate,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ rate = Scalar(0.0); }
//! \}

21
examples/problems/richardslensproblem.hh
View File

@ -36,7 +36,6 @@
#include <opm/material/fluidmatrixinteractions/LinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp>
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
@ -302,7 +301,7 @@ public:
Scalar temperature(const Context& context, unsigned spaceIdx, unsigned timeIdx) const
{ return temperature(context.globalSpaceIndex(spaceIdx, timeIdx), timeIdx); }
Scalar temperature(unsigned globalSpaceIdx OPM_UNUSED, unsigned timeIdx OPM_UNUSED) const
Scalar temperature(unsigned /*globalSpaceIdx*/, unsigned /*timeIdx*/) const
{ return 273.15 + 10; } // -> 10°C
/*!
@ -323,9 +322,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::porosity
*/
template <class Context>
Scalar porosity(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar porosity(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return 0.4; }
/*!
@ -341,7 +340,7 @@ public:
}
const MaterialLawParams& materialLawParams(unsigned globalSpaceIdx,
unsigned timeIdx OPM_UNUSED) const
unsigned /*timeIdx*/) const
{
if (dofIsInLens_[globalSpaceIdx])
return lensMaterialParams_;
@ -361,8 +360,8 @@ public:
// the Richards model does not have an element context available at all places
// where the reference pressure is required...
Scalar referencePressure(unsigned globalSpaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
Scalar referencePressure(unsigned /*globalSpaceIdx*/,
unsigned /*timeIdx*/) const
{ return pnRef_; }
//! \}
@ -454,9 +453,9 @@ public:
*/
template <class Context>
void source(RateVector& rate,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ rate = Scalar(0.0); }
//! \}

13
examples/problems/waterairproblem.hh
View File

@ -41,7 +41,6 @@
#include <opm/material/thermal/ConstantSolidHeatCapLaw.hpp>
#include <opm/material/thermal/SomertonThermalConductionLaw.hpp>
#include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
@ -399,9 +398,9 @@ public:
*/
template <class Context>
const SolidEnergyLawParams&
solidEnergyLawParams(const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
solidEnergyLawParams(const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ return solidEnergyLawParams_; }
/*!
@ -508,9 +507,9 @@ public:
*/
template <class Context>
void source(RateVector& rate,
const Context& context OPM_UNUSED,
unsigned spaceIdx OPM_UNUSED,
unsigned timeIdx OPM_UNUSED) const
const Context& /*context*/,
unsigned /*spaceIdx*/,
unsigned /*timeIdx*/) const
{ rate = 0; }
//! \}

1
opm/models/blackoil/blackoilbrinemodules.hh
View File

@ -44,7 +44,6 @@
#endif
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>

1
opm/models/blackoil/blackoildiffusionmodule.hh
View File

@ -31,7 +31,6 @@
#include <opm/models/discretization/common/fvbaseproperties.hh>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>

9
opm/models/blackoil/blackoilenergymodules.hh
View File

@ -35,7 +35,6 @@
#include <opm/material/common/Tabulated1DFunction.hpp>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>
@ -105,14 +104,14 @@ public:
return pvIdx == temperatureIdx;
}
static std::string primaryVarName(unsigned pvIdx OPM_OPTIM_UNUSED)
static std::string primaryVarName([[maybe_unused]] unsigned pvIdx)
{
assert(primaryVarApplies(pvIdx));
return "temperature";
}
static Scalar primaryVarWeight(unsigned pvIdx OPM_OPTIM_UNUSED)
static Scalar primaryVarWeight([[maybe_unused]] unsigned pvIdx)
{
assert(primaryVarApplies(pvIdx));
@ -128,14 +127,14 @@ public:
return eqIdx == contiEnergyEqIdx;
}
static std::string eqName(unsigned eqIdx OPM_OPTIM_UNUSED)
static std::string eqName([[maybe_unused]] unsigned eqIdx)
{
assert(eqApplies(eqIdx));
return "conti^energy";
}
static Scalar eqWeight(unsigned eqIdx OPM_OPTIM_UNUSED)
static Scalar eqWeight([[maybe_unused]] unsigned eqIdx)
{
assert(eqApplies(eqIdx));

9
opm/models/blackoil/blackoilextbomodules.hh
View File

@ -54,7 +54,6 @@
#endif
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <opm/material/common/Exceptions.hpp>
#include <dune/common/fvector.hh>
@ -292,14 +291,14 @@ public:
return pvIdx == zFractionIdx;
}
static std::string primaryVarName(unsigned pvIdx OPM_OPTIM_UNUSED)
static std::string primaryVarName([[maybe_unused]] unsigned pvIdx)
{
assert(primaryVarApplies(pvIdx));
return "z_fraction";
}
static Scalar primaryVarWeight(unsigned pvIdx OPM_OPTIM_UNUSED)
static Scalar primaryVarWeight([[maybe_unused]] unsigned pvIdx)
{
assert(primaryVarApplies(pvIdx));
@ -315,14 +314,14 @@ public:
return eqIdx == contiZfracEqIdx;
}
static std::string eqName(unsigned eqIdx OPM_OPTIM_UNUSED)
static std::string eqName([[maybe_unused]] unsigned eqIdx)
{
assert(eqApplies(eqIdx));
return "conti^solvent";
}
static Scalar eqWeight(unsigned eqIdx OPM_OPTIM_UNUSED)
static Scalar eqWeight([[maybe_unused]] unsigned eqIdx)
{
assert(eqApplies(eqIdx));

9
opm/models/blackoil/blackoilfoammodules.hh
View File

@ -42,7 +42,6 @@
#endif
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>
@ -258,13 +257,13 @@ public:
}
}
static std::string primaryVarName(unsigned pvIdx OPM_OPTIM_UNUSED)
static std::string primaryVarName([[maybe_unused]] unsigned pvIdx)
{
assert(primaryVarApplies(pvIdx));
return "foam_concentration";
}
static Scalar primaryVarWeight(unsigned pvIdx OPM_OPTIM_UNUSED)
static Scalar primaryVarWeight([[maybe_unused]] unsigned pvIdx)
{
assert(primaryVarApplies(pvIdx));
@ -281,14 +280,14 @@ public:
}
static std::string eqName(unsigned eqIdx OPM_OPTIM_UNUSED)
static std::string eqName([[maybe_unused]] unsigned eqIdx)
{
assert(eqApplies(eqIdx));
return "conti^foam";
}
static Scalar eqWeight(unsigned eqIdx OPM_OPTIM_UNUSED)
static Scalar eqWeight([[maybe_unused]] unsigned eqIdx)
{
assert(eqApplies(eqIdx));

1
opm/models/blackoil/blackoilmodel.hh
View File

@ -56,7 +56,6 @@
#include <opm/models/io/vtkdiffusionmodule.hh>
#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
#include <opm/material/common/Unused.hpp>
#include <sstream>
#include <string>

2
opm/models/blackoil/blackoilnewtonmethod.hh
View File

@ -34,8 +34,6 @@
#include <opm/models/nonlinear/newtonmethod.hh>
#include "blackoilmicpmodules.hh"
#include <opm/material/common/Unused.hpp>
namespace Opm::Properties {
template <class TypeTag, class MyTypeTag>

5
opm/models/blackoil/blackoilpolymermodules.hh
View File

@ -47,7 +47,6 @@
#endif
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>
@ -548,7 +547,7 @@ public:
}
}
static Scalar primaryVarWeight(unsigned pvIdx OPM_OPTIM_UNUSED)
static Scalar primaryVarWeight([[maybe_unused]] unsigned pvIdx)
{
assert(primaryVarApplies(pvIdx));
@ -578,7 +577,7 @@ public:
return "conti^polymer_molecularweight";
}
static Scalar eqWeight(unsigned eqIdx OPM_OPTIM_UNUSED)
static Scalar eqWeight([[maybe_unused]] unsigned eqIdx)
{
assert(eqApplies(eqIdx));

2
opm/models/blackoil/blackoilproblem.hh
View File

@ -32,8 +32,6 @@
#include <opm/models/common/multiphasebaseproblem.hh>
#include <opm/material/common/Unused.hpp>
namespace Opm {
/*!

9
opm/models/blackoil/blackoilsolventmodules.hh
View File

@ -48,7 +48,6 @@
#endif
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <opm/material/common/Exceptions.hpp>
#include <dune/common/fvector.hh>
@ -499,14 +498,14 @@ public:
return pvIdx == solventSaturationIdx;
}
static std::string primaryVarName(unsigned pvIdx OPM_OPTIM_UNUSED)
static std::string primaryVarName([[maybe_unused]] unsigned pvIdx)
{
assert(primaryVarApplies(pvIdx));
return "saturation_solvent";
}
static Scalar primaryVarWeight(unsigned pvIdx OPM_OPTIM_UNUSED)
static Scalar primaryVarWeight([[maybe_unused]] unsigned pvIdx)
{
assert(primaryVarApplies(pvIdx));
@ -522,14 +521,14 @@ public:
return eqIdx == contiSolventEqIdx;
}
static std::string eqName(unsigned eqIdx OPM_OPTIM_UNUSED)
static std::string eqName([[maybe_unused]] unsigned eqIdx)
{
assert(eqApplies(eqIdx));
return "conti^solvent";
}
static Scalar eqWeight(unsigned eqIdx OPM_OPTIM_UNUSED)
static Scalar eqWeight([[maybe_unused]] unsigned eqIdx)
{
assert(eqApplies(eqIdx));

1
opm/models/common/darcyfluxmodule.hh
View File

@ -34,7 +34,6 @@
#include <opm/models/common/quantitycallbacks.hh>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <opm/material/common/Exceptions.hpp>
#include <dune/common/fvector.hh>

1
opm/models/common/diffusionmodule.hh
View File

@ -32,7 +32,6 @@
#include <opm/models/common/quantitycallbacks.hh>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>

1
opm/models/common/energymodule.hh
View File

@ -33,7 +33,6 @@
#include <opm/models/common/quantitycallbacks.hh>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>

1
opm/models/common/forchheimerfluxmodule.hh
View File

@ -35,7 +35,6 @@
#include <opm/models/discretization/common/fvbaseproperties.hh>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <opm/material/common/Exceptions.hpp>
#include <dune/common/fvector.hh>

1
opm/models/common/multiphasebaseextensivequantities.hh
View File

@ -35,7 +35,6 @@
#include <opm/models/utils/parametersystem.hh>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>

1
opm/models/common/multiphasebasemodel.hh
View File

@ -43,7 +43,6 @@
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/material/thermal/NullThermalConductionLaw.hpp>
#include <opm/material/thermal/NullSolidEnergyLaw.hpp>
#include <opm/material/common/Unused.hpp>
namespace Opm {
template <class TypeTag>

1
opm/models/common/multiphasebaseproblem.hh
View File

@ -35,7 +35,6 @@
#include <opm/material/fluidmatrixinteractions/NullMaterial.hpp>
#include <opm/material/common/Means.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>

1
opm/models/discretization/common/fvbaseadlocallinearizer.hh
View File

@ -32,7 +32,6 @@
#include <opm/material/densead/Math.hpp>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/istl/bvector.hh>
#include <dune/istl/matrix.hh>

2
opm/models/discretization/common/fvbaseboundarycontext.hh
View File

@ -30,8 +30,6 @@
#include "fvbaseproperties.hh"
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>
namespace Opm {

4
opm/models/discretization/common/fvbasediscretization.hh
View File

@ -59,7 +59,6 @@
#include <opm/material/common/MathToolbox.hpp>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <opm/material/common/Exceptions.hpp>
#include <dune/common/version.hh>
@ -1004,7 +1003,8 @@ public:
* This method is purely intented for debugging purposes. If the program is compiled
* with optimizations enabled, it becomes a no-op.
*/
void checkConservativeness(Scalar OPM_OPTIM_UNUSED tolerance = -1, bool OPM_OPTIM_UNUSED verbose=false) const
void checkConservativeness([[maybe_unused]] Scalar tolerance = -1,
[[maybe_unused]] bool verbose=false) const
{
#ifndef NDEBUG
Scalar totalBoundaryArea(0.0);

2
opm/models/discretization/common/fvbaseelementcontext.hh
View File

@ -33,8 +33,6 @@
#include <opm/models/discretization/common/linearizationtype.hh>
#include <opm/models/utils/alignedallocator.hh>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>
#include <vector>

1
opm/models/discretization/common/fvbaseextensivequantities.hh
View File

@ -33,7 +33,6 @@
#include <opm/models/common/multiphasebaseproperties.hh>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
namespace Opm {
/*!

2
opm/models/discretization/common/fvbasegradientcalculator.hh
View File

@ -30,8 +30,6 @@
#include "fvbaseproperties.hh"
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>
namespace Opm {

1
opm/models/discretization/common/fvbaseintensivequantities.hh
View File

@ -31,7 +31,6 @@
#include "fvbaseproperties.hh"
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
namespace Opm {

1
opm/models/discretization/common/fvbaselocalresidual.hh
View File

@ -34,7 +34,6 @@
#include <opm/models/utils/alignedallocator.hh>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/istl/bvector.hh>
#include <dune/grid/common/geometry.hh>

1
opm/models/discretization/common/fvbaseprimaryvariables.hh
View File

@ -33,7 +33,6 @@
#include "fvbaseproperties.hh"
#include "linearizationtype.hh"
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <opm/material/common/Exceptions.hpp>
#include <dune/common/fvector.hh>

1
opm/models/discretization/common/fvbaseproblem.hh
View File

@ -34,7 +34,6 @@
#include <opm/models/io/restart.hh>
#include <opm/models/discretization/common/restrictprolong.hh>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>
#include <iostream>

2
opm/models/discretization/common/restrictprolong.hh
View File

@ -23,8 +23,6 @@
#ifndef EWOMS_COPYRESTRICTPROLONG_HH
#define EWOMS_COPYRESTRICTPROLONG_HH
#include <opm/material/common/Unused.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/space/common/restrictprolonginterface.hh>
#endif

1
opm/models/discretization/vcfv/vcfvstencil.hh
View File

@ -30,7 +30,6 @@
#include <opm/models/utils/quadraturegeometries.hh>
#include <opm/material/common/Unused.hpp>
#include <opm/material/common/Exceptions.hpp>
#include <dune/grid/common/intersectioniterator.hh>

1
opm/models/flash/flashprimaryvariables.hh
View File

@ -37,7 +37,6 @@
#include <opm/material/constraintsolvers/NcpFlash.hpp>
#include <opm/material/fluidstates/CompositionalFluidState.hpp>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>

1
opm/models/io/vtkmultiwriter.hh
View File

@ -36,7 +36,6 @@
#include <opm/models/parallel/tasklets.hh>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>
#include <dune/istl/bvector.hh>

2
opm/models/io/vtkscalarfunction.hh
View File

@ -34,8 +34,6 @@
#include <dune/common/fvector.hh>
#include <dune/common/version.hh>
#include <opm/material/common/Unused.hpp>
#include <opm/material/common/Exceptions.hpp>
#include <string>

1
opm/models/ncp/ncpnewtonmethod.hh
View File

@ -32,7 +32,6 @@
#include <opm/models/nonlinear/newtonmethod.hh>
#include <opm/material/common/Unused.hpp>
#include <opm/material/common/Exceptions.hpp>
#include <algorithm>

1
opm/models/nonlinear/newtonmethod.hh
View File

@ -36,7 +36,6 @@
#include <opm/simulators/linalg/linalgproperties.hh>
#include <opm/material/densead/Math.hpp>
#include <opm/material/common/Unused.hpp>
#include <opm/material/common/Exceptions.hpp>

2
opm/models/nonlinear/nullconvergencewriter.hh
View File

@ -30,8 +30,6 @@
#include <opm/models/utils/propertysystem.hh>
#include <opm/material/common/Unused.hpp>
namespace Opm::Properties {
template <class TypeTag, class MyTypeTag>

2
opm/models/parallel/gridcommhandles.hh
View File

@ -29,8 +29,6 @@
#ifndef EWOMS_GRID_COMM_HANDLES_HH
#define EWOMS_GRID_COMM_HANDLES_HH
#include <opm/material/common/Unused.hpp>
#include <dune/grid/common/datahandleif.hh>
#include <dune/common/version.hh>

1
opm/models/richards/richardsmodel.hh
View File

@ -46,7 +46,6 @@
#include <opm/material/fluidsystems/LiquidPhase.hpp>
#include <opm/material/fluidsystems/GasPhase.hpp>
#include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
#include <opm/material/common/Unused.hpp>
#include <sstream>
#include <string>

1
opm/models/richards/richardsnewtonmethod.hh
View File

@ -31,7 +31,6 @@
#include "richardsproperties.hh"
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>

1
opm/models/richards/richardsprimaryvariables.hh
View File

@ -35,7 +35,6 @@
#include <opm/material/constraintsolvers/ImmiscibleFlash.hpp>
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/common/Valgrind.hpp>
#include <opm/material/common/Unused.hpp>
#include <dune/common/fvector.hh>

8
opm/models/utils/parametersystem.hh
View File

@ -34,8 +34,6 @@
#include <opm/models/utils/propertysystem.hh>
#include <opm/material/common/Unused.hpp>
#if HAVE_QUAD
#include <opm/material/common/quad.hpp>
#endif // HAVE_QUAD
@ -985,8 +983,8 @@ public:
}
template <class ParamType>
static bool isSet(const char *propTagName OPM_OPTIM_UNUSED,
const char *paramName OPM_OPTIM_UNUSED,
static bool isSet([[maybe_unused]] const char* propTagName,
[[maybe_unused]] const char* paramName,
bool errorIfNotRegistered = true)
{
@ -1063,7 +1061,7 @@ private:
}
template <class ParamType>
static ParamType retrieve_(const char OPM_OPTIM_UNUSED *propTagName,
static ParamType retrieve_([[maybe_unused]] const char* propTagName,
const char *paramName,
const ParamType& defaultValue,
bool errorIfNotRegistered = true)

2
opm/simulators/linalg/convergencecriterion.hh
View File

@ -27,8 +27,6 @@
#ifndef EWOMS_ISTL_CONVERGENCE_CRITERION_HH
#define EWOMS_ISTL_CONVERGENCE_CRITERION_HH
#include <opm/material/common/Unused.hpp>
#include <dune/common/version.hh>
#include <dune/common/fvector.hh>

2
opm/simulators/linalg/elementborderlistfromgrid.hh
View File

@ -30,8 +30,6 @@
#include "overlaptypes.hh"
#include "blacklist.hh"
#include <opm/material/common/Unused.hpp>
#include <dune/grid/common/datahandleif.hh>
#include <dune/grid/common/gridenums.hh>
#include <dune/istl/bcrsmatrix.hh>

2
opm/simulators/linalg/foreignoverlapfrombcrsmatrix.hh
View File

@ -32,8 +32,6 @@
#include <opm/models/parallel/mpibuffer.hh>
#include <opm/material/common/Unused.hpp>
#include <dune/grid/common/datahandleif.hh>
#include <dune/istl/bcrsmatrix.hh>
#include <dune/istl/scalarproducts.hh>

2
opm/simulators/linalg/nullborderlistmanager.hh
View File

@ -29,8 +29,6 @@
#include "overlaptypes.hh"
#include <opm/material/common/Unused.hpp>
#include <dune/grid/common/datahandleif.hh>
#include <dune/grid/common/gridenums.hh>
#include <dune/istl/bcrsmatrix.hh>

2
opm/simulators/linalg/residreductioncriterion.hh
View File

@ -29,8 +29,6 @@
#include "convergencecriterion.hh"
#include <opm/material/common/Unused.hpp>
#include <dune/istl/scalarproducts.hh>
namespace Opm {

2
opm/simulators/linalg/vertexborderlistfromgrid.hh
View File

@ -30,8 +30,6 @@
#include "overlaptypes.hh"
#include "blacklist.hh"
#include <opm/material/common/Unused.hpp>
#include <dune/grid/common/datahandleif.hh>
#include <dune/grid/common/gridenums.hh>
#include <dune/istl/bcrsmatrix.hh>

12
tests/models/test_quadrature.cpp
View File

@ -41,14 +41,6 @@
#include <opm/models/discretization/vcfv/vcfvstencil.hh>
#include <opm/material/common/Unused.hpp>
#if HAVE_DUNE_ALUGRID
#define EWOMS_NO_ALUGRID_UNUSED
#else
#define EWOMS_NO_ALUGRID_UNUSED OPM_UNUSED
#endif
const unsigned dim = 3;
using Scalar = double;
using QuadratureGeom = Opm::QuadrialteralQuadratureGeometry<Scalar, dim>;
@ -110,7 +102,7 @@ void testIdenityMapping()
}
template <class Grid>
void writeTetrahedronSubControlVolumes(const Grid& EWOMS_NO_ALUGRID_UNUSED grid)
void writeTetrahedronSubControlVolumes([[maybe_unused]] const Grid& grid)
{
#if HAVE_DUNE_ALUGRID
using GridView = typename Grid::LeafGridView;
@ -196,7 +188,7 @@ void testTetrahedron()
}
template <class Grid>
void writeCubeSubControlVolumes(const Grid& EWOMS_NO_ALUGRID_UNUSED grid)
void writeCubeSubControlVolumes([[maybe_unused]] const Grid& grid)
{
#if HAVE_DUNE_ALUGRID
using GridView = typename Grid::LeafGridView;