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 branch 'Adding_PLYSHLOG_RELATED' into Adding_SHRATE_RELATED

Browse Source 
Conflicts:
	opm/polymer/PolymerProperties.hpp
This commit is contained in:
Kai Bao
2015-06-23 10:27:25 +02:00
parent eef30576fa 5cdc677672
commit d2602cc73f
10 changed files with 321 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,12 +66,9 @@ namespace Opm
-> std::unique_ptr<Solver>
{
typedef typename Traits::Model Model;
typedef typename Model::ModelParameters ModelParams;
ModelParams modelParams( BaseType::param_ );
typedef NewtonSolver<Model> Solver;
auto model = std::unique_ptr<Model>(new Model(modelParams,
auto model = std::unique_ptr<Model>(new Model(BaseType::model_param_,
BaseType::grid_,
BaseType::props_,
BaseType::geo_,
@@ -93,9 +90,7 @@ namespace Opm
model->setThresholdPressures(BaseType::threshold_pressures_by_face_);
}
typedef typename Solver::SolverParameters SolverParams;
SolverParams solverParams( BaseType::param_ );
return std::unique_ptr<Solver>(new Solver(solverParams, std::move(model)));
return std::unique_ptr<Solver>(new Solver(BaseType::solver_param_, std::move(model)));
}