From e6e2c9a330d7feb62cfd19a4a0e82c983f3daa07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Wed, 27 Aug 2014 19:43:53 +0200 Subject: [PATCH 1/2] Squash warnings by removing or commenting out unused parameters. --- opm/core/props/BlackoilPropertiesBasic.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opm/core/props/BlackoilPropertiesBasic.cpp b/opm/core/props/BlackoilPropertiesBasic.cpp index 9634d9aa9..7ca21ca22 100644 --- a/opm/core/props/BlackoilPropertiesBasic.cpp +++ b/opm/core/props/BlackoilPropertiesBasic.cpp @@ -243,9 +243,9 @@ namespace Opm /// \param[in] cell Cell index. /// \param[in] pcow P_oil - P_water. /// \param[in/out] swat Water saturation. / Possibly modified Water saturation. - void BlackoilPropertiesBasic::swatInitScaling(const int cell, - const double pcow, - double & swat) + void BlackoilPropertiesBasic::swatInitScaling(const int /*cell*/, + const double /*pcow*/, + double& /*swat*/) { OPM_THROW(std::runtime_error, "BlackoilPropertiesBasic::swatInitScaling() -- not implemented."); } From 166cd0fe6be9e3549ebf3f431736e54c7c050b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Wed, 27 Aug 2014 19:44:32 +0200 Subject: [PATCH 2/2] Suppress unused argument warning. The eclState argument was added in PR#634, and may be needed later. Until then, this silences the warning generated. --- opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp b/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp index 684ef70ca..f039def24 100644 --- a/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp +++ b/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp @@ -63,7 +63,7 @@ namespace Opm template template void SaturationPropsFromDeck::init(Opm::DeckConstPtr deck, - Opm::EclipseStateConstPtr eclState, + Opm::EclipseStateConstPtr /*eclState*/, int number_of_cells, const int* global_cell, const T& begin_cell_centroids,