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

Modifications to catch up with master branch.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2017-04-23 20:43:12 +02:00
parent 1a3c1d3058
commit fd36a122c6
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opm/autodiff/BlackoilSequentialModel.hpp
View File

@@ -53,8 +53,11 @@ namespace Opm {
typedef BlackoilSequentialModelParameters ModelParameters; typedef BlackoilSequentialModelParameters ModelParameters;
typedef DefaultBlackoilSolutionState SolutionState; typedef DefaultBlackoilSolutionState SolutionState;
typedef BlackoilPressureModel<Grid, WellModel> PressureModel; typedef PressureModelT<Grid, WellModel> PressureModel;
typedef BlackoilTransportModel<Grid, WellModel> TransportModel; typedef TransportModelT<Grid, WellModel> TransportModel;
typedef NonlinearSolver<PressureModel> PressureSolver;
typedef NonlinearSolver<TransportModel> TransportSolver;
typedef typename TransportModel::SimulatorData SimulatorData; typedef typename TransportModel::SimulatorData SimulatorData;
typedef typename TransportModel::FIPDataType FIPDataType; typedef typename TransportModel::FIPDataType FIPDataType;
@@ -297,11 +300,6 @@ namespace Opm {
{ return failureReport_; } { return failureReport_; }
protected: protected:
typedef PressureModelT<Grid, WellModel> PressureModel;
typedef TransportModelT<Grid, WellModel> TransportModel;
typedef NonlinearSolver<PressureModel> PressureSolver;
typedef NonlinearSolver<TransportModel> TransportSolver;
SimulatorReport failureReport_; SimulatorReport failureReport_;
std::unique_ptr<PressureModel> pressure_model_; std::unique_ptr<PressureModel> pressure_model_;