Corrected typing pointed out by atgeirr in respose to pullrequest

This commit is contained in:
Halvor Møll Nilsen 2012-08-24 12:52:41 +02:00 committed by Bård Skaflestad
parent 7ee5d5e403
commit 6390cceaa2
2 changed files with 9 additions and 3 deletions

View File

@ -171,7 +171,7 @@ namespace Opm
// if (std::fabs(r0) < tol_) {
// return;
// }
int iters_used=0;
int iters_used = 0;
// saturation_[cell] = modifiedRegulaFalsi(res, smin_[2*cell], smax_[2*cell], maxit_, tol_, iters_used);
saturation_[cell] = RootFinder::solve(res, saturation_[cell], 0.0, 1.0, maxit_, tol_, iters_used);
// add if it is iteration on an out loop
@ -547,7 +547,7 @@ namespace Opm
const int cell = cells[pos];
GravityResidual res(*this, cells, pos, gravflux);
if (std::fabs(res(saturation_[cell])) > tol_) {
int iters_used=0;
int iters_used = 0;
saturation_[cell] = RootFinder::solve(res, smin_[2*cell], smax_[2*cell], maxit_, tol_, iters_used);
reorder_iterations_[cell] = reorder_iterations_[cell] + iters_used;
}
@ -645,6 +645,10 @@ namespace Opm
toBothSat(saturation_, saturation);
}
void TransportModelTwophase::getReorderIterations()
{
return reorder_iterations_;
};
} // namespace Opm

View File

@ -74,7 +74,9 @@ namespace Opm
const double* porevolume,
const double dt,
std::vector<double>& saturation);
void reportIterations(std::ostream &os);
//// Return reorder iterations
////
//// \param[out] vector of iteration per cell
const std::vector<int>& getReorderIterations(){return reorder_iterations_;};
private:
virtual void solveSingleCell(const int cell);