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

Moved resizing of BlackoilState members to the data handle.

Browse Source 
Seems much less messy.
This commit is contained in:
Markus Blatt 2016-05-25 12:47:24 +00:00
parent 509cd6f0b1
commit c247652188
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
opm/autodiff/RedistributeDataHandles.hpp
View File

@ -207,7 +207,12 @@ public:
const BlackoilState& sendState, const BlackoilState& sendState,
BlackoilState& recvState) BlackoilState& recvState)
: sendGrid_(sendGrid), recvGrid_(recvGrid), sendState_(sendState), recvState_(recvState) : sendGrid_(sendGrid), recvGrid_(recvGrid), sendState_(sendState), recvState_(recvState)
{} {
// construction does not resize surfacevol and hydroCarbonState. Do it manually.
recvState.surfacevol().resize(grid.numCells()*state.numPhases(),
std::numeric_limits<double>::max());
recvState.hydroCarbonState().resize(grid.numCells());
}
bool fixedsize(int /*dim*/, int /*codim*/) bool fixedsize(int /*dim*/, int /*codim*/)
{ {
@ -448,10 +453,6 @@ void distributeGridAndData( Dune::CpGrid& grid,
distributed_material_law_manager, distributed_material_law_manager,
grid.numCells()); grid.numCells());
BlackoilState distributed_state(grid.numCells(), grid.numFaces(), state.numPhases()); BlackoilState distributed_state(grid.numCells(), grid.numFaces(), state.numPhases());
// construction does not resize surfacevol and hydroCarbonState. Do it manually.
distributed_state.surfacevol().resize(grid.numCells()*state.numPhases(),
std::numeric_limits<double>::max());
distributed_state.hydroCarbonState().resize(grid.numCells());
BlackoilStateDataHandle state_handle(global_grid, grid, BlackoilStateDataHandle state_handle(global_grid, grid,
state, distributed_state); state, distributed_state);
BlackoilPropsDataHandle props_handle(properties, BlackoilPropsDataHandle props_handle(properties,