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

- changes to be able to override methods in blacoilmodel

Browse Source 
- chaches to update full intensive quantities including extxrution factor without elementctx
This commit is contained in:
hnil 2023-02-26 16:28:11 +01:00
parent 6a3715e01b
commit fc115dcb99
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
opm/models/blackoil/blackoilmodel.hh
View File

@ -483,10 +483,10 @@ public:
outstream << priVars.pvtRegionIndex() << " "; outstream << priVars.pvtRegionIndex() << " ";
SolventModule::serializeEntity(*this, outstream, dof); SolventModule::serializeEntity(asImp_(), outstream, dof);
ExtboModule::serializeEntity(*this, outstream, dof); ExtboModule::serializeEntity(asImp_(), outstream, dof);
PolymerModule::serializeEntity(*this, outstream, dof); PolymerModule::serializeEntity(asImp_(), outstream, dof);
EnergyModule::serializeEntity(*this, outstream, dof); EnergyModule::serializeEntity(asImp_(), outstream, dof);
} }
/*! /*!
@ -527,10 +527,10 @@ public:
if (!instream.good()) if (!instream.good())
throw std::runtime_error("Could not deserialize degree of freedom "+std::to_string(dofIdx)); throw std::runtime_error("Could not deserialize degree of freedom "+std::to_string(dofIdx));
SolventModule::deserializeEntity(*this, instream, dof); SolventModule::deserializeEntity(asImp_(), instream, dof);
ExtboModule::deserializeEntity(*this, instream, dof); ExtboModule::deserializeEntity(asImp_(), instream, dof);
PolymerModule::deserializeEntity(*this, instream, dof); PolymerModule::deserializeEntity(asImp_(), instream, dof);
EnergyModule::deserializeEntity(*this, instream, dof); EnergyModule::deserializeEntity(asImp_(), instream, dof);
using PVM_G = typename PrimaryVariables::GasMeaning; using PVM_G = typename PrimaryVariables::GasMeaning;
using PVM_W = typename PrimaryVariables::WaterMeaning; using PVM_W = typename PrimaryVariables::WaterMeaning;
@ -591,10 +591,10 @@ protected:
ParentType::registerOutputModules_(); ParentType::registerOutputModules_();
// add the VTK output modules which make sense for the blackoil model // add the VTK output modules which make sense for the blackoil model
SolventModule::registerOutputModules(*this, this->simulator_); SolventModule::registerOutputModules(asImp_(), this->simulator_);
PolymerModule::registerOutputModules(*this, this->simulator_); PolymerModule::registerOutputModules(asImp_(), this->simulator_);
EnergyModule::registerOutputModules(*this, this->simulator_); EnergyModule::registerOutputModules(asImp_(), this->simulator_);
MICPModule::registerOutputModules(*this, this->simulator_); MICPModule::registerOutputModules(asImp_(), this->simulator_);
this->addOutputModule(new VtkBlackOilModule<TypeTag>(this->simulator_)); this->addOutputModule(new VtkBlackOilModule<TypeTag>(this->simulator_));
this->addOutputModule(new VtkCompositionModule<TypeTag>(this->simulator_)); this->addOutputModule(new VtkCompositionModule<TypeTag>(this->simulator_));

5
opm/models/discretization/common/fvbaseintensivequantities.hh
View File

@ -80,14 +80,15 @@ public:
*/ */
void checkDefined() const void checkDefined() const
{ } { }
protected:
Scalar extrusionFactor_;
private: private:
const Implementation& asImp_() const const Implementation& asImp_() const
{ return *static_cast<const Implementation*>(this); } { return *static_cast<const Implementation*>(this); }
Implementation& asImp_() Implementation& asImp_()
{ return *static_cast<Implementation*>(this); } { return *static_cast<Implementation*>(this); }
Scalar extrusionFactor_;
}; };
} // namespace Opm } // namespace Opm