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

Follow minor API changes in opm-autodiff.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2015-05-21 09:50:54 +02:00
parent b7ef3b7f57
commit d7de9894e0
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp
View File

@@ -249,11 +249,11 @@ namespace Opm
typedef T Grid;
typedef BlackoilPolymerModel<Grid> Model;
typedef typename Model::ModelParameter ModelParam;
ModelParam modelParam( param_ );
typedef typename Model::ModelParameters ModelParams;
ModelParams modelParams( param_ );
typedef NewtonSolver<Model> Solver;
typedef typename Solver::SolverParameter SolverParam;
SolverParam solverParam( param_ );
typedef typename Solver::SolverParameters SolverParams;
SolverParams solverParams( param_ );
//adaptive time stepping
// std::unique_ptr< AdaptiveTimeStepping > adaptiveTimeStepping;
@@ -330,11 +330,11 @@ namespace Opm
// Run a multiple steps of the solver depending on the time step control.
solver_timer.start();
Model model(modelParam, grid_, props_, geo_, rock_comp_props_, polymer_props_, wells, solver_, has_disgas_, has_vapoil_, has_polymer_, terminal_output_);
Model model(modelParams, grid_, props_, geo_, rock_comp_props_, polymer_props_, wells, solver_, has_disgas_, has_vapoil_, has_polymer_, terminal_output_);
if (!threshold_pressures_by_face_.empty()) {
model.setThresholdPressures(threshold_pressures_by_face_);
}
Solver solver(solverParam, model);
Solver solver(solverParams, model);
// If sub stepping is enabled allow the solver to sub cycle
// in case the report steps are to large for the solver to converge