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

Refactor setting of new members into own functions.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2017-02-23 09:51:00 +01:00
parent cac6a33a51
commit 5c9fb9d32a
1 changed files with 54 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
opm/autodiff/WellStateFullyImplicitBlackoilDense.hpp
View File

@@ -67,14 +67,63 @@ namespace Opm
// call init on base class
BaseType :: init(wells, state, prevState);
// if there are no well, do nothing in init
setWellSolutions(wells, pu);
setWellSolutionsFromPrevState(wells, prevState);
}
template <class PrevState>
void setWellSolutionsFromPrevState(const Wells* wells, const PrevState& prevState)
{
// Set nw and np, or return if no wells.
if (wells == 0) {
return;
}
const int nw = wells->number_of_wells;
if( nw == 0 ) return ;
if (nw == 0) {
return;
}
const int np = wells->number_of_phases;
// intialize wells that have been there before
// order may change so the mapping is based on the well name
// if there are no well, do nothing in init
if( ! prevState.wellMap().empty() )
{
typedef typename WellMapType :: const_iterator const_iterator;
const_iterator end = prevState.wellMap().end();
int nw_old = prevState.bhp().size();
for (int w = 0; w < nw; ++w) {
std::string name( wells->name[ w ] );
const_iterator it = prevState.wellMap().find( name );
if( it != end )
{
const int oldIndex = (*it).second[ 0 ];
const int newIndex = w;
// wellSolutions
for( int i = 0; i < np; ++i)
{
wellSolutions()[ i*nw + newIndex ] = prevState.wellSolutions()[i * nw_old + oldIndex ];
}
}
}
}
}
/// Set wellSolutions() based on the base class members.
void setWellSolutions(const Wells* wells, const PhaseUsage& pu)
{
// Set nw and np, or return if no wells.
if (wells == 0) {
return;
}
const int nw = wells->number_of_wells;
if (nw == 0) {
return;
}
const int np = wells->number_of_phases;
well_solutions_.clear();
@@ -93,7 +142,6 @@ namespace Opm
switch (well_controls_iget_type(wc, current)) {
case THP: // Intentional fall-through
case BHP:
{
if (well_type == INJECTOR) {
for (int p = 0; p < np; ++p) {
well_solutions_[w] += wellRates()[np*w + p] * wells->comp_frac[np*w + p];
@@ -103,16 +151,10 @@ namespace Opm
well_solutions_[w] += g[p] * wellRates()[np*w + p];
}
}
}
break;
case RESERVOIR_RATE: // Intentional fall-through
case SURFACE_RATE:
{
wellSolutions()[w] = bhp()[w];
}
break;
}
@@ -142,34 +184,9 @@ namespace Opm
}
}
}
// intialize wells that have been there before
// order may change so the mapping is based on the well name
if( ! prevState.wellMap().empty() )
{
typedef typename WellMapType :: const_iterator const_iterator;
const_iterator end = prevState.wellMap().end();
int nw_old = prevState.bhp().size();
for (int w = 0; w < nw; ++w) {
std::string name( wells->name[ w ] );
const_iterator it = prevState.wellMap().find( name );
if( it != end )
{
const int oldIndex = (*it).second[ 0 ];
const int newIndex = w;
// wellSolutions
for( int i = 0; i < np; ++i)
{
wellSolutions()[ i*nw + newIndex ] = prevState.wellSolutions()[i * nw_old + oldIndex ];
}
}
}
}
}
template <class State>
void resize(const Wells* wells, const State& state, const PhaseUsage& pu ) {
const WellStateFullyImplicitBlackoilDense dummy_state{}; // Init with an empty previous state only resizes
@@ -186,6 +203,7 @@ namespace Opm
return res;
}
private:
std::vector<double> well_solutions_;
};