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

Use asImpl() pattern for static polymorphism.

Browse Source 
Not yet applied to all method calls, but only ones needed for
polymer solver after initial refactoring.
This commit is contained in:
Atgeirr Flø Rasmussen 2015-05-26 01:48:45 +02:00
parent 74784522ea
commit eb962aafa9
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/autodiff/BlackoilModelBase.hpp
View File

@ -263,6 +263,20 @@ namespace Opm {
// --------- Protected methods --------- // --------- Protected methods ---------
/// Access the most-derived class used for
/// static polymorphism (CRTP).
Implementation& asImpl()
{
return static_cast<Implementation&>(*this);
}
/// Access the most-derived class used for
/// static polymorphism (CRTP).
const Implementation& asImpl() const
{
return static_cast<const Implementation&>(*this);
}
// return true if wells are available // return true if wells are available
bool wellsActive() const { return wells_ ? wells_->number_of_wells > 0 : false ; } bool wellsActive() const { return wells_ ? wells_->number_of_wells > 0 : false ; }
// return wells object // return wells object

14
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -669,15 +669,15 @@ namespace detail {
updateWellControls(well_state); updateWellControls(well_state);
// Create the primary variables. // Create the primary variables.
SolutionState state = variableState(reservoir_state, well_state); SolutionState state = asImpl().variableState(reservoir_state, well_state);
if (initial_assembly) { if (initial_assembly) {
// Create the (constant, derivativeless) initial state. // Create the (constant, derivativeless) initial state.
SolutionState state0 = state; SolutionState state0 = state;
makeConstantState(state0); asImpl().makeConstantState(state0);
// Compute initial accumulation contributions // Compute initial accumulation contributions
// and well connection pressures. // and well connection pressures.
computeAccum(state0, 0); asImpl().computeAccum(state0, 0);
computeWellConnectionPressures(state0, well_state); computeWellConnectionPressures(state0, well_state);
} }
@ -691,11 +691,11 @@ namespace detail {
// OPM_AD_DISKVAL(state.bhp); // OPM_AD_DISKVAL(state.bhp);
// -------- Mass balance equations -------- // -------- Mass balance equations --------
assembleMassBalanceEq(state); asImpl().assembleMassBalanceEq(state);
// -------- Well equations ---------- // -------- Well equations ----------
V aliveWells; V aliveWells;
addWellEq(state, well_state, aliveWells); asImpl().addWellEq(state, well_state, aliveWells);
addWellControlEq(state, well_state, aliveWells); addWellControlEq(state, well_state, aliveWells);
} }
@ -714,14 +714,14 @@ namespace detail {
// The corresponding accumulation terms from the start of // The corresponding accumulation terms from the start of
// the timestep (b^0_p*s^0_p etc.) were already computed // the timestep (b^0_p*s^0_p etc.) were already computed
// on the initial call to assemble() and stored in rq_[phase].accum[0]. // on the initial call to assemble() and stored in rq_[phase].accum[0].
computeAccum(state, 1); asImpl().computeAccum(state, 1);
// Set up the common parts of the mass balance equations // Set up the common parts of the mass balance equations
// for each active phase. // for each active phase.
const V transi = subset(geo_.transmissibility(), ops_.internal_faces); const V transi = subset(geo_.transmissibility(), ops_.internal_faces);
const std::vector<ADB> kr = computeRelPerm(state); const std::vector<ADB> kr = computeRelPerm(state);
for (int phaseIdx = 0; phaseIdx < fluid_.numPhases(); ++phaseIdx) { for (int phaseIdx = 0; phaseIdx < fluid_.numPhases(); ++phaseIdx) {
computeMassFlux(phaseIdx, transi, kr[canph_[phaseIdx]], state.canonical_phase_pressures[canph_[phaseIdx]], state); asImpl().computeMassFlux(phaseIdx, transi, kr[canph_[phaseIdx]], state.canonical_phase_pressures[canph_[phaseIdx]], state);
residual_.material_balance_eq[ phaseIdx ] = residual_.material_balance_eq[ phaseIdx ] =
pvdt_ * (rq_[phaseIdx].accum[1] - rq_[phaseIdx].accum[0]) pvdt_ * (rq_[phaseIdx].accum[1] - rq_[phaseIdx].accum[0])