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 #461 from blattms/fixes-solve_welleq_initially-in-parallel

Browse Source 
Fixes parallel runs with solve_welleq_initially
This commit is contained in:
Atgeirr Flø Rasmussen 2015-09-07 11:14:46 +02:00
commit b08f61362b
2 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/autodiff/BlackoilModelBase.hpp
View File

@ -253,6 +253,7 @@ namespace Opm {
ModelParameters param_; ModelParameters param_;
bool use_threshold_pressure_; bool use_threshold_pressure_;
bool wells_active_;
V threshold_pressures_by_interior_face_; V threshold_pressures_by_interior_face_;
std::vector<ReservoirResidualQuant> rq_; std::vector<ReservoirResidualQuant> rq_;
@ -287,8 +288,10 @@ namespace Opm {
return static_cast<const Implementation&>(*this); return static_cast<const Implementation&>(*this);
} }
// return true if wells are available // return true if wells are available in the reservoir
bool wellsActive() const { return wells_ ? wells_->number_of_wells > 0 : false ; } bool wellsActive() const { return wells_active_; }
// return true if wells are available on this process
bool localWellsActive() const { return wells_ ? (wells_->number_of_wells > 0 ) : false; }
// return wells object // return wells object
const Wells& wells () const { assert( bool(wells_ != 0) ); return *wells_; } const Wells& wells () const { assert( bool(wells_ != 0) ); return *wells_; }

