OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Apply changes from commit a953ba8 to new parser code too.

Browse Source 
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
This commit is contained in:
Markus Blatt 2014-03-13 12:00:01 +01:00
parent d88a5572b8
commit d0ca878c2a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/core/props/BlackoilPropertiesFromDeck.cpp
View File

@ -51,9 +51,9 @@ namespace Opm
} }
pvt_.init(newParserDeck, /*numSamples=*/200); pvt_.init(newParserDeck, /*numSamples=*/200);
SaturationPropsFromDeck<SatFuncSimpleUniform>* ptr SaturationPropsFromDeck<SatFuncSimpleUniform>* ptr
= new SaturationPropsFromDeck<SatFuncSimpleUniform>(); = new SaturationPropsFromDeck<SatFuncSimpleNonuniform>();
satprops_.reset(ptr); satprops_.reset(ptr);
ptr->init(newParserDeck, grid, /*numSamples=*/200); ptr->init(newParserDeck, grid, /*numSamples=*/0);
if (pvt_.numPhases() != satprops_->numPhases()) { if (pvt_.numPhases() != satprops_->numPhases()) {
OPM_THROW(std::runtime_error, "BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck() - Inconsistent number of phases in pvt data (" OPM_THROW(std::runtime_error, "BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck() - Inconsistent number of phases in pvt data ("
@ -134,11 +134,11 @@ namespace Opm
rock_.init(newParserDeck, grid); 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); pvt_.init(newParserDeck, pvt_samples);
// Unfortunate lack of pointer smartness here... // 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"); std::string threephase_model = param.getDefault<std::string>("threephase_model", "simple");
if (newParserDeck->hasKeyword("ENDSCALE") && 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."); OPM_THROW(std::runtime_error, "Sorry, end point scaling currently available for the 'simple' model only.");