mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-09-05 04:40:19 -05:00
remove use of Unused.hpp
This commit is contained in:
@@ -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); }
|
||||
|
||||
//! \}
|
||||
|
||||
@@ -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,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); }
|
||||
|
||||
//! \}
|
||||
|
||||
@@ -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); }
|
||||
|
||||
//! \}
|
||||
|
||||
@@ -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); }
|
||||
|
||||
//! \}
|
||||
|
||||
@@ -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); }
|
||||
|
||||
//! \}
|
||||
|
||||
@@ -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; }
|
||||
|
||||
//! \}
|
||||
|
||||
@@ -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); }
|
||||
|
||||
//! \}
|
||||
|
||||
@@ -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); }
|
||||
|
||||
//! \}
|
||||
|
||||
@@ -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); }
|
||||
|
||||
//! \}
|
||||
|
||||
@@ -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); }
|
||||
|
||||
//! \}
|
||||
|
||||
@@ -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; }
|
||||
|
||||
//! \}
|
||||
|
||||
Reference in New Issue
Block a user