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

Fixes SaturationPropsFromDeck handling during redistribution.

Browse Source 
It needs a material law manager that works on the processes local
grid partition. Therfore copying the one from the global representation
does not work. Instead we now create an new SaturationPropsFromDeck and
initialize it with the local material law manager.
This commit is contained in:
Markus Blatt 2015-10-27 00:43:43 +01:00
parent 4526cce41b
commit 134b47a5e2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/BlackoilPropsAdFromDeck.cpp
View File

@ -120,7 +120,7 @@ namespace Opm
BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck& props, BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck& props,
std::shared_ptr<MaterialLawManager> materialLawManager, std::shared_ptr<MaterialLawManager> materialLawManager,
const int number_of_cells) const int number_of_cells)
: rock_(number_of_cells) : rock_(number_of_cells), satprops_(new SaturationPropsFromDeck())
{ {
const int original_size = props.cellPvtRegionIdx_.size(); const int original_size = props.cellPvtRegionIdx_.size();
if (number_of_cells > original_size) { if (number_of_cells > original_size) {
@ -133,7 +133,6 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
materialLawManager_ = materialLawManager; materialLawManager_ = materialLawManager;
// Copy properties that do not depend on the postion within the grid. // Copy properties that do not depend on the postion within the grid.
satprops_ = props.satprops_;
phase_usage_ = props.phase_usage_; phase_usage_ = props.phase_usage_;
props_ = props.props_; props_ = props.props_;
densities_ = props.densities_; densities_ = props.densities_;
@ -143,6 +142,7 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
// For data that is dependant on the subgrid we simply allocate space // For data that is dependant on the subgrid we simply allocate space
// and initialize with obviously bogus numbers. // and initialize with obviously bogus numbers.
cellPvtRegionIdx_.resize(number_of_cells, std::numeric_limits<int>::min()); cellPvtRegionIdx_.resize(number_of_cells, std::numeric_limits<int>::min());
satprops_->init(phase_usage_, materialLawManager_);
} }
/// Initializes the properties. /// Initializes the properties.