OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use tolerance consistantly.

Browse Source
This commit is contained in:
Xavier Raynaud
2012-03-05 12:58:09 +01:00
parent f783f9eebe
commit a91b2d991d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
opm/polymer/TransportModelPolymer.cpp
View File

@@ -601,15 +601,14 @@ namespace Opm
const int max_iters_split = 20; const int max_iters_split = 20;
int iters_used_split = 0; int iters_used_split = 0;
// Check if current state is an acceptable solution.
Residual residual(*this, cell); Residual residual(*this, cell);
double x[2] = {saturation_[cell], concentration_[cell]}; double x[2] = {saturation_[cell], concentration_[cell]};
double res[2]; double res[2];
double mc; double mc;
double ff; double ff;
residual.computeResidual(x, res, mc, ff); residual.computeResidual(x, res, mc, ff);
if (norm(res) <= tol) {
if (norm(res) < tol) {
cmax_[cell] = std::max(cmax_[cell], concentration_[cell]); cmax_[cell] = std::max(cmax_[cell], concentration_[cell]);
fractionalflow_[cell] = ff; fractionalflow_[cell] = ff;
mc_[cell] = mc; mc_[cell] = mc;
@@ -733,7 +732,7 @@ namespace Opm
} }
} }
if ((iters_used_split >= max_iters_split) && (norm(res) >= tol)) { if ((iters_used_split >= max_iters_split) && (norm(res) > tol)) {
solveSingleCellBracketing(cell); solveSingleCellBracketing(cell);
std::cout << "splitting did not work" << std::endl; std::cout << "splitting did not work" << std::endl;
std::cout << "cell number" << cell << std::endl; std::cout << "cell number" << cell << std::endl;