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

Changing detectNewtonOscillations() a little bit.

Browse Source 
Changing detectNewtonOscillations() a little bit for ease in reading.
This commit is contained in:
Kai Bao
2014-05-23 14:50:49 +02:00
parent 508a0c11ef
commit c96637ab96
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@@ -288,10 +288,8 @@ namespace {
bool converged = false; bool converged = false;
double omega = 1.; double omega = 1.;
const double r0 = residualNorm(); const double r0 = residualNorm();
{
const std::vector<double> rLpInfinity = residuals(); residual_history.push_back(residuals());
residual_history.push_back(rLpInfinity);
}
converged = getConvergence(dt); converged = getConvergence(dt);
@@ -313,6 +311,7 @@ namespace {
V dx = solveJacobianSystem(); V dx = solveJacobianSystem();
detectNewtonOscillations(residual_history, it, relaxRelTol(), isOscillate, isStagnate); detectNewtonOscillations(residual_history, it, relaxRelTol(), isOscillate, isStagnate);
std::cout << " oscillate " << isOscillate << " stagnate " << isStagnate << std::endl;
if (isOscillate) { if (isOscillate) {
omega -= relaxIncrement(); omega -= relaxIncrement();
@@ -320,8 +319,8 @@ namespace {
std::cout << " Oscillating behavior detected: Relaxation set to " << omega << std::endl; std::cout << " Oscillating behavior detected: Relaxation set to " << omega << std::endl;
} }
// The dxOld is updated with dx in stablizeNewton. // The dxOld is updated with dx in stablizeNewton().
// If omega is equal to 1., no relaxtion will be appiled. // If omega is equal to 1., no relaxtion will be appiled in stablizeNewton().
stablizeNewton(dx, dxOld, omega, relaxtype); stablizeNewton(dx, dxOld, omega, relaxtype);
updateState(dx, x, xw); updateState(dx, x, xw);
@@ -329,10 +328,8 @@ namespace {
assemble(pvdt, x, xw); assemble(pvdt, x, xw);
const double r = residualNorm(); const double r = residualNorm();
{
const std::vector<double> rLpInfinity = residuals(); residual_history.push_back(residuals());
residual_history.push_back(rLpInfinity);
}
converged = getConvergence(dt); converged = getConvergence(dt);
@@ -1707,13 +1704,13 @@ namespace {
// Only the saturations are used for oscillation detection for the black oil model. // Only the saturations are used for oscillation detection for the black oil model.
// Stagnate is not used for any treatment here. // Stagnate is not used for any treatment here.
oscillate = false;
stagnate = false;
if ( it < 2 ) { if ( it < 2 ) {
oscillate = false;
stagnate = false;
return; return;
} }
stagnate = true;
int oscillatePhase = 0; int oscillatePhase = 0;
for (int phaseIdx= 0; phaseIdx < fluid_.numPhases(); ++ phaseIdx){ for (int phaseIdx= 0; phaseIdx < fluid_.numPhases(); ++ phaseIdx){
@@ -1726,11 +1723,12 @@ namespace {
double relChange3 = std::fabs((residual_history[it - 1][phaseIdx] - residual_history[it - 2][phaseIdx]) / double relChange3 = std::fabs((residual_history[it - 1][phaseIdx] - residual_history[it - 2][phaseIdx]) /
residual_history[it - 2][phaseIdx]); residual_history[it - 2][phaseIdx]);
stagnate = stagnate || (relChange3 > 1.e-3); if (relChange3 > 1.e-3) {
stagnate = false;
}
} }
} }
stagnate = !stagnate;
oscillate = (oscillatePhase > 1); oscillate = (oscillatePhase > 1);
} }
@@ -1738,7 +1736,11 @@ namespace {
template<class T> template<class T>
void void
FullyImplicitBlackoilSolver<T>::stablizeNewton(V& dx, V& dxOld, const double omega, FullyImplicitBlackoilSolver<T>::stablizeNewton(V& dx, V& dxOld, const double omega,
const RelaxType relax_type) const { const RelaxType relax_type) const
{
// The dxOld is updated with dx.
// If omega is equal to 1., no relaxtion will be appiled.
const V tempDxOld = dxOld; const V tempDxOld = dxOld;
dxOld = dx; dxOld = dx;