Merge pull request #141 from atgeirr/master

Fix warnings
This commit is contained in:
Bård Skaflestad 2014-05-21 20:02:49 +02:00
commit 3678464d51
2 changed files with 4 additions and 4 deletions

View File

@ -104,7 +104,7 @@ try
if (use_deck) {
std::string deck_filename = param.get<std::string>("deck_filename");
Opm::ParserPtr parser(new Opm::Parser());
Opm::DeckConstPtr deck = parser->parseFile( deck_filename );
deck = parser->parseFile( deck_filename );
eclipseState.reset(new EclipseState(deck));
// Grid init

View File

@ -272,9 +272,9 @@ namespace Opm {
/// residual mass balance (tol_cnv).
bool getConvergence(const double dt);
const double dpMaxRel() const { return dp_max_rel_; }
const double dsMax() const { return ds_max_; }
const double drsMaxRel() const { return drs_max_rel_; }
double dpMaxRel() const { return dp_max_rel_; }
double dsMax() const { return ds_max_; }
double drsMaxRel() const { return drs_max_rel_; }
};
} // namespace Opm