From 31c09aed093d5bc46dc65c0125ccc4edb4149b10 Mon Sep 17 00:00:00 2001
From: Markus Blatt <markus@dr-blatt.de>
Date: Thu, 13 Mar 2014 12:00:01 +0100
Subject: [PATCH 1/2] Apply changes from commit a953ba8 to new parser code too.

The mentioned commit was applied before the merge of
opm-parser-integrate and therefore the changes did not carry over
to the code that uses the new parser. This code mimics the
changed behaviour for the new parser.

Closes issue #516
---
 opm/core/props/BlackoilPropertiesFromDeck.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/opm/core/props/BlackoilPropertiesFromDeck.cpp b/opm/core/props/BlackoilPropertiesFromDeck.cpp
index 8aaab271..9bba7747 100644
--- a/opm/core/props/BlackoilPropertiesFromDeck.cpp
+++ b/opm/core/props/BlackoilPropertiesFromDeck.cpp
@@ -51,9 +51,9 @@ namespace Opm
         }
         pvt_.init(newParserDeck, /*numSamples=*/200);
         SaturationPropsFromDeck<SatFuncSimpleUniform>* ptr
-            = new SaturationPropsFromDeck<SatFuncSimpleUniform>();
+            = new SaturationPropsFromDeck<SatFuncSimpleNonuniform>();
         satprops_.reset(ptr);
-        ptr->init(newParserDeck, grid, /*numSamples=*/200);
+        ptr->init(newParserDeck, grid, /*numSamples=*/0);
 
         if (pvt_.numPhases() != satprops_->numPhases()) {
             OPM_THROW(std::runtime_error, "BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck() - Inconsistent number of phases in pvt data ("
@@ -134,11 +134,11 @@ namespace Opm
             rock_.init(newParserDeck, grid);
         }
 
-        const int pvt_samples = param.getDefault("pvt_tab_size", 200);
+        const int pvt_samples = param.getDefault("pvt_tab_size", 0);
         pvt_.init(newParserDeck, pvt_samples);
 
         // Unfortunate lack of pointer smartness here...
-        const int sat_samples = param.getDefault("sat_tab_size", 200);
+        const int sat_samples = param.getDefault("sat_tab_size", 0);
         std::string threephase_model = param.getDefault<std::string>("threephase_model", "simple");
         if (newParserDeck->hasKeyword("ENDSCALE") && threephase_model != "simple") {
             OPM_THROW(std::runtime_error, "Sorry, end point scaling currently available for the 'simple' model only.");

From 21bf14de0d6f1a83a46b4553a8764867213693c9 Mon Sep 17 00:00:00 2001
From: Markus Blatt <markus@dr-blatt.de>
Date: Thu, 13 Mar 2014 12:13:11 +0100
Subject: [PATCH 2/2] Fixed missed on occurence of number of samples

---
 opm/core/props/BlackoilPropertiesFromDeck.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opm/core/props/BlackoilPropertiesFromDeck.cpp b/opm/core/props/BlackoilPropertiesFromDeck.cpp
index 9bba7747..62048ba0 100644
--- a/opm/core/props/BlackoilPropertiesFromDeck.cpp
+++ b/opm/core/props/BlackoilPropertiesFromDeck.cpp
@@ -49,7 +49,7 @@ namespace Opm
         if (init_rock){
            rock_.init(newParserDeck, grid);
         }
-        pvt_.init(newParserDeck, /*numSamples=*/200);
+        pvt_.init(newParserDeck, /*numSamples=*/0);
         SaturationPropsFromDeck<SatFuncSimpleUniform>* ptr
             = new SaturationPropsFromDeck<SatFuncSimpleNonuniform>();
         satprops_.reset(ptr);