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 #313 from blattms/redistgridhandle-without-grid

Browse Source 
Remove the unsused grid members from BlackoilPropsDataHandle.
This commit is contained in:
Atgeirr Flø Rasmussen 2015-02-19 10:03:43 +01:00
commit 1e5b691a49
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/sim_fibo_ad_cp.cpp
View File

@ -234,8 +234,7 @@ try
std::numeric_limits<double>::max()); std::numeric_limits<double>::max());
Opm::BlackoilStateDataHandle state_handle(global_grid, distributed_grid, Opm::BlackoilStateDataHandle state_handle(global_grid, distributed_grid,
state, distributed_state); state, distributed_state);
Opm::BlackoilPropsDataHandle props_handle(global_grid, distributed_grid, Opm::BlackoilPropsDataHandle props_handle(*new_props,
*new_props,
*distributed_props); *distributed_props);
grid->scatterData(state_handle); grid->scatterData(state_handle);
grid->scatterData(props_handle); grid->scatterData(props_handle);

14
opm/autodiff/RedistributeDataHandles.hpp
View File

@ -140,21 +140,17 @@ public:
/// \brief The data that we send. /// \brief The data that we send.
typedef double DataType; typedef double DataType;
/// \brief Constructor. /// \brief Constructor.
/// \param sendGrid The grid that the data is attached to when sending.
/// \param recvGrid The grid that the data is attached to when receiving.
/// \param sendProps The properties where we will retieve the values to be sent. /// \param sendProps The properties where we will retieve the values to be sent.
/// \parame recvProps The properties where we will store the received values. /// \parame recvProps The properties where we will store the received values.
BlackoilPropsDataHandle(const Dune::CpGrid& sendGrid, BlackoilPropsDataHandle(const BlackoilPropsAdFromDeck& sendProps,
const Dune::CpGrid& recvGrid,
const BlackoilPropsAdFromDeck& sendProps,
BlackoilPropsAdFromDeck& recvProps) BlackoilPropsAdFromDeck& recvProps)
: sendGrid_(sendGrid), recvGrid_(recvGrid), sendProps_(sendProps), recvProps_(recvProps), : sendProps_(sendProps), recvProps_(recvProps),
size_(2) size_(2)
{ {
// satOilMax might be non empty. In this case we will need to send it, too. // satOilMax might be non empty. In this case we will need to send it, too.
if ( sendProps.satOilMax_.size()>0 ) if ( sendProps.satOilMax_.size()>0 )
{ {
recvProps_.satOilMax_.resize(recvGrid.numCells(), recvProps_.satOilMax_.resize(recvProps_.pvtTableIdx_.size(),
-std::numeric_limits<double>::max()); -std::numeric_limits<double>::max());
++size_; ++size_;
} }
@ -211,10 +207,6 @@ public:
return dim==3 && codim==0; return dim==3 && codim==0;
} }
private: private:
/// \brief The grid that the data is attached to when sending
const Dune::CpGrid& sendGrid_;
/// \brief The grid that the data is attached to when receiving
const Dune::CpGrid& recvGrid_;
/// \brief The properties where we will retieve the values to be sent. /// \brief The properties where we will retieve the values to be sent.
const BlackoilPropsAdFromDeck& sendProps_; const BlackoilPropsAdFromDeck& sendProps_;
// \brief The properties where we will store the received values. // \brief The properties where we will store the received values.