OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #517 from blattms/issue-516

Browse Source 
Apply changes from commit a953ba8 to new parser code too.
This commit is contained in:
Atgeirr Flø Rasmussen 2014-03-19 08:29:16 +01:00
commit a529dd5ae4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,11 +49,11 @@ namespace Opm
if (init_rock){
rock_.init(newParserDeck, grid);
}
pvt_.init(newParserDeck, /*numSamples=*/200);
pvt_.init(newParserDeck, /*numSamples=*/0);
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.");