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

Merge pull request #657 from pgdr/eclipsegrid-is-input

Browse Source 
Using getInputGrid API from Parser
This commit is contained in:
Joakim Hove
2016-04-20 15:50:33 +02:00
parent 77ddff0cf7 07fec302f4
commit 1f64f79f6d
14 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/FlowMain.hpp
View File

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

4
opm/autodiff/GeoProps.hpp
View File

@@ -107,7 +107,7 @@ namespace Opm
}
// Get grid from parser.
EclipseGridConstPtr eclgrid = eclState->getEclipseGrid();
EclipseGridConstPtr eclgrid = eclState->getInputGrid();
// Pore volume.
// New keywords MINPVF will add some PV due to OPM cpgrid process algorithm.
@@ -277,7 +277,7 @@ namespace Opm
int numCells = Opm::AutoDiffGrid::numCells(grid);
const int* global_cell = Opm::UgGridHelpers::globalCell(grid);
const int* cartdims = Opm::UgGridHelpers::cartDims(grid);
EclipseGridConstPtr eclgrid = eclState->getEclipseGrid();
EclipseGridConstPtr eclgrid = eclState->getInputGrid();
const auto& porv = eclState->get3DProperties().getDoubleGridProperty("PORV").getData();
for (int cellIdx = 0; cellIdx < numCells; ++cellIdx) {
const int nx = cartdims[0];

10
opm/autodiff/GridInit.hpp
View File

@@ -40,7 +40,7 @@ namespace Opm
{
public:
/// Initialize from a deck and/or an eclipse state and (logical cartesian) specified pore volumes.
GridInit(DeckConstPtr, EclipseStateConstPtr, const std::vector<double>&)
GridInit(EclipseStateConstPtr, const std::vector<double>&)
{
OPM_THROW(std::logic_error, "Found no specialization for GridInit for the requested Grid class.");
}
@@ -53,8 +53,8 @@ namespace Opm
{
public:
/// Initialize from a deck and/or an eclipse state and (logical cartesian) specified pore volumes.
GridInit(DeckConstPtr, EclipseStateConstPtr eclipse_state, const std::vector<double>& porv)
: grid_manager_(eclipse_state->getEclipseGrid(), porv)
GridInit(EclipseStateConstPtr eclipse_state, const std::vector<double>& porv)
: grid_manager_(eclipse_state->getInputGrid(), porv)
{
}
/// Access the created grid.
@@ -74,9 +74,9 @@ namespace Opm
{
public:
/// Initialize from a deck and/or an eclipse state and (logical cartesian) specified pore volumes.
GridInit(DeckConstPtr deck, EclipseStateConstPtr, const std::vector<double>& porv)
GridInit(EclipseStateConstPtr eclipse_state, const std::vector<double>& porv)
{
grid_.processEclipseFormat(deck, false, false, false, porv);
grid_.processEclipseFormat(eclipse_state->getInputGrid(), false, false, false, porv);
}
/// Access the created grid. Note that mutable access may be required for load balancing.
Dune::CpGrid& grid()