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

really use the new parser

Browse Source 
in the previous commit this was #if 0'ed...
This commit is contained in:
Andreas Lauser
2013-12-21 19:17:03 +01:00
parent 7f485626a2
commit 2deeeef4e4
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
examples/sim_fibo_ad.cpp
View File

@@ -113,16 +113,9 @@ try
Opm::EclipseWriter outputWriter(param, share_obj(*deck), share_obj(*grid->c_grid())); Opm::EclipseWriter outputWriter(param, share_obj(*deck), share_obj(*grid->c_grid()));
// Rock and fluid init // Rock and fluid init
#if 0
std::cout << "new parser\n";
props.reset(new BlackoilPropertiesFromDeck(newParserDeck, *grid->c_grid(), param));
new_props.reset(new BlackoilPropsAdFromDeck(newParserDeck, *grid->c_grid()));
#else
std::cout << "old parser\n";
props.reset(new BlackoilPropertiesFromDeck(*deck, *grid->c_grid(), param)); props.reset(new BlackoilPropertiesFromDeck(*deck, *grid->c_grid(), param));
new_props.reset(new BlackoilPropsAdFromDeck(*deck, *grid->c_grid())); new_props.reset(new BlackoilPropsAdFromDeck(newParserDeck, *grid->c_grid()));
#endif
// check_well_controls = param.getDefault("check_well_controls", false); // check_well_controls = param.getDefault("check_well_controls", false);
// max_well_control_iterations = param.getDefault("max_well_control_iterations", 10); // max_well_control_iterations = param.getDefault("max_well_control_iterations", 10);
// Rock compressibility. // Rock compressibility.

3
opm/autodiff/BlackoilPropsAdFromDeck.cpp
View File

@@ -140,6 +140,7 @@ namespace Opm
if (init_rock){ if (init_rock){
rock_.init(newParserDeck, grid); rock_.init(newParserDeck, grid);
} }
const int region_number = 0; const int region_number = 0;
phase_usage_ = phaseUsageFromDeck(newParserDeck); phase_usage_ = phaseUsageFromDeck(newParserDeck);
@@ -179,6 +180,7 @@ namespace Opm
props_[phase_usage_.phase_pos[Aqua]].reset(new SinglePvtConstCompr(0.5*Opm::prefix::centi*Opm::unit::Poise)); props_[phase_usage_.phase_pos[Aqua]].reset(new SinglePvtConstCompr(0.5*Opm::prefix::centi*Opm::unit::Poise));
} }
} }
// Oil PVT // Oil PVT
if (phase_usage_.phase_used[Liquid]) { if (phase_usage_.phase_used[Liquid]) {
if (newParserDeck->hasKeyword("PVDO")) { if (newParserDeck->hasKeyword("PVDO")) {
@@ -213,6 +215,7 @@ namespace Opm
OPM_THROW(std::runtime_error, "Input is missing PVDO or PVTO\n"); OPM_THROW(std::runtime_error, "Input is missing PVDO or PVTO\n");
} }
} }
// Gas PVT // Gas PVT
if (phase_usage_.phase_used[Vapour]) { if (phase_usage_.phase_used[Vapour]) {
if (newParserDeck->hasKeyword("PVDG")) { if (newParserDeck->hasKeyword("PVDG")) {