From 1a3c1d30587cc3485c3ea78c2e27487c843d551f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Sun, 3 Jul 2016 08:00:59 +0200
Subject: [PATCH] Further templatized sequential model and simulator classes.

Now the actual pressure and transport model classes are not specified,
but taken as template template parameters, also grid and well model
are templates for both the sequential model and the simulator class,
although at this point only StandardWells is expected to work with
the sequential model.
---
 examples/flow_sequential.cpp                 |  6 ++++-
 opm/autodiff/BlackoilSequentialModel.hpp     |  8 ++++---
 opm/autodiff/SimulatorSequentialBlackoil.hpp | 24 ++++++++++++--------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/examples/flow_sequential.cpp b/examples/flow_sequential.cpp
index 0d4a89847..5eef64dad 100644
--- a/examples/flow_sequential.cpp
+++ b/examples/flow_sequential.cpp
@@ -25,6 +25,9 @@
 #include <opm/core/grid.h>
 #include <opm/autodiff/SimulatorSequentialBlackoil.hpp>
 #include <opm/autodiff/FlowMainSequential.hpp>
+#include <opm/autodiff/BlackoilPressureModel.hpp>
+#include <opm/autodiff/BlackoilTransportModel.hpp>
+#include <opm/autodiff/StandardWells.hpp>
 
 
 // ----------------- Main program -----------------
@@ -32,7 +35,8 @@ int
 main(int argc, char** argv)
 {
     typedef UnstructuredGrid Grid;
-    typedef Opm::SimulatorSequentialBlackoil<Grid> Simulator;
+    typedef Opm::StandardWells WellModel;
+    typedef Opm::SimulatorSequentialBlackoil<Grid, WellModel, Opm::BlackoilPressureModel, Opm::BlackoilTransportModel> Simulator;
 
     Opm::FlowMainSequential<Grid, Simulator> mainfunc;
     return mainfunc.execute(argc, argv);
diff --git a/opm/autodiff/BlackoilSequentialModel.hpp b/opm/autodiff/BlackoilSequentialModel.hpp
index a9a479040..0c4820c05 100644
--- a/opm/autodiff/BlackoilSequentialModel.hpp
+++ b/opm/autodiff/BlackoilSequentialModel.hpp
@@ -23,8 +23,6 @@
 
 
 #include <opm/autodiff/BlackoilModelBase.hpp>
-#include <opm/autodiff/BlackoilPressureModel.hpp>
-#include <opm/autodiff/BlackoilTransportModel.hpp>
 #include <opm/core/simulator/BlackoilState.hpp>
 #include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
 #include <opm/autodiff/BlackoilModelParameters.hpp>
@@ -44,7 +42,9 @@ namespace Opm {
 
 
     /// A sequential splitting model implementation for three-phase black oil.
-    template<class Grid, class WellModel>
+    template<class Grid, class WellModel,
+             template <class G, class W> class PressureModelT,
+             template <class G, class W> class TransportModelT>
     class BlackoilSequentialModel
     {
     public:
@@ -297,6 +297,8 @@ namespace Opm {
         { return failureReport_; }
 
     protected:
+        typedef PressureModelT<Grid, WellModel> PressureModel;
+        typedef TransportModelT<Grid, WellModel> TransportModel;
         typedef NonlinearSolver<PressureModel> PressureSolver;
         typedef NonlinearSolver<TransportModel> TransportSolver;
 
diff --git a/opm/autodiff/SimulatorSequentialBlackoil.hpp b/opm/autodiff/SimulatorSequentialBlackoil.hpp
index 249d8b703..aed5c8383 100644
--- a/opm/autodiff/SimulatorSequentialBlackoil.hpp
+++ b/opm/autodiff/SimulatorSequentialBlackoil.hpp
@@ -24,32 +24,36 @@
 #include <opm/autodiff/SimulatorBase.hpp>
 #include <opm/autodiff/NonlinearSolver.hpp>
 #include <opm/autodiff/BlackoilSequentialModel.hpp>
-#include <opm/autodiff/StandardWells.hpp>
 
 namespace Opm {
 
-template <class GridT>
+template <class GridT, class WellModelT,
+          template <class G, class W> class PressureModel,
+          template <class G, class W> class TransportModel>
 class SimulatorSequentialBlackoil;
-class StandardWells;
 
-template <class GridT>
-struct SimulatorTraits<SimulatorSequentialBlackoil<GridT> >
+template <class GridT, class WellModelT,
+          template <class G, class W> class PressureModel,
+          template <class G, class W> class TransportModel>
+struct SimulatorTraits<SimulatorSequentialBlackoil<GridT, WellModelT, PressureModel, TransportModel> >
 {
     typedef WellStateFullyImplicitBlackoil WellState;
     typedef BlackoilState ReservoirState;
     typedef BlackoilOutputWriter OutputWriter;
     typedef GridT Grid;
-    typedef BlackoilSequentialModel<Grid, StandardWells> Model;
+    typedef BlackoilSequentialModel<Grid, StandardWells, PressureModel, TransportModel> Model;
     typedef NonlinearSolver<Model> Solver;
-    typedef StandardWells WellModel;
+    typedef WellModelT WellModel;
 };
 
 /// a simulator for the blackoil model
-template <class GridT>
+template <class GridT, class WellModelT,
+          template <class G, class W> class PressureModel,
+          template <class G, class W> class TransportModel>
 class SimulatorSequentialBlackoil
-    : public SimulatorBase<SimulatorSequentialBlackoil<GridT> >
+    : public SimulatorBase<SimulatorSequentialBlackoil<GridT, WellModelT, PressureModel, TransportModel> >
 {
-    typedef SimulatorBase<SimulatorSequentialBlackoil<GridT> > Base;
+    typedef SimulatorBase<SimulatorSequentialBlackoil<GridT, WellModelT, PressureModel, TransportModel> > Base;
 public:
     // forward the constructor to the base class
     SimulatorSequentialBlackoil(const ParameterGroup& param,