Make sure subclass functions are not called before subclass is initialized.

This at least slightly improves the old design. In that design the
subclass had no own constructor but inherited the one of the base class.
That base class constructor called certain subclass
functions (createGrids_, filterConnections_, updateOutputDir_, and
finalizeInit_)that would initialize raw pointers of the
subclass. Hence subclasses where not allowed to have non-pod members
and those used later (e.g. deleted in the destructor) had to be
initialized in these functions.

The new (still ugly) design introduces constructors into the
subclasses and skips inheriting constructors. Now one must call a base
class function classImplementationInit which will still call the
functions createGrids_, filterConnections_, updateOutputDir_, and
finalizeInit_, but at least at this point the baseclass is fully
constructed and the subclass is constructed as much as
possible/needed (non-pod types will be initialized now.)
This commit is contained in:
Markus Blatt 2019-10-01 21:18:17 +02:00
parent 1544f84fb4
commit a0fa87e81f
4 changed files with 29 additions and 22 deletions

View File

@ -81,10 +81,11 @@ private:
static const int dimension = Grid::dimension; static const int dimension = Grid::dimension;
public: public:
/*! EclAluGridVanguard(Simulator& simulator)
* \brief Inherit the constructors from the base class. : EclBaseVanguard<TypeTag>(simulator)
*/ {
using EclBaseVanguard<TypeTag>::EclBaseVanguard; this->callImplementationInit();
}
~EclAluGridVanguard() ~EclAluGridVanguard()
{ {

View File

@ -373,16 +373,6 @@ public:
int outputInterval = EWOMS_GET_PARAM(TypeTag, int, EclOutputInterval); int outputInterval = EWOMS_GET_PARAM(TypeTag, int, EclOutputInterval);
if (outputInterval >= 0) if (outputInterval >= 0)
eclState_->getRestartConfig().overrideRestartWriteInterval(outputInterval); eclState_->getRestartConfig().overrideRestartWriteInterval(outputInterval);
asImp_().createGrids_();
asImp_().filterConnections_();
asImp_().updateOutputDir_();
asImp_().finalizeInit_();
if (enableExperiments) {
Opm::RelpermDiagnostics relpermDiagnostics;
relpermDiagnostics.diagnosis(*eclState_, *deck_, asImp_().grid());
}
} }
/*! /*!
@ -538,6 +528,19 @@ public:
std::unordered_set<std::string> defunctWellNames() const std::unordered_set<std::string> defunctWellNames() const
{ return std::unordered_set<std::string>(); } { return std::unordered_set<std::string>(); }
protected:
void callImplementationInit()
{
asImp_().createGrids_();
asImp_().filterConnections_();
asImp_().updateOutputDir_();
asImp_().finalizeInit_();
if (enableExperiments) {
Opm::RelpermDiagnostics relpermDiagnostics;
relpermDiagnostics.diagnosis(*eclState_, *deck_, asImp_().grid());
}
}
private: private:
void updateOutputDir_() void updateOutputDir_()
{ {

View File

@ -70,6 +70,7 @@ class EclCpGridVanguard : public EclBaseVanguard<TypeTag>
typedef EclBaseVanguard<TypeTag> ParentType; typedef EclBaseVanguard<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper; typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper;
public: public:
@ -81,10 +82,11 @@ private:
typedef Dune::CartesianIndexMapper<Grid> CartesianIndexMapper; typedef Dune::CartesianIndexMapper<Grid> CartesianIndexMapper;
public: public:
/*! EclCpGridVanguard(Simulator& simulator)
* \brief Inherit the constructors from the base class. : EclBaseVanguard<TypeTag>(simulator)
*/ {
using EclBaseVanguard<TypeTag>::EclBaseVanguard; this->callImplementationInit();
}
~EclCpGridVanguard() ~EclCpGridVanguard()
{ {

View File

@ -77,10 +77,11 @@ private:
typedef CartesianIndexMapper* CartesianIndexMapperPointer; typedef CartesianIndexMapper* CartesianIndexMapperPointer;
public: public:
/*! EclPolyhedralGridVanguard(Simulator& simulator)
* \brief Inherit the constructors from the base class. : EclBaseVanguard<TypeTag>(simulator)
*/ {
using EclBaseVanguard<TypeTag>::EclBaseVanguard; this->callImplementationInit();
}
~EclPolyhedralGridVanguard() ~EclPolyhedralGridVanguard()
{ {