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

Merge branch 'no-spline-default' into initialisation.

Browse Source 
Necessary since test case behaviour depends on changes in
BlackoilPropertiesFromDeck class.
This commit is contained in:
Atgeirr Flø Rasmussen 2014-02-21 11:01:44 +01:00
commit 2fefe256a4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,11 +31,11 @@ namespace Opm
if (init_rock){ if (init_rock){
rock_.init(deck, grid); rock_.init(deck, grid);
} }
pvt_.init(deck, 200); pvt_.init(deck, 0);
SaturationPropsFromDeck<SatFuncSimpleUniform>* ptr SaturationPropsFromDeck<SatFuncSimpleNonuniform>* ptr
= new SaturationPropsFromDeck<SatFuncSimpleUniform>(); = new SaturationPropsFromDeck<SatFuncSimpleNonuniform>();
satprops_.reset(ptr); satprops_.reset(ptr);
ptr->init(deck, grid, 200); ptr->init(deck, grid, 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 ("
@ -52,11 +52,11 @@ namespace Opm
rock_.init(deck, grid); rock_.init(deck, grid);
} }
const int pvt_samples = param.getDefault("pvt_tab_size", 200); const int pvt_samples = param.getDefault("pvt_tab_size", 0);
pvt_.init(deck, pvt_samples); pvt_.init(deck, 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 (deck.hasField("ENDSCALE") && threephase_model != "simple") { if (deck.hasField("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.");