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

Using API get3DProperties()

Browse Source
This commit is contained in:
Pål Grønås Drange 2016-04-11 15:15:27 +02:00
parent 77fc26475b
commit fd9f67ae55
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/opm_init_check.cpp
View File

@ -209,7 +209,7 @@ public:
void initOPMTrans(TransGraph& opmTrans, DeckConstPtr deck, std::shared_ptr<const EclipseState> eclipseState) { void initOPMTrans(TransGraph& opmTrans, DeckConstPtr deck, std::shared_ptr<const EclipseState> eclipseState) {
std::shared_ptr<GridManager> grid = std::make_shared<GridManager>( eclipseState->getEclipseGrid(), std::shared_ptr<GridManager> grid = std::make_shared<GridManager>( eclipseState->getEclipseGrid(),
eclipseState->getEclipseProperties().getDoubleGridProperty( "PORV" ).getData() ); eclipseState->get3DProperties().getDoubleGridProperty( "PORV" ).getData() );
const struct UnstructuredGrid * cGrid = grid->c_grid(); const struct UnstructuredGrid * cGrid = grid->c_grid();
std::shared_ptr<BlackoilPropsAdInterface> props; std::shared_ptr<BlackoilPropsAdInterface> props;

4
examples/sim_poly_fi2p_comp_ad.cpp
View File

@ -166,8 +166,8 @@ try
// Grid init // Grid init
if (eclipseState->getEclipseProperties().hasDeckDoubleGridProperty("PORV")) { if (eclipseState->get3DProperties().hasDeckDoubleGridProperty("PORV")) {
const auto& porv = eclipseState->getEclipseProperties().getDoubleGridProperty("PORV").getData(); const auto& porv = eclipseState->get3DProperties().getDoubleGridProperty("PORV").getData();
grid.reset(new GridManager(eclipseState->getEclipseGrid(), porv)); grid.reset(new GridManager(eclipseState->getEclipseGrid(), porv));
} else { } else {
grid.reset(new GridManager(eclipseState->getEclipseGrid())); grid.reset(new GridManager(eclipseState->getEclipseGrid()));

2
opm/autodiff/FlowMain.hpp
View File

@ -423,7 +423,7 @@ namespace Opm
{ {
// Create grid. // Create grid.
const std::vector<double>& porv = const std::vector<double>& porv =
eclipse_state_->getEclipseProperties().getDoubleGridProperty("PORV").getData(); eclipse_state_->get3DProperties().getDoubleGridProperty("PORV").getData();
grid_init_.reset(new GridInit<Grid>(deck_, eclipse_state_, porv)); grid_init_.reset(new GridInit<Grid>(deck_, eclipse_state_, porv));
const Grid& grid = grid_init_->grid(); const Grid& grid = grid_init_->grid();

4
opm/autodiff/GeoProps.hpp
View File

@ -95,7 +95,7 @@ namespace Opm
// get the pore volume multipliers from the EclipseState // get the pore volume multipliers from the EclipseState
std::vector<double> multpv(numCartesianCells, 1.0); std::vector<double> multpv(numCartesianCells, 1.0);
const auto& eclProps = eclState->getEclipseProperties(); const auto& eclProps = eclState->get3DProperties();
if (eclProps.hasDeckDoubleGridProperty("MULTPV")) { if (eclProps.hasDeckDoubleGridProperty("MULTPV")) {
multpv = eclProps.getDoubleGridProperty("MULTPV").getData(); multpv = eclProps.getDoubleGridProperty("MULTPV").getData();
} }
@ -278,7 +278,7 @@ namespace Opm
const int* global_cell = Opm::UgGridHelpers::globalCell(grid); const int* global_cell = Opm::UgGridHelpers::globalCell(grid);
const int* cartdims = Opm::UgGridHelpers::cartDims(grid); const int* cartdims = Opm::UgGridHelpers::cartDims(grid);
EclipseGridConstPtr eclgrid = eclState->getEclipseGrid(); EclipseGridConstPtr eclgrid = eclState->getEclipseGrid();
const auto& porv = eclState->getEclipseProperties().getDoubleGridProperty("PORV").getData(); const auto& porv = eclState->get3DProperties().getDoubleGridProperty("PORV").getData();
for (int cellIdx = 0; cellIdx < numCells; ++cellIdx) { for (int cellIdx = 0; cellIdx < numCells; ++cellIdx) {
const int nx = cartdims[0]; const int nx = cartdims[0];
const int ny = cartdims[1]; const int ny = cartdims[1];

4
opm/autodiff/SolventPropsAdFromDeck.cpp
View File

@ -277,7 +277,7 @@ SolventPropsAdFromDeck::SolventPropsAdFromDeck(DeckConstPtr deck,
} }
if (deck->hasKeyword("TLPMIXPA")) { if (deck->hasKeyword("TLPMIXPA")) {
const TableContainer& tlpmixparTables = tables->getTlpmixpaTables(); const TableContainer& tlpmixparTables = tables.getTlpmixpaTables();
if (!tlpmixparTables.empty()) { if (!tlpmixparTables.empty()) {
int numRegions = tlpmixparTables.size(); int numRegions = tlpmixparTables.size();
@ -497,7 +497,7 @@ void SolventPropsAdFromDeck::extractTableIndex(const std::string& keyword,
const int* compressedToCartesianCellIdx, const int* compressedToCartesianCellIdx,
std::vector<int>& tableIdx) const { std::vector<int>& tableIdx) const {
//Get the Region data //Get the Region data
const auto& regionData = eclState->getEclipseProperties().getIntGridProperty(keyword).getData(); const auto& regionData = eclState->get3DProperties().getIntGridProperty(keyword).getData();
// Convert this into an array of compressed cells // Convert this into an array of compressed cells
// Eclipse uses Fortran-style indices which start at 1 // Eclipse uses Fortran-style indices which start at 1
// instead of 0, we subtract 1. // instead of 0, we subtract 1.