From e5b20cb61429e224404843781f0498652bc4751a Mon Sep 17 00:00:00 2001
From: Joakim Hove <joakim.hove@gmail.com>
Date: Fri, 19 Feb 2016 12:46:36 +0100
Subject: [PATCH] Added free function initSaturation().

The state argument is of type SimulatorState& - and no longer a template
parameter.
---
 tutorials/tutorial3.cpp | 14 ++------------
 tutorials/tutorial4.cpp | 14 ++------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/tutorials/tutorial3.cpp b/tutorials/tutorial3.cpp
index 7f39159f1..af22264a1 100644
--- a/tutorials/tutorial3.cpp
+++ b/tutorials/tutorial3.cpp
@@ -37,6 +37,7 @@
 
 #include <opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp>
 
+#include <opm/core/simulator/initState.hpp>
 #include <opm/core/simulator/TwophaseState.hpp>
 #include <opm/core/simulator/WellState.hpp>
 
@@ -267,18 +268,7 @@ try
     /// \internal [two-phase state]
     TwophaseState state;
     state.init(grid.number_of_cells , grid.number_of_faces, 2);
-    {
-        std::vector<double> min_sat(allcells.size());
-        std::vector<double> max_sat(allcells.size());
-        std::vector<double> second_sat(allcells.size());
-
-        props.satRange(allcells.size() ,allcells.data() , min_sat.data() , max_sat.data());
-
-        std::transform( min_sat.begin() , min_sat.end() , second_sat.begin() , [](double s) { return 1 - s; });
-        state.setCellDataComponent( "SATURATION" , 0 , allcells , min_sat );
-        state.setCellDataComponent( "SATURATION" , 1 , allcells , second_sat );
-
-    }
+    initSaturation( allcells , props , state , MinSat );
 
     /// \internal [two-phase state]
     /// \endinternal
diff --git a/tutorials/tutorial4.cpp b/tutorials/tutorial4.cpp
index 1d8efd9fa..c46f49089 100644
--- a/tutorials/tutorial4.cpp
+++ b/tutorials/tutorial4.cpp
@@ -37,6 +37,7 @@
 
 #include <opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp>
 
+#include <opm/core/simulator/initState.hpp>
 #include <opm/core/simulator/TwophaseState.hpp>
 #include <opm/core/simulator/WellState.hpp>
 
@@ -214,18 +215,7 @@ try
     /// \internal[two-phase state]
     TwophaseState state;
     state.init(grid.number_of_cells , grid.number_of_faces, 2);
-    {
-        std::vector<double> min_sat(allcells.size());
-        std::vector<double> max_sat(allcells.size());
-        std::vector<double> second_sat(allcells.size());
-
-        props.satRange(allcells.size() ,allcells.data() , min_sat.data() , max_sat.data());
-
-        std::transform( min_sat.begin() , min_sat.end() , second_sat.begin() , [](double s) { return 1 - s; });
-        state.setCellDataComponent( "SATURATION" , 0 , allcells , min_sat );
-        state.setCellDataComponent( "SATURATION" , 1 , allcells , second_sat );
-
-    }
+    initSaturation( allcells , props , state , MinSat );
 
 
     /// \internal[two-phase state]