36
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -180,15 +180,23 @@ namespace detail {
, terminal_output_ (terminal_output) , terminal_output_ (terminal_output)
{ {
#if HAVE_MPI #if HAVE_MPI
if ( terminal_output_ ) {
if ( linsolver_.parallelInformation().type() == typeid(ParallelISTLInformation) ) if ( linsolver_.parallelInformation().type() == typeid(ParallelISTLInformation) )
{ {
const ParallelISTLInformation& info = const ParallelISTLInformation& info =
boost::any_cast<const ParallelISTLInformation&>(linsolver_.parallelInformation()); boost::any_cast<const ParallelISTLInformation&>(linsolver_.parallelInformation());
if ( terminal_output_ ) {
// Only rank 0 does print to std::cout if terminal_output is enabled // Only rank 0 does print to std::cout if terminal_output is enabled
terminal_output_ = (info.communicator().rank()==0); terminal_output_ = (info.communicator().rank()==0);
} }
int local_number_of_wells = wells_->number_of_wells;
int global_number_of_wells = info.communicator().sum(local_number_of_wells);
wells_active_ = ( global_number_of_wells > 0 );
}else
{
wells_active_ = (wells_->number_of_wells > 0 );
} }
#else
wells_active_ = (wells_->number_of_wells > 0 );
#endif #endif
} }
@ -455,7 +463,7 @@ namespace detail {
BlackoilModelBase<Grid, Implementation>::variableWellStateInitials(const WellState& xw, std::vector<V>& vars0) const BlackoilModelBase<Grid, Implementation>::variableWellStateInitials(const WellState& xw, std::vector<V>& vars0) const
{ {
// Initial well rates. // Initial well rates.
if ( wellsActive() ) if ( localWellsActive() )
{ {
// Need to reshuffle well rates, from phase running fastest // Need to reshuffle well rates, from phase running fastest
// to wells running fastest. // to wells running fastest.
@ -678,7 +686,7 @@ namespace detail {
void BlackoilModelBase<Grid, Implementation>::computeWellConnectionPressures(const SolutionState& state, void BlackoilModelBase<Grid, Implementation>::computeWellConnectionPressures(const SolutionState& state,
const WellState& xw) const WellState& xw)
{ {
if( ! wellsActive() ) return ; if( ! localWellsActive() ) return ;
using namespace Opm::AutoDiffGrid; using namespace Opm::AutoDiffGrid;
// 1. Compute properties required by computeConnectionPressureDelta(). // 1. Compute properties required by computeConnectionPressureDelta().
@ -936,7 +944,7 @@ namespace detail {
V& aliveWells, V& aliveWells,
std::vector<ADB>& cq_s) std::vector<ADB>& cq_s)
{ {
if( ! wellsActive() ) return ; if( ! localWellsActive() ) return ;
const int np = wells().number_of_phases; const int np = wells().number_of_phases;
const int nw = wells().number_of_wells; const int nw = wells().number_of_wells;
@ -1229,7 +1237,7 @@ namespace detail {
template <class Grid, class Implementation> template <class Grid, class Implementation>
bool BlackoilModelBase<Grid, Implementation>::isVFPActive() const bool BlackoilModelBase<Grid, Implementation>::isVFPActive() const
{ {
if( ! wellsActive() ) { if( ! localWellsActive() ) {
return false; return false;
} }
@ -1261,7 +1269,7 @@ namespace detail {
template <class Grid, class Implementation> template <class Grid, class Implementation>
void BlackoilModelBase<Grid, Implementation>::updateWellControls(WellState& xw) const void BlackoilModelBase<Grid, Implementation>::updateWellControls(WellState& xw) const
{ {
if( ! wellsActive() ) return ; if( ! localWellsActive() ) return ;
std::string modestring[4] = { "BHP", "THP", "RESERVOIR_RATE", "SURFACE_RATE" }; std::string modestring[4] = { "BHP", "THP", "RESERVOIR_RATE", "SURFACE_RATE" };
// Find, for each well, if any constraints are broken. If so, // Find, for each well, if any constraints are broken. If so,
@ -1425,6 +1433,8 @@ namespace detail {
} }
++it; ++it;
if( localWellsActive() )
{
std::vector<ADB> eqs; std::vector<ADB> eqs;
eqs.reserve(2); eqs.reserve(2);
eqs.push_back(residual_.well_flux_eq); eqs.push_back(residual_.well_flux_eq);
@ -1436,7 +1446,7 @@ namespace detail {
assert(dx.size() == (well_state.numWells() * (well_state.numPhases()+1))); assert(dx.size() == (well_state.numWells() * (well_state.numPhases()+1)));
updateWellState(dx.array(), well_state); updateWellState(dx.array(), well_state);
updateWellControls(well_state); updateWellControls(well_state);
}
} while (it < 15); } while (it < 15);
if (converged) { if (converged) {
@ -1474,7 +1484,7 @@ namespace detail {
const WellState& xw, const WellState& xw,
const V& aliveWells) const V& aliveWells)
{ {
if( ! wellsActive() ) return; if( ! localWellsActive() ) return;
const int np = wells().number_of_phases; const int np = wells().number_of_phases;
const int nw = wells().number_of_wells; const int nw = wells().number_of_wells;
@ -1713,7 +1723,7 @@ namespace detail {
using namespace Opm::AutoDiffGrid; using namespace Opm::AutoDiffGrid;
const int np = fluid_.numPhases(); const int np = fluid_.numPhases();
const int nc = numCells(grid_); const int nc = numCells(grid_);
const int nw = wellsActive() ? wells().number_of_wells : 0; const int nw = localWellsActive() ? wells().number_of_wells : 0;
const V null; const V null;
assert(null.size() == 0); assert(null.size() == 0);
const V zero = V::Zero(nc); const V zero = V::Zero(nc);
@ -1934,10 +1944,10 @@ namespace detail {
WellState& well_state) WellState& well_state)
{ {
if( wellsActive() ) if( localWellsActive() )
{ {
const int np = wells().number_of_phases; const int np = wells().number_of_phases;
const int nw = wellsActive() ? wells().number_of_wells : 0; const int nw = wells().number_of_wells;
// Extract parts of dwells corresponding to each part. // Extract parts of dwells corresponding to each part.
int varstart = 0; int varstart = 0;
@ -2316,7 +2326,7 @@ namespace detail {
const double tol_wells = param_.tolerance_wells_; const double tol_wells = param_.tolerance_wells_;
const int nc = Opm::AutoDiffGrid::numCells(grid_); const int nc = Opm::AutoDiffGrid::numCells(grid_);
const int nw = wellsActive() ? wells().number_of_wells : 0; const int nw = localWellsActive() ? wells().number_of_wells : 0;
const Opm::PhaseUsage& pu = fluid_.phaseUsage(); const Opm::PhaseUsage& pu = fluid_.phaseUsage();
const V pv = geo_.poreVolume(); const V pv = geo_.poreVolume();
@ -2423,7 +2433,7 @@ namespace detail {
const double tol_wells = param_.tolerance_wells_; const double tol_wells = param_.tolerance_wells_;
const int nc = Opm::AutoDiffGrid::numCells(grid_); const int nc = Opm::AutoDiffGrid::numCells(grid_);
const int nw = wellsActive() ? wells().number_of_wells : 0; const int nw = localWellsActive() ? wells().number_of_wells : 0;
const Opm::PhaseUsage& pu = fluid_.phaseUsage(); const Opm::PhaseUsage& pu = fluid_.phaseUsage();
const V pv = geo_.poreVolume(); const V pv = geo_.poreVolume();