OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-15 22:31:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #523 from blattms/use-local-material-manager-by-communication

Browse Source 
Use local material manager by communication
This commit is contained in:
Atgeirr Flø Rasmussen 2015-10-28 21:14:16 +01:00
commit 8fe406b73c
4 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/flow.cpp
View File

@ -364,7 +364,7 @@ try
// and initilialize new properties and states for it.
if( mpi_size > 1 )
{
Opm::distributeGridAndData( grid, eclipseState, state, new_props, geoprops, parallel_information, use_local_perm );
Opm::distributeGridAndData( grid, deck, eclipseState, state, new_props, geoprops, materialLawManager, parallel_information, use_local_perm );
}
// create output writer after grid is distributed, otherwise the parallel output

7
opm/autodiff/BlackoilPropsAdFromDeck.cpp
View File

@ -118,8 +118,9 @@ namespace Opm
/// Constructor for properties on a subgrid
BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck& props,
std::shared_ptr<MaterialLawManager> materialLawManager,
const int number_of_cells)
: rock_(number_of_cells)
: rock_(number_of_cells), satprops_(new SaturationPropsFromDeck())
{
const int original_size = props.cellPvtRegionIdx_.size();
if (number_of_cells > original_size) {
@ -129,10 +130,9 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
OPM_THROW(std::runtime_error, "The number of cells is has to be larger than 0.");
}
materialLawManager_ = props.materialLawManager_;
materialLawManager_ = materialLawManager;
// Copy properties that do not depend on the postion within the grid.
satprops_ = props.satprops_;
phase_usage_ = props.phase_usage_;
props_ = props.props_;
densities_ = props.densities_;
@ -142,6 +142,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
// For data that is dependant on the subgrid we simply allocate space
// and initialize with obviously bogus numbers.
cellPvtRegionIdx_.resize(number_of_cells, std::numeric_limits<int>::min());
satprops_->init(phase_usage_, materialLawManager_);
}
/// Initializes the properties.

5
opm/autodiff/BlackoilPropsAdFromDeck.hpp
View File

@ -138,8 +138,11 @@ namespace Opm
/// the correct size but the values will be undefined.
///
/// \param props The property object to copy from.
/// \paramm number_of_cells The number of cells of the subgrid.
/// \param materialLawManager The container for the material law parameter objects.
/// Initialized only for the subgrid
/// \param number_of_cells The number of cells of the subgrid.
BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck& props,
std::shared_ptr<MaterialLawManager> materialLawManager,
const int number_of_cells);

29
opm/autodiff/RedistributeDataHandles.hpp
View File

@ -34,10 +34,12 @@ namespace Opm
template <class Grid>
inline void distributeGridAndData( Grid& ,
Opm::DeckConstPtr deck ,
EclipseStateConstPtr ,
BlackoilState& ,
BlackoilPropsAdFromDeck& ,
DerivedGeology&,
std::shared_ptr<BlackoilPropsAdFromDeck::MaterialLawManager>&,
boost::any& ,
const bool )
{
@ -327,10 +329,12 @@ private:
inline
void distributeGridAndData( Dune::CpGrid& grid,
Opm::DeckConstPtr deck,
EclipseStateConstPtr eclipseState,
BlackoilState& state,
BlackoilPropsAdFromDeck& properties,
DerivedGeology& geology,
std::shared_ptr<BlackoilPropsAdFromDeck::MaterialLawManager>& material_law_manager,
boost::any& parallelInformation,
const bool useLocalPerm)
{
@ -342,8 +346,29 @@ void distributeGridAndData( Dune::CpGrid& grid,
// distribute the grid and switch to the distributed view
grid.loadBalance(eclipseState);
grid.switchToDistributedView();
std::vector<int> compressedToCartesianIdx;
Opm::createGlobalCellArray(grid, compressedToCartesianIdx);
typedef BlackoilPropsAdFromDeck::MaterialLawManager MaterialLawManager;
auto distributed_material_law_manager = std::make_shared<MaterialLawManager>();
distributed_material_law_manager->initFromDeck(deck, eclipseState, compressedToCartesianIdx);
// copy the values from the global to the local MaterialLawManager
// We should actually communicate these to be future proof. But that is
// really, really cumbersome for the underlying vector<shared_ptr>
// where the classes pointed to even have more shared_ptr stored in them.
typedef Dune::CpGrid::ParallelIndexSet IndexSet;
typedef IndexSet::IndexPair Pair;
const IndexSet& local_indices = grid.getCellIndexSet();
for ( auto index : local_indices )
{
distributed_material_law_manager->materialLawParamsPointer(index.local()) =
material_law_manager->materialLawParamsPointer(index.global());
BlackoilPropsAdFromDeck distributed_props(properties, grid.numCells());
distributed_material_law_manager->oilWaterScaledEpsInfoDrainagePointer(index.local()) =
material_law_manager->oilWaterScaledEpsInfoDrainagePointer(index.global());
}
BlackoilPropsAdFromDeck distributed_props(properties,
distributed_material_law_manager,
grid.numCells());
distributed_state.init(grid.numCells(), grid.numFaces(), state.numPhases());
// init does not resize surfacevol. Do it manually.
distributed_state.surfacevol().resize(grid.numCells()*state.numPhases(),
@ -367,7 +392,7 @@ void distributeGridAndData( Dune::CpGrid& grid,
properties = distributed_props;
geology = distributed_geology;
state = distributed_state;
material_law_manager = distributed_material_law_manager;
extractParallelGridInformationToISTL(grid, parallelInformation);
}
#endif