OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

change the order of OPM_UNUSED and variable name

Browse Source 
it seems like some compilers (GCC 4.9.2?) are picky about this and
require

```c++
TypeName VariableName __attribute__ ((__unused__))
```
This commit is contained in:
Andreas Lauser
2017-01-17 13:21:16 +01:00
parent bc01257087
commit 99304f9689
17 changed files with 195 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/problems/co2injectionproblem.hh
View File

@@ -427,9 +427,9 @@ public:
* In this case, we assume the rock-matrix to be granite. * In this case, we assume the rock-matrix to be granite.
*/ */
template <class Context> template <class Context>
Scalar heatCapacitySolid(const Context& OPM_UNUSED context, Scalar heatCapacitySolid(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ {
return 790 // specific heat capacity of granite [J / (kg K)] return 790 // specific heat capacity of granite [J / (kg K)]
* 2700; // density of granite [kg/m^3] * 2700; // density of granite [kg/m^3]
@@ -527,9 +527,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
//! \} //! \}

24
examples/problems/cuvetteproblem.hh
View File

@@ -319,9 +319,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::temperature * \copydoc FvBaseMultiPhaseProblem::temperature
*/ */
template <class Context> template <class Context>
Scalar temperature(const Context& OPM_UNUSED context, Scalar temperature(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return 293.15; /* [K] */ } { return 293.15; /* [K] */ }
/*! /*!
@@ -369,18 +369,18 @@ public:
*/ */
template <class Context> template <class Context>
const HeatConductionLawParams & const HeatConductionLawParams &
heatConductionParams(const Context& OPM_UNUSED context, heatConductionParams(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return heatCondParams_; } { return heatCondParams_; }
/*! /*!
* \copydoc FvBaseMultiPhaseProblem::heatCapacitySolid * \copydoc FvBaseMultiPhaseProblem::heatCapacitySolid
*/ */
template <class Context> template <class Context>
Scalar heatCapacitySolid(const Context& OPM_UNUSED context, Scalar heatCapacitySolid(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ {
return 850 // specific heat capacity [J / (kg K)] return 850 // specific heat capacity [J / (kg K)]
* 2650; // density of sand [kg/m^3] * 2650; // density of sand [kg/m^3]
@@ -465,9 +465,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
//! \} //! \}

36
examples/problems/diffusionproblem.hh
View File

@@ -238,18 +238,18 @@ public:
* \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability * \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability
*/ */
template <class Context> template <class Context>
const DimMatrix& intrinsicPermeability(const Context& OPM_UNUSED context, const DimMatrix& intrinsicPermeability(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return K_; } { return K_; }
/*! /*!
* \copydoc FvBaseMultiPhaseProblem::porosity * \copydoc FvBaseMultiPhaseProblem::porosity
*/ */
template <class Context> template <class Context>
Scalar porosity(const Context& OPM_UNUSED context, Scalar porosity(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return 0.35; } { return 0.35; }
/*! /*!
@@ -257,18 +257,18 @@ public:
*/ */
template <class Context> template <class Context>
const MaterialLawParams& const MaterialLawParams&
materialLawParams(const Context& OPM_UNUSED context, materialLawParams(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return materialParams_; } { return materialParams_; }
/*! /*!
* \copydoc FvBaseMultiPhaseProblem::temperature * \copydoc FvBaseMultiPhaseProblem::temperature
*/ */
template <class Context> template <class Context>
Scalar temperature(const Context& OPM_UNUSED context, Scalar temperature(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return temperature_; } { return temperature_; }
//! \} //! \}
@@ -285,9 +285,9 @@ public:
*/ */
template <class Context> template <class Context>
void boundary(BoundaryRateVector& values, void boundary(BoundaryRateVector& values,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ values.setNoFlow(); } { values.setNoFlow(); }
//! \} //! \}
@@ -321,9 +321,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
//! \} //! \}

74
examples/problems/fractureproblem.hh
View File

@@ -316,9 +316,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::temperature * \copydoc FvBaseMultiPhaseProblem::temperature
*/ */
template <class Context> template <class Context>
Scalar temperature(const Context& OPM_UNUSED context, Scalar temperature(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return temperature_; } { return temperature_; }
// \} // \}
@@ -332,9 +332,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability * \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability
*/ */
template <class Context> template <class Context>
const DimMatrix& intrinsicPermeability(const Context& OPM_UNUSED context, const DimMatrix& intrinsicPermeability(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return matrixK_; } { return matrixK_; }
/*! /*!
@@ -343,18 +343,18 @@ public:
* \copydoc Doxygen::contextParams * \copydoc Doxygen::contextParams
*/ */
template <class Context> template <class Context>
const DimMatrix& fractureIntrinsicPermeability(const Context& OPM_UNUSED context, const DimMatrix& fractureIntrinsicPermeability(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return fractureK_; } { return fractureK_; }
/*! /*!
* \copydoc FvBaseMultiPhaseProblem::porosity * \copydoc FvBaseMultiPhaseProblem::porosity
*/ */
template <class Context> template <class Context>
Scalar porosity(const Context& OPM_UNUSED context, Scalar porosity(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return matrixPorosity_; } { return matrixPorosity_; }
/*! /*!
@@ -363,18 +363,18 @@ public:
* \copydoc Doxygen::contextParams * \copydoc Doxygen::contextParams
*/ */
template <class Context> template <class Context>
Scalar fracturePorosity(const Context& OPM_UNUSED context, Scalar fracturePorosity(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return fracturePorosity_; } { return fracturePorosity_; }
/*! /*!
* \copydoc FvBaseMultiPhaseProblem::materialLawParams * \copydoc FvBaseMultiPhaseProblem::materialLawParams
*/ */
template <class Context> template <class Context>
const MaterialLawParams& materialLawParams(const Context& OPM_UNUSED context, const MaterialLawParams& materialLawParams(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return matrixMaterialParams_; } { return matrixMaterialParams_; }
/*! /*!
@@ -383,9 +383,9 @@ public:
* \copydoc Doxygen::contextParams * \copydoc Doxygen::contextParams
*/ */
template <class Context> template <class Context>
const MaterialLawParams& fractureMaterialLawParams(const Context& OPM_UNUSED context, const MaterialLawParams& fractureMaterialLawParams(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return fractureMaterialParams_; } { return fractureMaterialParams_; }
/*! /*!
@@ -407,10 +407,10 @@ public:
* \param timeIdx The index used by the time discretization. * \param timeIdx The index used by the time discretization.
*/ */
template <class Context> template <class Context>
Scalar fractureWidth(const Context& OPM_UNUSED context, Scalar fractureWidth(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx1, unsigned spaceIdx1 OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx2, unsigned spaceIdx2 OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return fractureWidth_; } { return fractureWidth_; }
/*! /*!
@@ -418,9 +418,9 @@ public:
*/ */
template <class Context> template <class Context>
const HeatConductionLawParams & const HeatConductionLawParams &
heatConductionParams(const Context& OPM_UNUSED context, heatConductionParams(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return heatCondParams_; } { return heatCondParams_; }
/*! /*!
@@ -429,9 +429,9 @@ public:
* In this case, we assume the rock-matrix to be granite. * In this case, we assume the rock-matrix to be granite.
*/ */
template <class Context> template <class Context>
Scalar heatCapacitySolid(const Context& OPM_UNUSED context, Scalar heatCapacitySolid(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ {
return 790 // specific heat capacity of granite [J / (kg K)] return 790 // specific heat capacity of granite [J / (kg K)]
* 2700; // density of granite [kg/m^3] * 2700; // density of granite [kg/m^3]
@@ -533,9 +533,9 @@ public:
*/ */
template <class Context> template <class Context>
void initial(PrimaryVariables& values, void initial(PrimaryVariables& values,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ {
FluidState fluidState; FluidState fluidState;
fluidState.setTemperature(temperature_); fluidState.setTemperature(temperature_);
@@ -557,9 +557,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
// \} // \}

24
examples/problems/groundwaterproblem.hh
View File

@@ -257,18 +257,18 @@ public:
* \copydoc FvBaseMultiPhaseProblem::temperature * \copydoc FvBaseMultiPhaseProblem::temperature
*/ */
template <class Context> template <class Context>
Scalar temperature(const Context& OPM_UNUSED context, Scalar temperature(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return 273.15 + 10; } // 10C { return 273.15 + 10; } // 10C
/*! /*!
* \copydoc FvBaseMultiPhaseProblem::porosity * \copydoc FvBaseMultiPhaseProblem::porosity
*/ */
template <class Context> template <class Context>
Scalar porosity(const Context& OPM_UNUSED context, Scalar porosity(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return 0.4; } { return 0.4; }
/*! /*!
@@ -335,9 +335,9 @@ public:
*/ */
template <class Context> template <class Context>
void initial(PrimaryVariables& values, void initial(PrimaryVariables& values,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ {
// const GlobalPosition& globalPos = context.pos(spaceIdx, timeIdx); // const GlobalPosition& globalPos = context.pos(spaceIdx, timeIdx);
values[pressure0Idx] = 1.0e+5; // + 9.81*1.23*(20-globalPos[dim-1]); values[pressure0Idx] = 1.0e+5; // + 9.81*1.23*(20-globalPos[dim-1]);
@@ -348,9 +348,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
//! \} //! \}

30
examples/problems/infiltrationproblem.hh
View File

@@ -279,9 +279,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::temperature * \copydoc FvBaseMultiPhaseProblem::temperature
*/ */
template <class Context> template <class Context>
Scalar temperature(const Context& OPM_UNUSED context, Scalar temperature(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return temperature_; } { return temperature_; }
/*! /*!
@@ -303,9 +303,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::porosity * \copydoc FvBaseMultiPhaseProblem::porosity
*/ */
template <class Context> template <class Context>
Scalar porosity(const Context& OPM_UNUSED context, Scalar porosity(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return porosity_; } { return porosity_; }
/*! /*!
@@ -313,9 +313,9 @@ public:
*/ */
template <class Context> template <class Context>
const MaterialLawParams& const MaterialLawParams&
materialLawParams(const Context& OPM_UNUSED context, materialLawParams(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return materialParams_; } { return materialParams_; }
/*! /*!
@@ -324,9 +324,9 @@ public:
* In this case, we assume the rock-matrix to be quartz. * In this case, we assume the rock-matrix to be quartz.
*/ */
template <class Context> template <class Context>
Scalar heatCapacitySolid(const Context& OPM_UNUSED context, Scalar heatCapacitySolid(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ {
return 850. // specific heat capacity [J / (kg K)] return 850. // specific heat capacity [J / (kg K)]
* 2650.; // density of sand [kg/m^3] * 2650.; // density of sand [kg/m^3]
@@ -401,9 +401,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
//! \} //! \}

18
examples/problems/lensproblem.hh
View File

@@ -325,9 +325,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::porosity * \copydoc FvBaseMultiPhaseProblem::porosity
*/ */
template <class Context> template <class Context>
Scalar porosity(const Context& OPM_UNUSED context, Scalar porosity(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return 0.4; } { return 0.4; }
/*! /*!
@@ -348,9 +348,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::temperature * \copydoc FvBaseMultiPhaseProblem::temperature
*/ */
template <class Context> template <class Context>
Scalar temperature(const Context& OPM_UNUSED context, Scalar temperature(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return temperature_; } { return temperature_; }
//! \} //! \}
@@ -530,9 +530,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
//! \} //! \}

18
examples/problems/obstacleproblem.hh
View File

@@ -299,9 +299,9 @@ public:
* This problem simply assumes a constant temperature. * This problem simply assumes a constant temperature.
*/ */
template <class Context> template <class Context>
Scalar temperature(const Context& OPM_UNUSED context, Scalar temperature(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return temperature_; } { return temperature_; }
/*! /*!
@@ -356,9 +356,9 @@ public:
* medium is granite. * medium is granite.
*/ */
template <class Context> template <class Context>
Scalar heatCapacitySolid(const Context& OPM_UNUSED context, Scalar heatCapacitySolid(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ {
return 790 // specific heat capacity of granite [J / (kg K)] return 790 // specific heat capacity of granite [J / (kg K)]
* 2700; // density of granite [kg/m^3] * 2700; // density of granite [kg/m^3]
@@ -433,9 +433,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = 0.0; } { rate = 0.0; }
//! \} //! \}

24
examples/problems/outflowproblem.hh
View File

@@ -195,9 +195,9 @@ public:
* This problem assumes a temperature. * This problem assumes a temperature.
*/ */
template <class Context> template <class Context>
Scalar temperature(const Context& OPM_UNUSED context, Scalar temperature(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return temperature_; } // in [K] { return temperature_; } // in [K]
/*! /*!
@@ -206,9 +206,9 @@ public:
* This problem uses a constant intrinsic permeability. * This problem uses a constant intrinsic permeability.
*/ */
template <class Context> template <class Context>
const DimMatrix& intrinsicPermeability(const Context& OPM_UNUSED context, const DimMatrix& intrinsicPermeability(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return perm_; } { return perm_; }
/*! /*!
@@ -217,9 +217,9 @@ public:
* This problem uses a constant porosity. * This problem uses a constant porosity.
*/ */
template <class Context> template <class Context>
Scalar porosity(const Context& OPM_UNUSED context, Scalar porosity(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return porosity_; } { return porosity_; }
#if 0 #if 0
@@ -313,9 +313,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
//! \} //! \}

42
examples/problems/powerinjectionproblem.hh
View File

@@ -271,27 +271,27 @@ public:
* \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability * \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability
*/ */
template <class Context> template <class Context>
const DimMatrix& intrinsicPermeability(const Context& OPM_UNUSED context, const DimMatrix& intrinsicPermeability(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return K_; } { return K_; }
/*! /*!
* \copydoc ForchheimerBaseProblem::ergunCoefficient * \copydoc ForchheimerBaseProblem::ergunCoefficient
*/ */
template <class Context> template <class Context>
Scalar ergunCoefficient(const Context& OPM_UNUSED context, Scalar ergunCoefficient(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return 0.3866; } { return 0.3866; }
/*! /*!
* \copydoc FvBaseMultiPhaseProblem::porosity * \copydoc FvBaseMultiPhaseProblem::porosity
*/ */
template <class Context> template <class Context>
Scalar porosity(const Context& OPM_UNUSED context, Scalar porosity(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return 0.558; } { return 0.558; }
/*! /*!
@@ -299,18 +299,18 @@ public:
*/ */
template <class Context> template <class Context>
const MaterialLawParams& const MaterialLawParams&
materialLawParams(const Context& OPM_UNUSED context, materialLawParams(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return materialParams_; } { return materialParams_; }
/*! /*!
* \copydoc FvBaseMultiPhaseProblem::temperature * \copydoc FvBaseMultiPhaseProblem::temperature
*/ */
template <class Context> template <class Context>
Scalar temperature(const Context& OPM_UNUSED context, Scalar temperature(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return temperature_; } { return temperature_; }
//! \} //! \}
@@ -361,9 +361,9 @@ public:
*/ */
template <class Context> template <class Context>
void initial(PrimaryVariables& values, void initial(PrimaryVariables& values,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ {
// assign the primary variables // assign the primary variables
values.assignNaive(initialFluidState_); values.assignNaive(initialFluidState_);
@@ -377,9 +377,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
//! \} //! \}

24
examples/problems/reservoirproblem.hh
View File

@@ -481,9 +481,9 @@ public:
* will need it one day? * will need it one day?
*/ */
template <class Context> template <class Context>
Scalar temperature(const Context& OPM_UNUSED context, Scalar temperature(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return temperature_; } { return temperature_; }
// \} // \}
@@ -501,9 +501,9 @@ public:
*/ */
template <class Context> template <class Context>
void boundary(BoundaryRateVector& values, void boundary(BoundaryRateVector& values,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ {
// no flow on top and bottom // no flow on top and bottom
values.setNoFlow(); values.setNoFlow();
@@ -524,9 +524,9 @@ public:
*/ */
template <class Context> template <class Context>
void initial(PrimaryVariables& values, void initial(PrimaryVariables& values,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ {
values.assignNaive(initialFluidState_); values.assignNaive(initialFluidState_);
@@ -569,9 +569,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
//! \} //! \}

20
examples/problems/richardslensproblem.hh
View File

@@ -274,7 +274,7 @@ public:
Scalar temperature(const Context& context, unsigned spaceIdx, unsigned timeIdx) const Scalar temperature(const Context& context, unsigned spaceIdx, unsigned timeIdx) const
{ return temperature(context.globalSpaceIndex(spaceIdx, timeIdx), timeIdx); } { return temperature(context.globalSpaceIndex(spaceIdx, timeIdx), timeIdx); }
Scalar temperature(unsigned OPM_UNUSED globalSpaceIdx, unsigned OPM_UNUSED timeIdx) const Scalar temperature(unsigned globalSpaceIdx OPM_UNUSED, unsigned timeIdx OPM_UNUSED) const
{ return 273.15 + 10; } // -> 10°C { return 273.15 + 10; } // -> 10°C
/*! /*!
@@ -295,9 +295,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::porosity * \copydoc FvBaseMultiPhaseProblem::porosity
*/ */
template <class Context> template <class Context>
Scalar porosity(const Context& OPM_UNUSED context, Scalar porosity(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return 0.4; } { return 0.4; }
/*! /*!
@@ -313,7 +313,7 @@ public:
} }
const MaterialLawParams& materialLawParams(unsigned globalSpaceIdx, const MaterialLawParams& materialLawParams(unsigned globalSpaceIdx,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ {
if (dofIsInLens_[globalSpaceIdx]) if (dofIsInLens_[globalSpaceIdx])
return lensMaterialParams_; return lensMaterialParams_;
@@ -333,8 +333,8 @@ public:
// the Richards model does not have an element context available at all places // the Richards model does not have an element context available at all places
// where the reference pressure is required... // where the reference pressure is required...
Scalar referencePressure(unsigned OPM_UNUSED globalSpaceIdx, Scalar referencePressure(unsigned globalSpaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return pnRef_; } { return pnRef_; }
//! \} //! \}
@@ -418,9 +418,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
//! \} //! \}

12
examples/problems/stokes2ctestproblem.hh
View File

@@ -183,9 +183,9 @@ public:
* This problem assumes a temperature of 10 degrees Celsius. * This problem assumes a temperature of 10 degrees Celsius.
*/ */
template <class Context> template <class Context>
Scalar temperature(const Context& OPM_UNUSED context, Scalar temperature(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return 273.15 + 10; /* -> 10 deg C */ } { return 273.15 + 10; /* -> 10 deg C */ }
// \} // \}
@@ -273,9 +273,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
/*! /*!

6
examples/problems/stokesnitestproblem.hh
View File

@@ -279,9 +279,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
/*! /*!

12
examples/problems/stokestestproblem.hh
View File

@@ -176,9 +176,9 @@ public:
* This problem assumes a constant temperature of 10 degrees Celsius. * This problem assumes a constant temperature of 10 degrees Celsius.
*/ */
template <class Context> template <class Context>
Scalar temperature(const Context& OPM_UNUSED context, Scalar temperature(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ return 273.15 + 10; } // -> 10 deg C { return 273.15 + 10; } // -> 10 deg C
//! \} //! \}
@@ -268,9 +268,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }
/*! /*!

12
examples/problems/waterairproblem.hh
View File

@@ -353,9 +353,9 @@ public:
* In this case, we assume the rock-matrix to be granite. * In this case, we assume the rock-matrix to be granite.
*/ */
template <class Context> template <class Context>
Scalar heatCapacitySolid(const Context& OPM_UNUSED context, Scalar heatCapacitySolid(const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ {
return return
790 // specific heat capacity of granite [J / (kg K)] 790 // specific heat capacity of granite [J / (kg K)]
@@ -464,9 +464,9 @@ public:
*/ */
template <class Context> template <class Context>
void source(RateVector& rate, void source(RateVector& rate,
const Context& OPM_UNUSED context, const Context& context OPM_UNUSED,
unsigned OPM_UNUSED spaceIdx, unsigned spaceIdx OPM_UNUSED,
unsigned OPM_UNUSED timeIdx) const unsigned timeIdx OPM_UNUSED) const
{ rate = 0; } { rate = 0; }
//! \} //! \}

2
tests/models/test_quadrature.cpp
View File

@@ -46,7 +46,7 @@
#if HAVE_DUNE_ALUGRID #if HAVE_DUNE_ALUGRID
#define EWOMS_NO_ALUGRID_UNUSED #define EWOMS_NO_ALUGRID_UNUSED
#else #else
#define EWOMS_NO_ALUGRID_UNUSED OPM_UNUSED #define EWOMS_NO_ALUGRID_UNUSED OPM_UNUSED
#endif #endif
const unsigned dim = 3; const unsigned dim = 3;