From d0ca878c2a72717c0b1cf4b0fe0e18cfe61ebb9b Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Thu, 13 Mar 2014 12:00:01 +0100 Subject: [PATCH] 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 8aaab2711..9bba77478 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* ptr - = new SaturationPropsFromDeck(); + = new SaturationPropsFromDeck(); 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("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.");