OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suppressed more warnings.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2015-09-14 17:15:04 +02:00
parent a5ecbd765c
commit bba5e33973
18 changed files with 161 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp
View File

@@ -192,6 +192,9 @@ public:
const Params &params,
const FluidState &fs)
{
static_cast<void>(values);
static_cast<void>(params);
static_cast<void>(fs);
OPM_THROW(std::logic_error, "Not implemented: saturations()");
}
@@ -202,6 +205,8 @@ public:
static Evaluation Sg(const Params &params,
const FluidState &fluidState)
{
static_cast<void>(params);
static_cast<void>(fluidState);
OPM_THROW(std::logic_error, "Not implemented: Sg()");
}
@@ -212,6 +217,8 @@ public:
static Evaluation Sn(const Params &params,
const FluidState &fluidState)
{
static_cast<void>(params);
static_cast<void>(fluidState);
OPM_THROW(std::logic_error, "Not implemented: Sn()");
}
@@ -222,6 +229,8 @@ public:
static Evaluation Sw(const Params &params,
const FluidState &fluidState)
{
static_cast<void>(params);
static_cast<void>(fluidState);
OPM_THROW(std::logic_error, "Not implemented: Sw()");
}

6
opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp
View File

@@ -52,7 +52,7 @@ class EclEpsGridProperties
public:
#if HAVE_OPM_PARSER
void initFromDeck(Opm::DeckConstPtr deck,
void initFromDeck(Opm::DeckConstPtr /* deck */,
Opm::EclipseStateConstPtr eclState,
bool useImbibition)
{
@@ -453,7 +453,7 @@ private:
Sowu = sof3Table.getSoColumn().back();
// critical oil saturation of oil-water system
for (int rowIdx = 0 ; rowIdx < sof3Table.numRows(); ++ rowIdx) {
for (size_t rowIdx = 0 ; rowIdx < sof3Table.numRows(); ++ rowIdx) {
if (sof3Table.getKrowColumn()[rowIdx] > 0) {
assert(rowIdx > 0);
Sowcr = sof3Table.getSoColumn()[rowIdx - 1];
@@ -462,7 +462,7 @@ private:
}
// critical oil saturation of gas-oil system
for (int rowIdx = 0 ; rowIdx < sof3Table.numRows(); ++ rowIdx) {
for (size_t rowIdx = 0 ; rowIdx < sof3Table.numRows(); ++ rowIdx) {
if (sof3Table.getKrogColumn()[rowIdx] > 0) {
assert(rowIdx > 0);
Sogcr = sof3Table.getSoColumn()[rowIdx - 1];

23
opm/material/fluidmatrixinteractions/EclEpsTwoPhaseLaw.hpp
View File

@@ -108,6 +108,9 @@ public:
template <class Container, class FluidState>
static void capillaryPressures(Container &values, const Params &params, const FluidState &fs)
{
static_cast<void>(values);
static_cast<void>(params);
static_cast<void>(fs);
OPM_THROW(NotAvailable,
"The capillaryPressures(fs) method is not yet implemented");
}
@@ -125,6 +128,9 @@ public:
template <class Container, class FluidState>
static void relativePermeabilities(Container &values, const Params &params, const FluidState &fs)
{
static_cast<void>(values);
static_cast<void>(params);
static_cast<void>(fs);
OPM_THROW(NotAvailable,
"The pcnw(fs) method is not yet implemented");
}
@@ -143,6 +149,8 @@ public:
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation pcnw(const Params &params, const FluidState &fs)
{
static_cast<void>(params);
static_cast<void>(fs);
OPM_THROW(NotAvailable,
"The pcnw(fs) method is not yet implemented");
}
@@ -169,6 +177,9 @@ public:
template <class Container, class FluidState>
static void saturations(Container &values, const Params &params, const FluidState &fs)
{
static_cast<void>(values);
static_cast<void>(params);
static_cast<void>(fs);
OPM_THROW(NotAvailable,
"The saturations(fs) method is not yet implemented");
}
@@ -180,6 +191,8 @@ public:
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sw(const Params &params, const FluidState &fs)
{
static_cast<void>(params);
static_cast<void>(fs);
OPM_THROW(NotAvailable,
"The Sw(fs) method is not yet implemented");
}
@@ -187,6 +200,8 @@ public:
template <class Evaluation>
static Evaluation twoPhaseSatSw(const Params &params, const Evaluation& pc)
{
static_cast<void>(params);
static_cast<void>(pc);
OPM_THROW(NotAvailable,
"The twoPhaseSatSw(pc) method is not yet implemented");
}
@@ -198,6 +213,8 @@ public:
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sn(const Params &params, const FluidState &fs)
{
static_cast<void>(params);
static_cast<void>(fs);
OPM_THROW(NotAvailable,
"The Sn(pc) method is not yet implemented");
}
@@ -205,6 +222,8 @@ public:
template <class Evaluation>
static Evaluation twoPhaseSatSn(const Params &params, const Evaluation& pc)
{
static_cast<void>(params);
static_cast<void>(pc);
OPM_THROW(NotAvailable,
"The twoPhaseSatSn(pc) method is not yet implemented");
}
@@ -221,6 +240,8 @@ public:
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation krw(const Params &params, const FluidState &fs)
{
static_cast<void>(params);
static_cast<void>(fs);
OPM_THROW(NotAvailable,
"The krw(fs) method is not yet implemented");
}
@@ -247,6 +268,8 @@ public:
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation krn(const Params &params, const FluidState &fs)
{
static_cast<void>(params);
static_cast<void>(fs);
OPM_THROW(NotAvailable,
"The krn(fs) method is not yet implemented");
}

33
opm/material/fluidmatrixinteractions/EclHysteresisTwoPhaseLaw.hpp
View File

@@ -97,7 +97,9 @@ public:
* ought to be calculated
*/
template <class Container, class FluidState>
static void capillaryPressures(Container &values, const Params &params, const FluidState &fs)
static void capillaryPressures(Container& /* values */,
const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(NotAvailable,
"The capillaryPressures(fs) method is not yet implemented");
@@ -114,7 +116,9 @@ public:
* ought to be calculated
*/
template <class Container, class FluidState>
static void relativePermeabilities(Container &values, const Params &params, const FluidState &fs)
static void relativePermeabilities(Container& /* values */,
const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(NotAvailable,
"The pcnw(fs) method is not yet implemented");
@@ -132,7 +136,8 @@ public:
* Genuchten, linear...)
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation pcnw(const Params &params, const FluidState &fs)
static Evaluation pcnw(const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(NotAvailable,
"The pcnw(fs) method is not yet implemented");
@@ -161,7 +166,9 @@ public:
* \brief The saturation-capillary pressure curves.
*/
template <class Container, class FluidState>
static void saturations(Container &values, const Params &params, const FluidState &fs)
static void saturations(Container& /* values */,
const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(NotAvailable,
"The saturations(fs) method is not yet implemented");
@@ -172,14 +179,16 @@ public:
* the rest of the fluid state has been initialized
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sw(const Params &params, const FluidState &fs)
static Evaluation Sw(const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(NotAvailable,
"The Sw(fs) method is not yet implemented");
}
template <class Evaluation>
static Evaluation twoPhaseSatSw(const Params &params, const Evaluation& pc)
static Evaluation twoPhaseSatSw(const Params& /* params */,
const Evaluation& /* pc */)
{
OPM_THROW(NotAvailable,
"The twoPhaseSatSw(pc) method is not yet implemented");
@@ -190,14 +199,16 @@ public:
* the rest of the fluid state has been initialized
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sn(const Params &params, const FluidState &fs)
static Evaluation Sn(const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(NotAvailable,
"The Sn(pc) method is not yet implemented");
}
template <class Evaluation>
static Evaluation twoPhaseSatSn(const Params &params, const Evaluation& pc)
static Evaluation twoPhaseSatSn(const Params& /* params */,
const Evaluation& /* pc */)
{
OPM_THROW(NotAvailable,
"The twoPhaseSatSn(pc) method is not yet implemented");
@@ -213,7 +224,8 @@ public:
*
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation krw(const Params &params, const FluidState &fs)
static Evaluation krw(const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(NotAvailable,
"The krw(fs) method is not yet implemented");
@@ -240,7 +252,8 @@ public:
* \brief The relative permeability of the non-wetting phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation krn(const Params &params, const FluidState &fs)
static Evaluation krn(const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(NotAvailable,
"The krn(fs) method is not yet implemented");

14
opm/material/fluidmatrixinteractions/EclHysteresisTwoPhaseLawParams.hpp
View File

@@ -101,8 +101,8 @@ public:
* \brief Sets the parameters used for the drainage curve
*/
void setDrainageParams(std::shared_ptr<EffLawParams> value,
const EclEpsScalingPointsInfo<Scalar>& info,
EclTwoPhaseSystemType twoPhaseSystem)
const EclEpsScalingPointsInfo<Scalar>& /* info */,
EclTwoPhaseSystemType /* twoPhaseSystem */)
{
drainageParams_ = *value;
@@ -133,8 +133,8 @@ public:
* \brief Sets the parameters used for the imbibition curve
*/
void setImbibitionParams(std::shared_ptr<EffLawParams> value,
const EclEpsScalingPointsInfo<Scalar>& info,
EclTwoPhaseSystemType twoPhaseSystem)
const EclEpsScalingPointsInfo<Scalar>& /* info */,
EclTwoPhaseSystemType /* twoPhaseSystem */)
{
imbibitionParams_ = *value;
@@ -177,7 +177,7 @@ public:
* drainage curve (MDC) to imbibition happend on the relperm curve for the
* wetting phase.
*/
void setKrwSwMdc(Scalar value)
void setKrwSwMdc(Scalar /* value */)
{}
// { krwSwMdc_ = value; };
@@ -213,7 +213,7 @@ public:
* This means that krw(Sw) = krw_drainage(Sw) if Sw < SwMdc and
* krw(Sw) = krw_imbibition(Sw + Sw_shift,krw) else
*/
void setDeltaSwImbKrw(Scalar value)
void setDeltaSwImbKrw(Scalar /* value */)
{}
// { deltaSwImbKrw_ = value; }
@@ -274,7 +274,7 @@ public:
* This updates the scanning curves and the imbibition<->drainage reversal points as
* appropriate.
*/
void update(Scalar pcSw, Scalar krwSw, Scalar krnSw)
void update(Scalar pcSw, Scalar /* krwSw */, Scalar krnSw)
{
bool updateParams = false;
if (pcSw < pcSwMdc_) {

34
opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
View File

@@ -118,7 +118,7 @@ public:
compressedToCartesianElemIdx_ = compressedToCartesianElemIdx;
// get the number of saturation regions and the number of cells in the deck
int numSatRegions = deck->getKeyword("TABDIMS")->getRecord(0)->getItem("NTSFUN")->getInt(0);
unsigned numCompressedElems = compressedToCartesianElemIdx.size();;
int numCompressedElems = compressedToCartesianElemIdx.size();
// copy the SATNUM grid property. in some cases this is not necessary, but it
// should not require much memory anyway...
@@ -332,7 +332,7 @@ private:
OilWaterParamVector oilWaterParams(numSatRegions);
MaterialLawParamsVector satRegionParams(numSatRegions);
EclEpsScalingPointsInfo<Scalar> dummyInfo;
for (int satnumRegionIdx = 0; satnumRegionIdx < numSatRegions; ++satnumRegionIdx) {
for (size_t satnumRegionIdx = 0; satnumRegionIdx < numSatRegions; ++satnumRegionIdx) {
// the parameters for the effective two-phase matererial laws
readGasOilEffectiveParameters_(gasOilEffectiveParamVector, deck, eclState, satnumRegionIdx);
readOilWaterEffectiveParameters_(oilWaterEffectiveParamVector, deck, eclState, satnumRegionIdx);
@@ -512,24 +512,24 @@ private:
if (enableHysteresis()) {
int imbRegionIdx = imbnumData[elemIdx] - 1;
auto gasOilImbParams = std::make_shared<GasOilEpsTwoPhaseParams>();
gasOilImbParams->setConfig(gasOilConfig);
gasOilImbParams->setUnscaledPoints(gasOilUnscaledPointsVector[imbRegionIdx]);
gasOilImbParams->setScaledPoints(gasOilScaledImbPointsVector[elemIdx]);
gasOilImbParams->setEffectiveLawParams(gasOilEffectiveParamVector[imbRegionIdx]);
gasOilImbParams->finalize();
auto gasOilImbParamsHyst = std::make_shared<GasOilEpsTwoPhaseParams>();
gasOilImbParamsHyst->setConfig(gasOilConfig);
gasOilImbParamsHyst->setUnscaledPoints(gasOilUnscaledPointsVector[imbRegionIdx]);
gasOilImbParamsHyst->setScaledPoints(gasOilScaledImbPointsVector[elemIdx]);
gasOilImbParamsHyst->setEffectiveLawParams(gasOilEffectiveParamVector[imbRegionIdx]);
gasOilImbParamsHyst->finalize();
auto oilWaterImbParams = std::make_shared<OilWaterEpsTwoPhaseParams>();
oilWaterImbParams->setConfig(oilWaterConfig);
oilWaterImbParams->setUnscaledPoints(oilWaterUnscaledPointsVector[imbRegionIdx]);
oilWaterImbParams->setScaledPoints(oilWaterScaledImbPointsVector[elemIdx]);
oilWaterImbParams->setEffectiveLawParams(oilWaterEffectiveParamVector[imbRegionIdx]);
oilWaterImbParams->finalize();
auto oilWaterImbParamsHyst = std::make_shared<OilWaterEpsTwoPhaseParams>();
oilWaterImbParamsHyst->setConfig(oilWaterConfig);
oilWaterImbParamsHyst->setUnscaledPoints(oilWaterUnscaledPointsVector[imbRegionIdx]);
oilWaterImbParamsHyst->setScaledPoints(oilWaterScaledImbPointsVector[elemIdx]);
oilWaterImbParamsHyst->setEffectiveLawParams(oilWaterEffectiveParamVector[imbRegionIdx]);
oilWaterImbParamsHyst->finalize();
gasOilParams[elemIdx]->setImbibitionParams(gasOilImbParams,
gasOilParams[elemIdx]->setImbibitionParams(gasOilImbParamsHyst,
*gasOilScaledImbInfoVector[elemIdx],
EclGasOilSystem);
oilWaterParams[elemIdx]->setImbibitionParams(oilWaterImbParams,
oilWaterParams[elemIdx]->setImbibitionParams(oilWaterImbParamsHyst,
*gasOilScaledImbInfoVector[elemIdx],
EclGasOilSystem);
}
@@ -854,7 +854,7 @@ private:
}
void initThreePhaseParams_(Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclState,
Opm::EclipseStateConstPtr /* eclState */,
MaterialLawParams& materialParams,
int satnumIdx,
const EclEpsScalingPointsInfo<Scalar>& epsInfo,

38
opm/material/fluidmatrixinteractions/EclMultiplexerMaterial.hpp
View File

@@ -167,8 +167,8 @@ public:
* \f]
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation pcgn(const Params &params,
const FluidState &fs)
static Evaluation pcgn(const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(std::logic_error, "Not implemented: pcgn()");
}
@@ -183,8 +183,8 @@ public:
* \f]
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation pcnw(const Params &params,
const FluidState &fs)
static Evaluation pcnw(const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(std::logic_error, "Not implemented: pcnw()");
}
@@ -193,9 +193,9 @@ public:
* \brief The inverse of the capillary pressure
*/
template <class ContainerT, class FluidState>
static void saturations(ContainerT &values,
const Params &params,
const FluidState &fs)
static void saturations(ContainerT& /* values */,
const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(std::logic_error, "Not implemented: saturations()");
}
@@ -204,8 +204,8 @@ public:
* \brief The saturation of the gas phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sg(const Params &params,
const FluidState &fluidState)
static Evaluation Sg(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: Sg()");
}
@@ -214,8 +214,8 @@ public:
* \brief The saturation of the non-wetting (i.e., oil) phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sn(const Params &params,
const FluidState &fluidState)
static Evaluation Sn(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: Sn()");
}
@@ -224,8 +224,8 @@ public:
* \brief The saturation of the wetting (i.e., water) phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sw(const Params &params,
const FluidState &fluidState)
static Evaluation Sw(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: Sw()");
}
@@ -281,8 +281,8 @@ public:
* \brief The relative permeability of the gas phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation krg(const Params &params,
const FluidState &fluidState)
static Evaluation krg(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: krg()");
}
@@ -291,8 +291,8 @@ public:
* \brief The relative permeability of the wetting phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation krw(const Params &params,
const FluidState &fluidState)
static Evaluation krw(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: krw()");
}
@@ -301,8 +301,8 @@ public:
* \brief The relative permeability of the non-wetting (i.e., oil) phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation krn(const Params &params,
const FluidState &fluidState)
static Evaluation krn(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: krn()");
}

18
opm/material/fluidmatrixinteractions/EclStone1Material.hpp
View File

@@ -191,9 +191,9 @@ public:
* \brief The inverse of the capillary pressure
*/
template <class ContainerT, class FluidState>
static void saturations(ContainerT &values,
const Params &params,
const FluidState &fs)
static void saturations(ContainerT& /* values */,
const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: saturations()");
}
@@ -202,8 +202,8 @@ public:
* \brief The saturation of the gas phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sg(const Params &params,
const FluidState &fluidState)
static Evaluation Sg(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: Sg()");
}
@@ -212,8 +212,8 @@ public:
* \brief The saturation of the non-wetting (i.e., oil) phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sn(const Params &params,
const FluidState &fluidState)
static Evaluation Sn(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: Sn()");
}
@@ -222,8 +222,8 @@ public:
* \brief The saturation of the wetting (i.e., water) phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sw(const Params &params,
const FluidState &fluidState)
static Evaluation Sw(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: Sw()");
}

18
opm/material/fluidmatrixinteractions/EclStone2Material.hpp
View File

@@ -190,9 +190,9 @@ public:
* \brief The inverse of the capillary pressure
*/
template <class ContainerT, class FluidState>
static void saturations(ContainerT &values,
const Params &params,
const FluidState &fs)
static void saturations(ContainerT& /*values */,
const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: saturations()");
}
@@ -201,8 +201,8 @@ public:
* \brief The saturation of the gas phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sg(const Params &params,
const FluidState &fluidState)
static Evaluation Sg(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: Sg()");
}
@@ -211,8 +211,8 @@ public:
* \brief The saturation of the non-wetting (i.e., oil) phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sn(const Params &params,
const FluidState &fluidState)
static Evaluation Sn(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: Sn()");
}
@@ -221,8 +221,8 @@ public:
* \brief The saturation of the wetting (i.e., water) phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sw(const Params &params,
const FluidState &fluidState)
static Evaluation Sw(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: Sw()");
}

38
opm/material/fluidmatrixinteractions/EclTwoPhaseMaterial.hpp
View File

@@ -170,8 +170,8 @@ public:
* \f]
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation pcgn(const Params &params,
const FluidState &fs)
static Evaluation pcgn(const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(std::logic_error, "Not implemented: pcgn()");
}
@@ -186,8 +186,8 @@ public:
* \f]
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation pcnw(const Params &params,
const FluidState &fs)
static Evaluation pcnw(const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(std::logic_error, "Not implemented: pcnw()");
}
@@ -196,9 +196,9 @@ public:
* \brief The inverse of the capillary pressure
*/
template <class ContainerT, class FluidState>
static void saturations(ContainerT &values,
const Params &params,
const FluidState &fs)
static void saturations(ContainerT& /* values */,
const Params& /* params */,
const FluidState& /* fs */)
{
OPM_THROW(std::logic_error, "Not implemented: saturations()");
}
@@ -207,8 +207,8 @@ public:
* \brief The saturation of the gas phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sg(const Params &params,
const FluidState &fluidState)
static Evaluation Sg(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: Sg()");
}
@@ -217,8 +217,8 @@ public:
* \brief The saturation of the non-wetting (i.e., oil) phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sn(const Params &params,
const FluidState &fluidState)
static Evaluation Sn(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: Sn()");
}
@@ -227,8 +227,8 @@ public:
* \brief The saturation of the wetting (i.e., water) phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation Sw(const Params &params,
const FluidState &fluidState)
static Evaluation Sw(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: Sw()");
}
@@ -290,8 +290,8 @@ public:
* \brief The relative permeability of the gas phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation krg(const Params &params,
const FluidState &fluidState)
static Evaluation krg(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: krg()");
}
@@ -300,8 +300,8 @@ public:
* \brief The relative permeability of the wetting phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation krw(const Params &params,
const FluidState &fluidState)
static Evaluation krw(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: krw()");
}
@@ -310,8 +310,8 @@ public:
* \brief The relative permeability of the non-wetting (i.e., oil) phase.
*/
template <class FluidState, class Evaluation = typename FluidState::Scalar>
static Evaluation krn(const Params &params,
const FluidState &fluidState)
static Evaluation krn(const Params& /* params */,
const FluidState& /* fluidState */)
{
OPM_THROW(std::logic_error, "Not implemented: krn()");
}

10
opm/material/fluidstates/FluidStateCompositionModules.hpp
View File

@@ -229,7 +229,7 @@ public:
* state.
*/
template <class FluidState>
void assign(const FluidState& fs)
void assign(const FluidState& /* fs */)
{ }
/*!
@@ -264,13 +264,13 @@ public:
/*!
* \brief The mole fraction of a component in a phase []
*/
Scalar moleFraction(int phaseIdx, int compIdx) const
Scalar moleFraction(int /* phaseIdx */, int /* compIdx */) const
{ OPM_THROW(std::logic_error, "Mole fractions are not provided by this fluid state"); }
/*!
* \brief The mass fraction of a component in a phase []
*/
Scalar massFraction(int phaseIdx, int compIdx) const
Scalar massFraction(int /* phaseIdx */, int /* compIdx */) const
{ OPM_THROW(std::logic_error, "Mass fractions are not provided by this fluid state"); }
/*!
@@ -281,7 +281,7 @@ public:
* component's molar masses weighted by the current mole fraction:
* \f[ \bar M_\alpha = \sum_\kappa M^\kappa x_\alpha^\kappa \f]
*/
Scalar averageMolarMass(int phaseIdx) const
Scalar averageMolarMass(int /* phaseIdx */) const
{ OPM_THROW(std::logic_error, "Mean molar masses are not provided by this fluid state"); }
/*!
@@ -293,7 +293,7 @@ public:
*
* http://en.wikipedia.org/wiki/Concentration
*/
Scalar molarity(int phaseIdx, int compIdx) const
Scalar molarity(int /* phaseIdx */, int /* compIdx */) const
{ OPM_THROW(std::logic_error, "Molarities are not provided by this fluid state"); }
/*!

8
opm/material/fluidstates/FluidStateDensityModules.hpp
View File

@@ -123,19 +123,19 @@ public:
/*!
* \brief The density of a fluid phase [kg/m^3]
*/
const Scalar& density(int phaseIdx) const
const Scalar& density(int /* phaseIdx */) const
{ OPM_THROW(std::logic_error, "Density is not provided by this fluid state"); }
/*!
* \brief The molar density of a fluid phase [mol/m^3]
*/
Scalar molarDensity(int phaseIdx) const
Scalar molarDensity(int /* phaseIdx */) const
{ OPM_THROW(std::logic_error, "Molar density is not provided by this fluid state"); }
/*!
* \brief The molar volume of a fluid phase [m^3/mol]
*/
Scalar molarVolume(int phaseIdx) const
Scalar molarVolume(int /* phaseIdx */) const
{ OPM_THROW(std::logic_error, "Molar volume is not provided by this fluid state"); }
/*!
@@ -143,7 +143,7 @@ public:
* state.
*/
template <class FluidState>
void assign(const FluidState& fs)
void assign(const FluidState& /* fs */)
{ }
/*!

6
opm/material/fluidstates/FluidStateEnthalpyModules.hpp
View File

@@ -117,7 +117,7 @@ public:
/*!
* \brief The specific internal energy of a fluid phase [J/kg]
*/
const Scalar& internalEnergy(int phaseIdx) const
const Scalar& internalEnergy(int /* phaseIdx */) const
{
static Scalar tmp = 0;
Valgrind::SetUndefined(tmp);
@@ -127,7 +127,7 @@ public:
/*!
* \brief The specific enthalpy of a fluid phase [J/kg]
*/
const Scalar& enthalpy(int phaseIdx) const
const Scalar& enthalpy(int /* phaseIdx */) const
{
static Scalar tmp = 0;
Valgrind::SetUndefined(tmp);
@@ -139,7 +139,7 @@ public:
* state.
*/
template <class FluidState>
void assign(const FluidState& fs)
void assign(const FluidState& /* fs */)
{ }
/*!

4
opm/material/fluidstates/FluidStateFugacityModules.hpp
View File

@@ -185,13 +185,13 @@ public:
/*!
* \brief The fugacity coefficient of a component in a phase []
*/
const Scalar& fugacityCoefficient(int phaseIdx, int compIdx) const
const Scalar& fugacityCoefficient(int /* phaseIdx */, int /* compIdx */) const
{ OPM_THROW(std::logic_error, "Fugacity coefficients are not provided by this fluid state"); }
/*!
* \brief The fugacity of a component in a phase [Pa]
*/
const Scalar& fugacity(int phaseIdx, int compIdx) const
const Scalar& fugacity(int /* phaseIdx */, int /* compIdx */) const
{ OPM_THROW(std::logic_error, "Fugacities coefficients are not provided by this fluid state"); }
/*!

4
opm/material/fluidstates/FluidStatePressureModules.hpp
View File

@@ -106,7 +106,7 @@ public:
/*!
* \brief The pressure of a fluid phase [Pa]
*/
const Scalar& pressure(int phaseIdx) const
const Scalar& pressure(int /* phaseIdx */) const
{ OPM_THROW(std::logic_error, "Pressure is not provided by this fluid state"); }
@@ -115,7 +115,7 @@ public:
* state.
*/
template <class FluidState>
void assign(const FluidState& fs)
void assign(const FluidState& /* fs */)
{ }
/*!

4
opm/material/fluidstates/FluidStateSaturationModules.hpp
View File

@@ -106,7 +106,7 @@ public:
/*!
* \brief The saturation of a fluid phase [-]
*/
const Scalar& saturation(int phaseIdx) const
const Scalar& saturation(int /* phaseIdx */) const
{ OPM_THROW(std::runtime_error, "Saturation is not provided by this fluid state"); }
/*!
@@ -114,7 +114,7 @@ public:
* state.
*/
template <class FluidState>
void assign(const FluidState& fs)
void assign(const FluidState& /* fs */)
{ }
/*!

6
opm/material/fluidstates/FluidStateTemperatureModules.hpp
View File

@@ -108,7 +108,7 @@ public:
/*!
* \brief The temperature of a fluid phase [-]
*/
Scalar temperature(int phaseIdx) const
Scalar temperature(int /* phaseIdx */) const
{ return temperature_; }
/*!
@@ -168,7 +168,7 @@ public:
/*!
* \brief The temperature of a fluid phase [-]
*/
Scalar temperature(int phaseIdx) const
Scalar temperature(int /* phaseIdx */) const
{ OPM_THROW(std::runtime_error, "Temperature is not provided by this fluid state"); }
/*!
@@ -176,7 +176,7 @@ public:
* state.
*/
template <class FluidState>
void assign(const FluidState& fs)
void assign(const FluidState& /* fs */)
{ }
/*!

4
opm/material/fluidstates/FluidStateViscosityModules.hpp
View File

@@ -108,7 +108,7 @@ public:
/*!
* \brief The viscosity of a fluid phase [-]
*/
Scalar viscosity(int phaseIdx) const
Scalar viscosity(int /* phaseIdx */) const
{ OPM_THROW(std::logic_error, "Viscosity is not provided by this fluid state"); }
/*!
@@ -116,7 +116,7 @@ public:
* state.
*/
template <class FluidState>
void assign(const FluidState& fs)
void assign(const FluidState& /* fs */)
{ }
/*!