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

make the for statement more readable.

Browse Source
This commit is contained in:
Liu Ming 2014-10-10 17:01:05 +08:00
parent 66bb1fae8f
commit 5b28b38056
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@ -1736,21 +1736,17 @@ namespace {
return;
}
stagnate = true;
int oscillatePhase = 0;
const std::vector<double>& F0 = residual_history[it];
const std::vector<double>& F1 = residual_history[it - 1];
const std::vector<double>& F2 = residual_history[it - 2];
for (int p= 0; p < fluid_.numPhases(); ++p){
const double d1 = std::abs((F0[p] - F2[p]) / F0[p]);
const double d2 = std::abs((F0[p] - F1[p]) / F0[p]);
for (int phaseIdx= 0; phaseIdx < fluid_.numPhases(); ++ phaseIdx){
double relChange1 = std::fabs((residual_history[it][phaseIdx] - residual_history[it - 2][phaseIdx]) /
residual_history[it][phaseIdx]);
double relChange2 = std::fabs((residual_history[it][phaseIdx] - residual_history[it - 1][phaseIdx]) /
residual_history[it][phaseIdx]);
oscillatePhase += (relChange1 < relaxRelTol) && (relChange2 > relaxRelTol);
oscillatePhase += (d1 < relaxRelTol) && (relaxRelTol < d2);
double relChange3 = std::fabs((residual_history[it - 1][phaseIdx] - residual_history[it - 2][phaseIdx]) /
residual_history[it - 2][phaseIdx]);
if (relChange3 > 1.e-3) {
stagnate = false;
}
stagnate = ! (std::abs((F1[p] - F2[p]) / F2[p]) > 1.0e-3);
}
oscillate = (oscillatePhase > 1);