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 variableState().

Browse Source 
Has been split into multiple methods to give more flexibility
to extended models.
This commit is contained in:
Atgeirr Flø Rasmussen 2015-05-26 11:16:21 +02:00
parent 1cc4b28c05
commit 9aaf428f29
3 changed files with 107 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opm/autodiff/BlackoilModelBase.hpp
View File

@ -226,7 +226,6 @@ namespace Opm {
M p2w; // perf -> well (gather)
};
// --------- Data members ---------
const Grid& grid_;
@ -289,6 +288,18 @@ namespace Opm {
variableState(const ReservoirState& x,
const WellState& xw) const;
std::vector<V>
variableStateInitials(const ReservoirState& x,
const WellState& xw) const;
std::vector<int>
variableStateIndices() const;
SolutionState
variableStateExtractVars(const ReservoirState& x,
const std::vector<int>& indices,
std::vector<ADB>& vars) const;
void
computeAccum(const SolutionState& state,
const int aix );

110
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -360,8 +360,24 @@ namespace detail {
template <class Grid, class Implementation>
typename BlackoilModelBase<Grid, Implementation>::SolutionState
BlackoilModelBase<Grid, Implementation>::variableState(const ReservoirState& x,
const WellState& xw) const
const WellState& xw) const
{
std::vector<V> vars0 = variableStateInitials(x, xw);
std::vector<ADB> vars = ADB::variables(vars0);
return variableStateExtractVars(x, variableStateIndices(), vars);
}
template <class Grid, class Implementation>
std::vector<V>
BlackoilModelBase<Grid, Implementation>::variableStateInitials(const ReservoirState& x,
const WellState& xw) const
{
assert(active_[ Oil ]);
using namespace Opm::AutoDiffGrid;
const int nc = numCells(grid_);
const int np = x.numPhases();
@ -385,29 +401,25 @@ namespace detail {
vars0.push_back(sw);
}
// store cell status in vectors
V isRs = V::Zero(nc,1);
V isRv = V::Zero(nc,1);
V isSg = V::Zero(nc,1);
if (active_[ Gas ]){
if (active_[ Gas ]) {
// store cell status in vectors
V isRs = V::Zero(nc,1);
V isRv = V::Zero(nc,1);
V isSg = V::Zero(nc,1);
for (int c = 0; c < nc ; c++ ) {
switch (primalVariable_[c]) {
case PrimalVariables::RS:
isRs[c] = 1;
break;
case PrimalVariables::RV:
isRv[c] = 1;
break;
default:
isSg[c] = 1;
break;
}
}
// define new primary variable xvar depending on solution condition
V xvar(nc);
const V sg = s.col(pu.phase_pos[ Gas ]);
@ -419,7 +431,7 @@ namespace detail {
// Initial well rates.
if( wellsActive() )
if ( wellsActive() )
{
// Need to reshuffle well rates, from phase running fastest
// to wells running fastest.
@ -442,25 +454,63 @@ namespace detail {
vars0.push_back(V());
}
std::vector<ADB> vars = ADB::variables(vars0);
return vars0;
}
SolutionState state(np);
template <class Grid, class Implementation>
std::vector<int>
BlackoilModelBase<Grid, Implementation>::variableStateIndices() const
{
assert(active_[Oil]);
const int np = fluid_.numPhases();
std::vector<int> indices(np + 2, -1);
int next = 0;
indices[Pressure] = next++;
if (active_[Water]) {
indices[Sw] = next++;
}
if (active_[Gas]) {
indices[Xvar] = next++;
}
indices[Qs] = next++;
indices[Bhp] = next++;
assert(next == np + 2);
return indices;
}
template <class Grid, class Implementation>
typename BlackoilModelBase<Grid, Implementation>::SolutionState
BlackoilModelBase<Grid, Implementation>::variableStateExtractVars(const ReservoirState& x,
const std::vector<int>& indices,
std::vector<ADB>& vars) const
{
//using namespace Opm::AutoDiffGrid;
const int nc = Opm::AutoDiffGrid::numCells(grid_);
const Opm::PhaseUsage pu = fluid_.phaseUsage();
SolutionState state(fluid_.numPhases());
// Pressure.
int nextvar = 0;
state.pressure = std::move(vars[ nextvar++ ]);
state.pressure = std::move(vars[indices[Pressure]]);
// temperature
// Temperature cannot be a variable at this time (only constant).
const V temp = Eigen::Map<const V>(& x.temperature()[0], x.temperature().size());
state.temperature = ADB::constant(temp);
// Saturations
{
ADB so = ADB::constant(V::Ones(nc, 1));
if (active_[ Water ]) {
state.saturation[pu.phase_pos[ Water ]] = std::move(vars[ nextvar++ ]);
state.saturation[pu.phase_pos[ Water ]] = std::move(vars[indices[Sw]]);
const ADB& sw = state.saturation[pu.phase_pos[ Water ]];
so -= sw;
}
@ -468,7 +518,23 @@ namespace detail {
if (active_[ Gas ]) {
// Define Sg Rs and Rv in terms of xvar.
// Xvar is only defined if gas phase is active
const ADB& xvar = vars[ nextvar++ ];
V isRs = V::Zero(nc,1);
V isRv = V::Zero(nc,1);
V isSg = V::Zero(nc,1);
for (int c = 0; c < nc ; c++ ) {
switch (primalVariable_[c]) {
case PrimalVariables::RS:
isRs[c] = 1;
break;
case PrimalVariables::RV:
isRv[c] = 1;
break;
default:
isSg[c] = 1;
break;
}
}
const ADB& xvar = vars[indices[Xvar]];
ADB& sg = state.saturation[ pu.phase_pos[ Gas ] ];
sg = isSg*xvar + isRv* so;
so -= sg;
@ -501,12 +567,10 @@ namespace detail {
}
// Qs.
state.qs = std::move(vars[ nextvar++ ]);
state.qs = std::move(vars[indices[Qs]]);
// Bhp.
state.bhp = std::move(vars[ nextvar++ ]);
assert(nextvar == int(vars.size()));
state.bhp = std::move(vars[indices[Bhp]]);
return state;
}

8
opm/autodiff/BlackoilModelEnums.hpp
View File

@ -39,6 +39,14 @@ namespace Opm
};
enum CanonicalVariablePositions {
Pressure = 0,
Sw = 1,
Xvar = 2,
Qs = 3,
Bhp = 4
};
} // namespace Opm
#endif // OPM_BLACKOILMODELENUMS_HEADER_INCLUDED