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

Correcting the determination of stagnate.

Browse Source
This commit is contained in:
Kai Bao 2014-05-22 20:25:58 +02:00
parent f597e2117d
commit 95cd33185b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@ -1703,6 +1703,7 @@ namespace {
{
// The detection of oscillation in two primary variable results in the report of the detection
// of oscillation for the solver
// Only the saturations are used in detection for the black oil model.
// Stagnate is not used for any treatment here.
oscillate = false;
@ -1714,8 +1715,6 @@ namespace {
int oscillatePhase = 0;
stagnate = true;
// bool oscillateWater = false;
// bool oscillateOil = false;
// bool oscillateGas = false;
@ -1741,15 +1740,19 @@ namespace {
double relChange3 = std::fabs((residual_history[it - 1][phaseIdx] - residual_history[it - 2][phaseIdx]) /
residual_history[it - 2][phaseIdx]);
stagnate = stagnate && (relChange3 > 1.e-3);
stagnate = stagnate || (relChange3 > 1.e-3);
std::cout << " relChange1 " << relChange1 << " relChange2 " << relChange2
<< " relChange3 " << relChange3 << std::endl;
}
}
stagnate = !stagnate;
oscillate = (oscillatePhase > 1);
std::cout << " oscillate " << oscillate << " stagnate " << stagnate << std::endl;
std::cin.ignore();
}