rock density is obtained from PLYROCK in PolymerProperties::getFromDeck.

This commit is contained in:
Xavier Raynaud 2012-02-29 14:58:51 +01:00
parent 125933468e
commit a33e3d9db0
2 changed files with 13 additions and 6 deletions

View File

@ -271,11 +271,19 @@ main(int argc, char** argv)
Opm::EclipseGridParser deck(deck_filename);
polydata.readFromDeck(deck);
// Grid init
grid.reset(new Opm::GridManager(deck));
// grid.reset(new Opm::GridManager(deck));
const int nx = param.getDefault("nx", 100);
const int ny = param.getDefault("ny", 100);
const int nz = param.getDefault("nz", 1);
const double dx = param.getDefault("dx", 1.0);
const double dy = param.getDefault("dy", 1.0);
const double dz = param.getDefault("dz", 1.0);
grid.reset(new Opm::GridManager(nx, ny, nz, dx, dy, dz));
// Rock and fluid init
const int* gc = grid->c_grid()->global_cell;
std::vector<int> global_cell(gc, gc + grid->c_grid()->number_of_cells);
props.reset(new Opm::IncompPropertiesFromDeck(deck, global_cell));
// const int* gc = grid->c_grid()->global_cell;
// std::vector<int> global_cell(gc, gc + grid->c_grid()->number_of_cells);
// props.reset(new Opm::IncompPropertiesFromDeck(deck, global_cell));
props.reset(new AdHocProps(param, grid->c_grid()->dimensions, grid->c_grid()->number_of_cells));
} else {
// Grid init.
const int nx = param.getDefault("nx", 100);

View File

@ -72,11 +72,10 @@ namespace Opm
const std::vector<double>& tlmixpar = gridparser.getTLMIXPAR().tlmixpar_;
mix_param_ = tlmixpar[0];
rock_density_ = gridparser.getFloatingPointValue("ROCKDEN")[0];
// We assume NTSFUN=1
const std::vector<double>& plyrock = gridparser.getPLYROCK().plyrock_;
dead_pore_vol_ = plyrock[0];
rock_density_ = plyrock[3];
// We assume NTPVT=1
const PLYVISC& plyvisc = gridparser.getPLYVISC();