Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[test] upstream PR for OPM/opm-simulators#2723 #624

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[test] upstream PR for OPM/opm-simulators#2723 #624

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
624f5fd
blackoilprimaryvariables have protected types and members
GitPaean Aug 19, 2020
bb90da5
using asImpl_() instead of *this in blackoilprimaryvariables
GitPaean Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions opm/models/blackoil/blackoilprimaryvariables.hh
View file
Open in desktop
Expand Up @@ -63,6 +63,7 @@ class BlackOilBrineModule;
template <class TypeTag>
class BlackOilPrimaryVariables : public FvBasePrimaryVariables<TypeTag>
{
protected:
using ParentType = FvBasePrimaryVariables<TypeTag>;
using Implementation = GetPropType<TypeTag, Properties::PrimaryVariables>;

Expand Down Expand Up @@ -268,7 +269,7 @@ public:
bool onlyWater = FluidSystem::phaseIsActive(waterPhaseIdx)?(fluidState.saturation(waterPhaseIdx) > thresholdWaterFilledCell):false;

// deal with the primary variables for the energy extension
EnergyModule::assignPrimaryVars(*this, fluidState);
EnergyModule::assignPrimaryVars(asImp_(), fluidState);

// determine the meaning of the primary variables
if (FluidSystem::numActivePhases() == 1) {
Expand Down Expand Up @@ -671,7 +672,7 @@ public:
#endif // NDEBUG
}

private:
protected:
Implementation& asImp_()
{ return *static_cast<Implementation*>(this); }

Expand Down