From fd36a122c616d05252219bb683d4aaa6971e441b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Sun, 23 Apr 2017 20:43:12 +0200
Subject: [PATCH] Modifications to catch up with master branch.

---
 opm/autodiff/BlackoilSequentialModel.hpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/opm/autodiff/BlackoilSequentialModel.hpp b/opm/autodiff/BlackoilSequentialModel.hpp
index 0c4820c05..01717f379 100644
--- a/opm/autodiff/BlackoilSequentialModel.hpp
+++ b/opm/autodiff/BlackoilSequentialModel.hpp
@@ -53,8 +53,11 @@ namespace Opm {
         typedef BlackoilSequentialModelParameters ModelParameters;
         typedef DefaultBlackoilSolutionState SolutionState;
 
-        typedef BlackoilPressureModel<Grid, WellModel> PressureModel;
-        typedef BlackoilTransportModel<Grid, WellModel> TransportModel;
+        typedef PressureModelT<Grid, WellModel> PressureModel;
+        typedef TransportModelT<Grid, WellModel> TransportModel;
+        typedef NonlinearSolver<PressureModel> PressureSolver;
+        typedef NonlinearSolver<TransportModel> TransportSolver;
+
         typedef typename TransportModel::SimulatorData SimulatorData;
         typedef typename TransportModel::FIPDataType   FIPDataType;
 
@@ -297,11 +300,6 @@ namespace Opm {
         { return failureReport_; }
 
     protected:
-        typedef PressureModelT<Grid, WellModel> PressureModel;
-        typedef TransportModelT<Grid, WellModel> TransportModel;
-        typedef NonlinearSolver<PressureModel> PressureSolver;
-        typedef NonlinearSolver<TransportModel> TransportSolver;
-
         SimulatorReport failureReport_;
 
         std::unique_ptr<PressureModel> pressure_model_;