mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Adapt to refactored/renamed NonlinearSolver (was NewtonSolver).
This commit is contained in:
parent
73407f3283
commit
e3a5e1682d
@ -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_;
|
||||||
}
|
}
|
||||||
|
@ -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.
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user