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

Removing some spaces.

Browse Source
This commit is contained in:
Kai Bao 2014-05-22 21:58:44 +02:00
parent 6ac95ac7a8
commit 8a905535ce
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@ -318,7 +318,7 @@ namespace {
bool isOscillate = false; bool isOscillate = false;
bool isStagnate = false; bool isStagnate = false;
const enum RelaxType relaxtype = relaxType(); const enum RelaxType relaxtype = relaxType();
while ((!converged) && (it < maxit)) { while ((!converged) && (it < maxit)) {
V dx = solveJacobianSystem(); V dx = solveJacobianSystem();
@ -327,7 +327,7 @@ namespace {
if (isOscillate) { if (isOscillate) {
omega -= relaxIncrement(); omega -= relaxIncrement();
omega = std::max(omega, relaxMax()); omega = std::max(omega, relaxMax());
std::cout << " Oscillating behavior detected: Relaxation set to " << omega << std::endl; std::cout << " Oscillating behavior detected: Relaxation set to " << omega << std::endl;
} }
stablizeNewton(dx, dxOld, omega, relaxtype); stablizeNewton(dx, dxOld, omega, relaxtype);
@ -1711,8 +1711,8 @@ namespace {
bool &oscillate, bool &stagnate ) const bool &oscillate, bool &stagnate ) const
{ {
// The detection of oscillation in two primary variable results in the report of the detection // The detection of oscillation in two primary variable results in the report of the detection
// of oscillation for the solver // of oscillation for the solver.
// Only the saturations are used in 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; oscillate = false;
@ -1745,14 +1745,14 @@ 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 {
const V tempDxOld = dxOld; const V tempDxOld = dxOld;
dxOld = dx; dxOld = dx;
switch (relax_type) { switch (relax_type) {
case DAMPEN: case DAMPEN:
if (omega == 1.) { if (omega == 1.) {
return; return;
} }
dx = dx*omega; dx = dx*omega;