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

Merge pull request #284 from blattms/rename-residuals

Browse Source 
Renames residuals() to computeResidualNorms()
This commit is contained in:
Atgeirr Flø Rasmussen 2015-01-28 14:46:48 +01:00
commit e3b0a92176
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/autodiff/FullyImplicitBlackoilSolver.hpp
View File

@ -272,7 +272,11 @@ namespace Opm {
double
residualNorm() const;
std::vector<double> residuals() const;
/// \brief Compute the residual norms of the mass balance for each phase,
/// the well flux, and the well equation.
/// \return a vector that contains for each phase the norm of the mass balance
/// and afterwards the norm of the residual of the well flux and the well equation.
std::vector<double> computeResidualNorms() const;
ADB
fluidViscosity(const int phase,

22
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@ -281,7 +281,9 @@ namespace {
computeWellConnectionPressures(state, xw);
}
std::vector<std::vector<double>> residual_history;
// For each iteration we store in a vector the norms of the residual of
// the mass balance for each active phase, the well flux and the well equations
std::vector<std::vector<double>> residual_norms_history;
assemble(pvdt, x, xw);
@ -289,7 +291,7 @@ namespace {
bool converged = false;
double omega = 1.;
residual_history.push_back(residuals());
residual_norms_history.push_back(computeResidualNorms());
int it = 0;
converged = getConvergence(dt,it);
@ -308,7 +310,7 @@ namespace {
// store number of linear iterations used
linearIterations += linsolver_.iterations();
detectNewtonOscillations(residual_history, it, relaxRelTol(), isOscillate, isStagnate);
detectNewtonOscillations(residual_norms_history, it, relaxRelTol(), isOscillate, isStagnate);
if (isOscillate) {
omega -= relaxIncrement();
@ -322,7 +324,7 @@ namespace {
assemble(pvdt, x, xw);
residual_history.push_back(residuals());
residual_norms_history.push_back(computeResidualNorms());
// increase iteration counter
++it;
@ -1783,9 +1785,9 @@ namespace {
template<class T>
std::vector<double>
FullyImplicitBlackoilSolver<T>::residuals() const
FullyImplicitBlackoilSolver<T>::computeResidualNorms() const
{
std::vector<double> residual;
std::vector<double> residualNorms;
std::vector<ADB>::const_iterator massBalanceIt = residual_.material_balance_eq.begin();
const std::vector<ADB>::const_iterator endMassBalanceIt = residual_.material_balance_eq.end();
@ -1796,7 +1798,7 @@ namespace {
OPM_THROW(Opm::NumericalProblem,
"Encountered a non-finite residual");
}
residual.push_back(massBalanceResid);
residualNorms.push_back(massBalanceResid);
}
// the following residuals are not used in the oscillation detection now
@ -1805,16 +1807,16 @@ namespace {
OPM_THROW(Opm::NumericalProblem,
"Encountered a non-finite residual");
}
residual.push_back(wellFluxResid);
residualNorms.push_back(wellFluxResid);
const double wellResid = infinityNorm( residual_.well_eq );
if (!std::isfinite(wellResid)) {
OPM_THROW(Opm::NumericalProblem,
"Encountered a non-finite residual");
}
residual.push_back(wellResid);
residualNorms.push_back(wellResid);
return residual;
return residualNorms;
}
template<class T>