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

Adapt to refactored/renamed NonlinearSolver (was NewtonSolver).

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2015-10-02 14:00:54 +02:00
parent 73407f3283
commit e3a5e1682d
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.cpp
View File

@ -189,8 +189,7 @@ namespace {
, residual_ ( { std::vector<ADB>(fluid.numPhases() + 1, ADB::null()), , residual_ ( { std::vector<ADB>(fluid.numPhases() + 1, ADB::null()),
ADB::null(), ADB::null(),
ADB::null(), ADB::null(),
{ 1.1169, 1.0031, 0.0031 } // Reasonable default scaling { 1.1169, 1.0031, 0.0031, 1.0 }} ) // default scaling
} )
{ {
} }
@ -258,7 +257,7 @@ namespace {
return it; return it;
} }
int FullyImplicitCompressiblePolymerSolver::newtonIterations() const int FullyImplicitCompressiblePolymerSolver::nonlinearIterations() const
{ {
return newtonIterations_; return newtonIterations_;
} }

2
opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp
View File

@ -86,7 +86,7 @@ namespace Opm {
PolymerBlackoilState& state , PolymerBlackoilState& state ,
WellStateFullyImplicitBlackoilPolymer& wstate); WellStateFullyImplicitBlackoilPolymer& wstate);
int newtonIterations() const; int nonlinearIterations() const;
int linearIterations() const; int linearIterations() const;
/// Not used by this class except to satisfy interface requirements. /// Not used by this class except to satisfy interface requirements.

4
opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp
View File

@ -34,7 +34,7 @@
#include <opm/autodiff/GeoProps.hpp> #include <opm/autodiff/GeoProps.hpp>
#include <opm/autodiff/BlackoilPropsAdInterface.hpp> #include <opm/autodiff/BlackoilPropsAdInterface.hpp>
#include <opm/autodiff/RateConverter.hpp> #include <opm/autodiff/RateConverter.hpp>
#include <opm/autodiff/NewtonSolver.hpp> #include <opm/autodiff/NonlinearSolver.hpp>
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/wells.h> #include <opm/core/wells.h>
@ -89,7 +89,7 @@ namespace Opm
typedef BlackoilOutputWriter OutputWriter; typedef BlackoilOutputWriter OutputWriter;
typedef GridT Grid; typedef GridT Grid;
typedef BlackoilPolymerModel<Grid> Model; typedef BlackoilPolymerModel<Grid> Model;
typedef NewtonSolver<Model> Solver; typedef NonlinearSolver<Model> Solver;
}; };
/// Class collecting all necessary components for a blackoil simulation with polymer /// Class collecting all necessary components for a blackoil simulation with polymer