Merge pull request #649 from andlaus/change_threephase_model_default
change the default of the "threephase_model" parameter from "simple" to ...
This commit is contained in:
commit
2b83e3bbe2
@ -85,12 +85,12 @@ namespace Opm
|
||||
rock_.init(eclState, number_of_cells, global_cell, cart_dims);
|
||||
}
|
||||
|
||||
const int pvt_samples = param.getDefault("pvt_tab_size", 200);
|
||||
const int pvt_samples = param.getDefault("pvt_tab_size", -1);
|
||||
pvt_.init(deck, pvt_samples);
|
||||
|
||||
// Unfortunate lack of pointer smartness here...
|
||||
const int sat_samples = param.getDefault("sat_tab_size", 200);
|
||||
std::string threephase_model = param.getDefault<std::string>("threephase_model", "simple");
|
||||
const int sat_samples = param.getDefault("sat_tab_size", -1);
|
||||
std::string threephase_model = param.getDefault<std::string>("threephase_model", "gwseg");
|
||||
if (deck->hasKeyword("ENDSCALE") && threephase_model != "gwseg") {
|
||||
OPM_THROW(std::runtime_error, "Sorry, end point scaling currently available for the 'gwseg' model only.");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user