Merge pull request #641 from atgeirr/fix-warnings

Fix warnings
This commit is contained in:
Bård Skaflestad 2014-08-28 16:11:12 +02:00
commit 749a8a5d10
2 changed files with 4 additions and 4 deletions

View File

@ -243,9 +243,9 @@ namespace Opm
/// \param[in] cell Cell index. /// \param[in] cell Cell index.
/// \param[in] pcow P_oil - P_water. /// \param[in] pcow P_oil - P_water.
/// \param[in/out] swat Water saturation. / Possibly modified Water saturation. /// \param[in/out] swat Water saturation. / Possibly modified Water saturation.
void BlackoilPropertiesBasic::swatInitScaling(const int cell, void BlackoilPropertiesBasic::swatInitScaling(const int /*cell*/,
const double pcow, const double /*pcow*/,
double & swat) double& /*swat*/)
{ {
OPM_THROW(std::runtime_error, "BlackoilPropertiesBasic::swatInitScaling() -- not implemented."); OPM_THROW(std::runtime_error, "BlackoilPropertiesBasic::swatInitScaling() -- not implemented.");
} }

View File

@ -63,7 +63,7 @@ namespace Opm
template <class SatFuncSet> template <class SatFuncSet>
template<class T> template<class T>
void SaturationPropsFromDeck<SatFuncSet>::init(Opm::DeckConstPtr deck, void SaturationPropsFromDeck<SatFuncSet>::init(Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclState, Opm::EclipseStateConstPtr /*eclState*/,
int number_of_cells, int number_of_cells,
const int* global_cell, const int* global_cell,
const T& begin_cell_centroids, const T& begin_cell_centroids,