From 56e81968e3965ee8a7828b0faea799f664df22a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Mon, 24 Sep 2012 16:43:00 +0200
Subject: [PATCH] Add support for new three-phase relperm option to
 BlackoilPropertiesFromDeck.

New parameter option added: 'threephase_model' can now be 'gwseg'.
---
 opm/core/fluid/BlackoilPropertiesFromDeck.cpp | 23 +++++++++++++------
 opm/core/fluid/SaturationPropsFromDeck.hpp    |  1 +
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/opm/core/fluid/BlackoilPropertiesFromDeck.cpp b/opm/core/fluid/BlackoilPropertiesFromDeck.cpp
index e2457f39b..78e3c5db2 100644
--- a/opm/core/fluid/BlackoilPropertiesFromDeck.cpp
+++ b/opm/core/fluid/BlackoilPropertiesFromDeck.cpp
@@ -28,8 +28,8 @@ namespace Opm
     {
         rock_.init(deck, grid);
         pvt_.init(deck, 200);
-        SaturationPropsFromDeck<SatFuncStone2Uniform>* ptr
-            = new SaturationPropsFromDeck<SatFuncStone2Uniform>();
+        SaturationPropsFromDeck<SatFuncSimpleUniform>* ptr
+            = new SaturationPropsFromDeck<SatFuncSimpleUniform>();
         satprops_.reset(ptr);
         ptr->init(deck, grid, 200);
 
@@ -50,30 +50,39 @@ namespace Opm
         // Unfortunate lack of pointer smartness here...
         const int sat_samples = param.getDefault("sat_tab_size", 200);
         std::string threephase_model = param.getDefault<std::string>("threephase_model", "simple");
-        bool use_stone2 = (threephase_model == "stone2");
         if (sat_samples > 1) {
-            if (use_stone2) {
+            if (threephase_model == "stone2") {
                 SaturationPropsFromDeck<SatFuncStone2Uniform>* ptr
                     = new SaturationPropsFromDeck<SatFuncStone2Uniform>();
                 satprops_.reset(ptr);
                 ptr->init(deck, grid, sat_samples);
-            } else {
+            } else if (threephase_model == "simple") {
                 SaturationPropsFromDeck<SatFuncSimpleUniform>* ptr
                     = new SaturationPropsFromDeck<SatFuncSimpleUniform>();
                 satprops_.reset(ptr);
                 ptr->init(deck, grid, sat_samples);
+            } else if (threephase_model == "gwseg") {
+                SaturationPropsFromDeck<SatFuncGwsegUniform>* ptr
+                    = new SaturationPropsFromDeck<SatFuncGwsegUniform>();
+                satprops_.reset(ptr);
+                ptr->init(deck, grid, sat_samples);
             }
         } else {
-            if (use_stone2) {
+            if (threephase_model == "stone2") {
                 SaturationPropsFromDeck<SatFuncStone2Nonuniform>* ptr
                     = new SaturationPropsFromDeck<SatFuncStone2Nonuniform>();
                 satprops_.reset(ptr);
                 ptr->init(deck, grid, sat_samples);
-            } else {
+            } else if (threephase_model == "simple") {
                 SaturationPropsFromDeck<SatFuncSimpleNonuniform>* ptr
                     = new SaturationPropsFromDeck<SatFuncSimpleNonuniform>();
                 satprops_.reset(ptr);
                 ptr->init(deck, grid, sat_samples);
+            } else if (threephase_model == "gwseg") {
+                SaturationPropsFromDeck<SatFuncGwsegNonuniform>* ptr
+                    = new SaturationPropsFromDeck<SatFuncGwsegNonuniform>();
+                satprops_.reset(ptr);
+                ptr->init(deck, grid, sat_samples);
             }
         }
 
diff --git a/opm/core/fluid/SaturationPropsFromDeck.hpp b/opm/core/fluid/SaturationPropsFromDeck.hpp
index 0a0599ec8..ea2acb342 100644
--- a/opm/core/fluid/SaturationPropsFromDeck.hpp
+++ b/opm/core/fluid/SaturationPropsFromDeck.hpp
@@ -26,6 +26,7 @@
 #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
 #include <opm/core/fluid/SatFuncStone2.hpp>
 #include <opm/core/fluid/SatFuncSimple.hpp>
+#include <opm/core/fluid/SatFuncGwseg.hpp>
 #include <vector>
 
 struct UnstructuredGrid;