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

moving localWellsActive and wellsActive to StandardWells

Browse Source 
maybe later it can be something general for different types of wells.
This commit is contained in:
Kai Bao
2016-04-01 14:55:58 +02:00
parent 48483b23c7
commit 3947ff5b1d
8 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/BlackoilModelBase.hpp
View File

@@ -280,6 +280,10 @@ namespace Opm {
// keeping the underline, later they will be private members
StandardWells(const Wells* wells);
const Wells& wells() const;
// return true if wells are available in the reservoir
bool wellsActive() const;
// return true if wells are available on this process
bool localWellsActive() const;
bool wells_active_;
const Wells* wells_;
const WellOps wops_;
@@ -345,10 +349,6 @@ namespace Opm {
return static_cast<const Implementation&>(*this);
}
// return true if wells are available in the reservoir
bool wellsActive() const { return std_wells_.wells_active_; }
// return true if wells are available on this process
bool localWellsActive() const { return std_wells_.wells_ ? (std_wells_.wells_->number_of_wells > 0 ) : false; }
// return the StandardWells object
StandardWells& stdWells() { return std_wells_; }

52
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@@ -481,12 +481,36 @@ namespace detail {
template <class Grid, class Implementation>
bool
BlackoilModelBase<Grid, Implementation>::
StandardWells::wellsActive() const
{
return wells_active_;
}
template <class Grid, class Implementation>
bool
BlackoilModelBase<Grid, Implementation>::
StandardWells::localWellsActive() const
{
return wells_ ? (wells_->number_of_wells > 0 ) : false;
}
template <class Grid, class Implementation>
int
BlackoilModelBase<Grid, Implementation>::numWellVars() const
{
// For each well, we have a bhp variable, and one flux per phase.
const int nw = localWellsActive() ? stdWells().wells().number_of_wells : 0;
const int nw = stdWells().localWellsActive() ? stdWells().wells().number_of_wells : 0;
return (numPhases() + 1) * nw;
}
@@ -602,7 +626,7 @@ namespace detail {
BlackoilModelBase<Grid, Implementation>::variableWellStateInitials(const WellState& xw, std::vector<V>& vars0) const
{
// Initial well rates.
if ( localWellsActive() )
if ( stdWells().localWellsActive() )
{
// Need to reshuffle well rates, from phase running fastest
// to wells running fastest.
@@ -993,7 +1017,7 @@ namespace detail {
// -------- Well equations ----------
if ( ! wellsActive() ) {
if ( ! stdWells().wellsActive() ) {
return;
}
@@ -1124,7 +1148,7 @@ namespace detail {
const SolutionState&,
const WellState&)
{
if ( !asImpl().localWellsActive() )
if ( !asImpl().stdWells().localWellsActive() )
{
// If there are no wells in the subdomain of the proces then
// cq_s has zero size and will cause a segmentation fault below.
@@ -1152,7 +1176,7 @@ namespace detail {
{
// If we have wells, extract the mobilities and b-factors for
// the well-perforated cells.
if (!asImpl().localWellsActive()) {
if (!asImpl().stdWells().localWellsActive()) {
mob_perfcells.clear();
b_perfcells.clear();
return;
@@ -1181,7 +1205,7 @@ namespace detail {
V& aliveWells,
std::vector<ADB>& cq_s) const
{
if( ! localWellsActive() ) return ;
if( ! stdWells().localWellsActive() ) return ;
const int np = stdWells().wells().number_of_phases;
const int nw = stdWells().wells().number_of_wells;
@@ -1329,7 +1353,7 @@ namespace detail {
const SolutionState& state,
WellState& xw) const
{
if ( !asImpl().localWellsActive() )
if ( !asImpl().stdWells().localWellsActive() )
{
// If there are no wells in the subdomain of the proces then
// cq_s has zero size and will cause a segmentation fault below.
@@ -1360,7 +1384,7 @@ namespace detail {
void BlackoilModelBase<Grid, Implementation>::addWellFluxEq(const std::vector<ADB>& cq_s,
const SolutionState& state)
{
if( !asImpl().localWellsActive() )
if( !asImpl().stdWells().localWellsActive() )
{
// If there are no wells in the subdomain of the proces then
// cq_s has zero size and will cause a segmentation fault below.
@@ -1517,7 +1541,7 @@ namespace detail {
template <class Grid, class Implementation>
bool BlackoilModelBase<Grid, Implementation>::isVFPActive() const
{
if( ! localWellsActive() ) {
if( ! stdWells().localWellsActive() ) {
return false;
}
@@ -1549,7 +1573,7 @@ namespace detail {
template <class Grid, class Implementation>
void BlackoilModelBase<Grid, Implementation>::updateWellControls(WellState& xw) const
{
if( ! localWellsActive() ) return ;
if( ! stdWells().localWellsActive() ) return ;
std::string modestring[4] = { "BHP", "THP", "RESERVOIR_RATE", "SURFACE_RATE" };
// Find, for each well, if any constraints are broken. If so,
@@ -1715,7 +1739,7 @@ namespace detail {
std::vector<ADB> mob_perfcells_const(np, ADB::null());
std::vector<ADB> b_perfcells_const(np, ADB::null());
if (asImpl().localWellsActive() ){
if (asImpl().stdWells().localWellsActive() ){
// If there are non well in the sudomain of the process
// thene mob_perfcells_const and b_perfcells_const would be empty
for (int phase = 0; phase < np; ++phase) {
@@ -1746,7 +1770,7 @@ namespace detail {
}
++it;
if( localWellsActive() )
if( stdWells().localWellsActive() )
{
std::vector<ADB> eqs;
eqs.reserve(2);
@@ -1808,7 +1832,7 @@ namespace detail {
const WellState& xw,
const V& aliveWells)
{
if( ! localWellsActive() ) return;
if( ! stdWells().localWellsActive() ) return;
const int np = stdWells().wells().number_of_phases;
const int nw = stdWells().wells().number_of_wells;
@@ -2308,7 +2332,7 @@ namespace detail {
WellState& well_state)
{
if( localWellsActive() )
if( stdWells().localWellsActive() )
{
const int np = stdWells().wells().number_of_phases;
const int nw = stdWells().wells().number_of_wells;

1
opm/autodiff/BlackoilMultiSegmentModel.hpp
View File

@@ -208,7 +208,6 @@ namespace Opm {
using Base::stdWells;
using Base::updatePrimalVariableFromState;
using Base::wellsActive;
using Base::phaseCondition;
using Base::fluidRvSat;
using Base::fluidRsSat;

6
opm/autodiff/BlackoilMultiSegmentModel_impl.hpp
View File

@@ -359,7 +359,7 @@ namespace Opm {
void BlackoilMultiSegmentModel<Grid>::computeWellConnectionPressures(const SolutionState& state,
const WellState& xw)
{
if( ! wellsActive() ) return ;
if( ! stdWells().wellsActive() ) return ;
using namespace Opm::AutoDiffGrid;
// 1. Compute properties required by computeConnectionPressureDelta().
@@ -621,7 +621,7 @@ namespace Opm {
// -------- Well equations ----------
if ( ! wellsActive() ) {
if ( ! stdWells().wellsActive() ) {
return;
}
@@ -939,7 +939,7 @@ namespace Opm {
template <class Grid>
void BlackoilMultiSegmentModel<Grid>::updateWellControls(WellState& xw) const
{
if( ! wellsActive() ) return ;
if( ! stdWells().wellsActive() ) return ;
std::string modestring[4] = { "BHP", "THP", "RESERVOIR_RATE", "SURFACE_RATE" };
// Find, for each well, if any constraints are broken. If so,

1
opm/autodiff/BlackoilSolventModel.hpp
View File

@@ -130,7 +130,6 @@ namespace Opm {
// --------- Protected methods ---------
// Need to declare Base members we want to use here.
using Base::wellsActive;
using Base::stdWells;
using Base::variableState;
using Base::computeGasPressure;

1
opm/autodiff/BlackoilSolventModel_impl.hpp
View File

@@ -389,6 +389,7 @@ namespace Opm {
std::vector<double>& rvmax_perf,
std::vector<double>& surf_dens_perf)
{
if( ! stdWells().localWellsActive() ) return ;
using namespace Opm::AutoDiffGrid;
// 1. Compute properties required by computeConnectionPressureDelta().

1
opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp
View File

@@ -179,7 +179,6 @@ namespace Opm {
// Need to declare Base members we want to use here.
using Base::stdWells;
using Base::wellsActive;
using Base::variableState;
using Base::computePressures;
using Base::computeGasPressure;

4
opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp
View File

@@ -525,7 +525,7 @@ namespace Opm {
assembleMassBalanceEq(state);
// -------- Well equations ----------
if ( ! wellsActive() ) {
if ( ! stdWells().wellsActive() ) {
return;
}
@@ -710,7 +710,7 @@ namespace Opm {
BlackoilPolymerModel<Grid>::computeWaterShearVelocityWells(const SolutionState& state, WellState& xw, const ADB& cq_sw,
std::vector<double>& water_vel_wells, std::vector<double>& visc_mult_wells)
{
if( ! wellsActive() ) return ;
if( ! stdWells().wellsActive() ) return ;
const int nw = stdWells().wells().number_of_wells;
const int nperf = stdWells().wells().well_connpos[nw];