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

Merge pull request #529 from andlaus/change_default_threephase_model

Browse Source 
endpoint scaling: change default threephase_model to gwseg
This commit is contained in:
Atgeirr Flø Rasmussen 2014-03-19 12:19:28 +01:00
commit 830459d9d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,9 +139,9 @@ namespace Opm
// Unfortunate lack of pointer smartness here...
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.");
std::string threephase_model = param.getDefault<std::string>("threephase_model", "gwseg");
if (newParserDeck->hasKeyword("ENDSCALE") && threephase_model != "gwseg") {
OPM_THROW(std::runtime_error, "Sorry, end point scaling currently available for the 'gwseg' model only.");
}
if (sat_samples > 1) {
if (threephase_model == "stone2") {