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

Merge pull request #2738 from akva2/more_macro_replacement

Browse Source 
More macro replacement
This commit is contained in:
Markus Blatt 2020-08-27 08:46:25 +02:00 committed by GitHub
commit 83bfd4edfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
61 changed files with 385 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ebos/ebos_altidx.cc
View File

@ -58,7 +58,7 @@ NEW_TYPE_TAG(EbosAltIdxTypeTag, INHERITS_FROM(EbosTypeTag));
// use a fluid system with different indices than the default // use a fluid system with different indices than the default
SET_PROP(EbosAltIdxTypeTag, FluidSystem) SET_PROP(EbosAltIdxTypeTag, FluidSystem)
{ {
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public: public:
typedef Opm::BlackOilFluidSystem<Scalar, Opm::EclAlternativeBlackOilIndexTraits> type; typedef Opm::BlackOilFluidSystem<Scalar, Opm::EclAlternativeBlackOilIndexTraits> type;
@ -68,6 +68,6 @@ public:
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
typedef TTAG(EbosAltIdxTypeTag) ProblemTypeTag; using ProblemTypeTag = Opm::Properties::TTag::EbosAltIdxTypeTag;
return Opm::startEbos<ProblemTypeTag>(argc, argv); return Opm::startEbos<ProblemTypeTag>(argc, argv);
} }

28
ebos/ebos_blackoil.cc
View File

@ -34,30 +34,30 @@ namespace Opm {
bool ebosBlackOilDeckFileNameIsSet(int argc, char** argv) bool ebosBlackOilDeckFileNameIsSet(int argc, char** argv)
{ {
typedef TTAG(EbosTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosTypeTag;
// use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of // use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of
// the work // the work
EWOMS_RESET_PARAMS_(ProblemTypeTag); Parameters::reset<ProblemTypeTag>();
Opm::setupParameters_<ProblemTypeTag>(argc, Opm::setupParameters_<ProblemTypeTag>(argc,
const_cast<const char**>(argv), const_cast<const char**>(argv),
/*doRegistration=*/true, /*doRegistration=*/true,
/*allowUnused=*/true, /*allowUnused=*/true,
/*handleHelp=*/false); /*handleHelp=*/false);
bool result = EWOMS_PARAM_IS_SET(ProblemTypeTag, std::string, EclDeckFileName); bool result = EWOMS_PARAM_IS_SET(ProblemTypeTag, std::string, EclDeckFileName);
EWOMS_RESET_PARAMS_(ProblemTypeTag); Parameters::reset<ProblemTypeTag>();
return result; return result;
} }
std::string ebosBlackOilGetDeckFileName(int argc, char** argv) std::string ebosBlackOilGetDeckFileName(int argc, char** argv)
{ {
typedef TTAG(EbosTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
// use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of // use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of
// the work // the work
EWOMS_RESET_PARAMS_(ProblemTypeTag); Parameters::reset<ProblemTypeTag>();
Opm::setupParameters_<ProblemTypeTag>(argc, Opm::setupParameters_<ProblemTypeTag>(argc,
const_cast<const char**>(argv), const_cast<const char**>(argv),
/*doRegistration=*/true, /*doRegistration=*/true,
@ -65,26 +65,26 @@ std::string ebosBlackOilGetDeckFileName(int argc, char** argv)
/*handleHelp=*/false); /*handleHelp=*/false);
std::string rawDeckFileName = EWOMS_GET_PARAM(ProblemTypeTag, std::string, EclDeckFileName); std::string rawDeckFileName = EWOMS_GET_PARAM(ProblemTypeTag, std::string, EclDeckFileName);
std::string result = Vanguard::canonicalDeckPath(rawDeckFileName).string(); std::string result = Vanguard::canonicalDeckPath(rawDeckFileName).string();
EWOMS_RESET_PARAMS_(ProblemTypeTag); Parameters::reset<ProblemTypeTag>();
return result; return result;
} }
std::unique_ptr<Opm::ParseContext> ebosBlackOilCreateParseContext(int argc, char** argv) std::unique_ptr<Opm::ParseContext> ebosBlackOilCreateParseContext(int argc, char** argv)
{ {
typedef TTAG(EbosTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
// use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of // use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of
// the work // the work
EWOMS_RESET_PARAMS_(ProblemTypeTag); Parameters::reset<ProblemTypeTag>();
Opm::setupParameters_<ProblemTypeTag>(argc, Opm::setupParameters_<ProblemTypeTag>(argc,
const_cast<const char**>(argv), const_cast<const char**>(argv),
/*doRegistration=*/true, /*doRegistration=*/true,
/*allowUnused=*/true, /*allowUnused=*/true,
/*handleHelp=*/false); /*handleHelp=*/false);
std::unique_ptr<Opm::ParseContext> result = Vanguard::createParseContext(); std::unique_ptr<Opm::ParseContext> result = Vanguard::createParseContext();
EWOMS_RESET_PARAMS_(ProblemTypeTag); Parameters::reset<ProblemTypeTag>();
return result; return result;
} }
@ -94,8 +94,8 @@ void ebosBlackOilSetDeck(Opm::Deck* deck,
Opm::ErrorGuard* errorGuard, Opm::ErrorGuard* errorGuard,
double externalSetupTime) double externalSetupTime)
{ {
typedef TTAG(EbosTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(externalSetupTime); Vanguard::setExternalSetupTime(externalSetupTime);
Vanguard::setExternalParseContext(parseContext); Vanguard::setExternalParseContext(parseContext);
@ -105,7 +105,7 @@ void ebosBlackOilSetDeck(Opm::Deck* deck,
int ebosBlackOilMain(int argc, char **argv) int ebosBlackOilMain(int argc, char **argv)
{ {
typedef TTAG(EbosTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosTypeTag;
return Opm::startEbos<ProblemTypeTag>(argc, argv); return Opm::startEbos<ProblemTypeTag>(argc, argv);
} }

6
ebos/ebos_brine.cc
View File

@ -46,8 +46,8 @@ void ebosBrineSetDeck(Opm::Deck* deck,
Opm::ErrorGuard* errorGuard, Opm::ErrorGuard* errorGuard,
double externalSetupTime) double externalSetupTime)
{ {
typedef TTAG(EbosBrineTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosBrineTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(externalSetupTime); Vanguard::setExternalSetupTime(externalSetupTime);
Vanguard::setExternalParseContext(parseContext); Vanguard::setExternalParseContext(parseContext);
@ -57,7 +57,7 @@ void ebosBrineSetDeck(Opm::Deck* deck,
int ebosBrineMain(int argc, char **argv) int ebosBrineMain(int argc, char **argv)
{ {
typedef TTAG(EbosBrineTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosBrineTypeTag;
return Opm::startEbos<ProblemTypeTag>(argc, argv); return Opm::startEbos<ProblemTypeTag>(argc, argv);
} }

6
ebos/ebos_foam.cc
View File

@ -46,8 +46,8 @@ void ebosFoamSetDeck(Opm::Deck* deck,
Opm::ErrorGuard* errorGuard, Opm::ErrorGuard* errorGuard,
double externalSetupTime) double externalSetupTime)
{ {
typedef TTAG(EbosFoamTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosFoamTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(externalSetupTime); Vanguard::setExternalSetupTime(externalSetupTime);
Vanguard::setExternalParseContext(parseContext); Vanguard::setExternalParseContext(parseContext);
@ -57,7 +57,7 @@ void ebosFoamSetDeck(Opm::Deck* deck,
int ebosFoamMain(int argc, char **argv) int ebosFoamMain(int argc, char **argv)
{ {
typedef TTAG(EbosFoamTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosFoamTypeTag;
return Opm::startEbos<ProblemTypeTag>(argc, argv); return Opm::startEbos<ProblemTypeTag>(argc, argv);
} }

8
ebos/ebos_gasoil.cc
View File

@ -41,7 +41,7 @@ private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads // it is unfortunately not possible to simply use 'TypeTag' here because this leads
// to cyclic definitions of some properties. if this happens the compiler error // to cyclic definitions of some properties. if this happens the compiler error
// messages unfortunately are *really* confusing and not really helpful. // messages unfortunately are *really* confusing and not really helpful.
typedef typename GET_PROP_TYPE(TTAG(EbosTypeTag), FluidSystem) FluidSystem; using FluidSystem = GetPropType<TTag::EbosTypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent), typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@ -62,8 +62,8 @@ void ebosGasOilSetDeck(Opm::Deck* deck,
Opm::ErrorGuard* errorGuard, Opm::ErrorGuard* errorGuard,
double externalSetupTime) double externalSetupTime)
{ {
typedef TTAG(EbosGasOilTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosGasOilTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(externalSetupTime); Vanguard::setExternalSetupTime(externalSetupTime);
Vanguard::setExternalParseContext(parseContext); Vanguard::setExternalParseContext(parseContext);
@ -73,7 +73,7 @@ void ebosGasOilSetDeck(Opm::Deck* deck,
int ebosGasOilMain(int argc, char **argv) int ebosGasOilMain(int argc, char **argv)
{ {
typedef TTAG(EbosGasOilTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosGasOilTypeTag;
return Opm::startEbos<ProblemTypeTag>(argc, argv); return Opm::startEbos<ProblemTypeTag>(argc, argv);
} }

8
ebos/ebos_oilwater.cc
View File

@ -41,7 +41,7 @@ private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads // it is unfortunately not possible to simply use 'TypeTag' here because this leads
// to cyclic definitions of some properties. if this happens the compiler error // to cyclic definitions of some properties. if this happens the compiler error
// messages unfortunately are *really* confusing and not really helpful. // messages unfortunately are *really* confusing and not really helpful.
typedef typename GET_PROP_TYPE(TTAG(EbosTypeTag), FluidSystem) FluidSystem; using FluidSystem = GetPropType<TTag::EbosTypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent), typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@ -62,8 +62,8 @@ void ebosOilWaterSetDeck(Opm::Deck* deck,
Opm::ErrorGuard* errorGuard, Opm::ErrorGuard* errorGuard,
double externalSetupTime) double externalSetupTime)
{ {
typedef TTAG(EbosOilWaterTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosOilWaterTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(externalSetupTime); Vanguard::setExternalSetupTime(externalSetupTime);
Vanguard::setExternalParseContext(parseContext); Vanguard::setExternalParseContext(parseContext);
@ -73,7 +73,7 @@ void ebosOilWaterSetDeck(Opm::Deck* deck,
int ebosOilWaterMain(int argc, char **argv) int ebosOilWaterMain(int argc, char **argv)
{ {
typedef TTAG(EbosOilWaterTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosOilWaterTypeTag;
return Opm::startEbos<ProblemTypeTag>(argc, argv); return Opm::startEbos<ProblemTypeTag>(argc, argv);
} }

8
ebos/ebos_oilwaterpolymer.cc
View File

@ -43,7 +43,7 @@ private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads // it is unfortunately not possible to simply use 'TypeTag' here because this leads
// to cyclic definitions of some properties. if this happens the compiler error // to cyclic definitions of some properties. if this happens the compiler error
// messages unfortunately are *really* confusing and not really helpful. // messages unfortunately are *really* confusing and not really helpful.
typedef typename GET_PROP_TYPE(TTAG(EbosTypeTag), FluidSystem) FluidSystem; using FluidSystem = GetPropType<TTag::EbosTypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent), typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@ -64,8 +64,8 @@ void ebosOilWaterPolymerSetDeck(Opm::Deck* deck,
Opm::ErrorGuard* errorGuard, Opm::ErrorGuard* errorGuard,
double externalSetupTime) double externalSetupTime)
{ {
typedef TTAG(EbosOilWaterPolymerTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosOilWaterPolymerTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(externalSetupTime); Vanguard::setExternalSetupTime(externalSetupTime);
Vanguard::setExternalParseContext(parseContext); Vanguard::setExternalParseContext(parseContext);
@ -75,7 +75,7 @@ void ebosOilWaterPolymerSetDeck(Opm::Deck* deck,
int ebosOilWaterPolymerMain(int argc, char **argv) int ebosOilWaterPolymerMain(int argc, char **argv)
{ {
typedef TTAG(EbosOilWaterPolymerTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosOilWaterPolymerTypeTag;
return Opm::startEbos<ProblemTypeTag>(argc, argv); return Opm::startEbos<ProblemTypeTag>(argc, argv);
} }

2
ebos/ebos_plain.cc
View File

@ -39,6 +39,6 @@ NEW_TYPE_TAG(EbosPlainTypeTag, INHERITS_FROM(BlackOilModel, EclBaseProblem));
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
typedef TTAG(EbosPlainTypeTag) ProblemTypeTag; using ProblemTypeTag = Opm::Properties::TTag::EbosPlainTypeTag;
return Opm::start<ProblemTypeTag>(argc, argv); return Opm::start<ProblemTypeTag>(argc, argv);
} }

6
ebos/ebos_polymer.cc
View File

@ -46,8 +46,8 @@ void ebosPolymerSetDeck(Opm::Deck* deck,
Opm::ErrorGuard* errorGuard, Opm::ErrorGuard* errorGuard,
double externalSetupTime) double externalSetupTime)
{ {
typedef TTAG(EbosPolymerTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosPolymerTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(externalSetupTime); Vanguard::setExternalSetupTime(externalSetupTime);
Vanguard::setExternalParseContext(parseContext); Vanguard::setExternalParseContext(parseContext);
@ -57,7 +57,7 @@ void ebosPolymerSetDeck(Opm::Deck* deck,
int ebosPolymerMain(int argc, char **argv) int ebosPolymerMain(int argc, char **argv)
{ {
typedef TTAG(EbosPolymerTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosPolymerTypeTag;
return Opm::startEbos<ProblemTypeTag>(argc, argv); return Opm::startEbos<ProblemTypeTag>(argc, argv);
} }

6
ebos/ebos_solvent.cc
View File

@ -46,8 +46,8 @@ void ebosSolventSetDeck(Opm::Deck* deck,
Opm::ErrorGuard* errorGuard, Opm::ErrorGuard* errorGuard,
double externalSetupTime) double externalSetupTime)
{ {
typedef TTAG(EbosSolventTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosSolventTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(externalSetupTime); Vanguard::setExternalSetupTime(externalSetupTime);
Vanguard::setExternalParseContext(parseContext); Vanguard::setExternalParseContext(parseContext);
@ -57,7 +57,7 @@ void ebosSolventSetDeck(Opm::Deck* deck,
int ebosSolventMain(int argc, char **argv) int ebosSolventMain(int argc, char **argv)
{ {
typedef TTAG(EbosSolventTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosSolventTypeTag;
return Opm::startEbos<ProblemTypeTag>(argc, argv); return Opm::startEbos<ProblemTypeTag>(argc, argv);
} }

6
ebos/ebos_thermal.cc
View File

@ -46,8 +46,8 @@ void ebosThermalSetDeck(Opm::Deck* deck,
Opm::ErrorGuard* errorGuard, Opm::ErrorGuard* errorGuard,
double externalSetupTime) double externalSetupTime)
{ {
typedef TTAG(EbosThermalTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosThermalTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(externalSetupTime); Vanguard::setExternalSetupTime(externalSetupTime);
Vanguard::setExternalParseContext(parseContext); Vanguard::setExternalParseContext(parseContext);
@ -57,7 +57,7 @@ void ebosThermalSetDeck(Opm::Deck* deck,
int ebosThermalMain(int argc, char **argv) int ebosThermalMain(int argc, char **argv)
{ {
typedef TTAG(EbosThermalTypeTag) ProblemTypeTag; using ProblemTypeTag = Properties::TTag::EbosThermalTypeTag;
return Opm::startEbos<ProblemTypeTag>(argc, argv); return Opm::startEbos<ProblemTypeTag>(argc, argv);
} }

10
ebos/eclalugridvanguard.hh
View File

@ -66,13 +66,13 @@ class EclAluGridVanguard : public EclBaseVanguard<TypeTag>
friend class EclBaseVanguard<TypeTag>; friend class EclBaseVanguard<TypeTag>;
typedef EclBaseVanguard<TypeTag> ParentType; typedef EclBaseVanguard<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
public: public:
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
typedef typename GET_PROP_TYPE(TypeTag, EquilGrid) EquilGrid; using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
private: private:
typedef Opm::AluCartesianIndexMapper<Grid> CartesianIndexMapper; typedef Opm::AluCartesianIndexMapper<Grid> CartesianIndexMapper;

4
ebos/eclbaseaquifermodel.hh
View File

@ -48,8 +48,8 @@ namespace Opm {
template <class TypeTag> template <class TypeTag>
class EclBaseAquiferModel class EclBaseAquiferModel
{ {
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector; using RateVector = GetPropType<TypeTag, Properties::RateVector>;
public: public:
EclBaseAquiferModel(Simulator& simulator) EclBaseAquiferModel(Simulator& simulator)

12
ebos/eclbasevanguard.hh
View File

@ -100,16 +100,16 @@ namespace Opm {
template <class TypeTag> template <class TypeTag>
class EclBaseVanguard : public BaseVanguard<TypeTag> class EclBaseVanguard : public BaseVanguard<TypeTag>
{ {
typedef BaseVanguard<TypeTag> ParentType; using ParentType = BaseVanguard<TypeTag>;
typedef typename GET_PROP_TYPE(TypeTag, Vanguard) Implementation; using Implementation = GetPropType<TypeTag, Properties::Vanguard>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
enum { enableExperiments = GET_PROP_VALUE(TypeTag, EnableExperiments) }; enum { enableExperiments = GET_PROP_VALUE(TypeTag, EnableExperiments) };
public: public:
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
protected: protected:
static const int dimension = Grid::dimension; static const int dimension = Grid::dimension;

14
ebos/eclcpgridvanguard.hh
View File

@ -54,7 +54,7 @@ NEW_TYPE_TAG(EclCpGridVanguard, INHERITS_FROM(EclBaseVanguard));
// declare the properties // declare the properties
SET_TYPE_PROP(EclCpGridVanguard, Vanguard, Opm::EclCpGridVanguard<TypeTag>); SET_TYPE_PROP(EclCpGridVanguard, Vanguard, Opm::EclCpGridVanguard<TypeTag>);
SET_TYPE_PROP(EclCpGridVanguard, Grid, Dune::CpGrid); SET_TYPE_PROP(EclCpGridVanguard, Grid, Dune::CpGrid);
SET_TYPE_PROP(EclCpGridVanguard, EquilGrid, typename GET_PROP_TYPE(TypeTag, Grid)); SET_TYPE_PROP(EclCpGridVanguard, EquilGrid, GetPropType<TypeTag, Properties::Grid>);
} // namespace Opm::Properties } // namespace Opm::Properties
@ -73,14 +73,14 @@ class EclCpGridVanguard : public EclBaseVanguard<TypeTag>
friend class EclBaseVanguard<TypeTag>; friend class EclBaseVanguard<TypeTag>;
typedef EclBaseVanguard<TypeTag> ParentType; typedef EclBaseVanguard<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper; using ElementMapper = GetPropType<TypeTag, Properties::ElementMapper>;
public: public:
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
typedef typename GET_PROP_TYPE(TypeTag, EquilGrid) EquilGrid; using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
private: private:
typedef Dune::CartesianIndexMapper<Grid> CartesianIndexMapper; typedef Dune::CartesianIndexMapper<Grid> CartesianIndexMapper;

7
ebos/ecldummygradientcalculator.hh
View File

@ -48,10 +48,9 @@ namespace Opm {
template<class TypeTag> template<class TypeTag>
class EclDummyGradientCalculator class EclDummyGradientCalculator
{ {
using GridView = GetPropType<TypeTag, Properties::GridView>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
enum { dimWorld = GridView::dimensionworld }; enum { dimWorld = GridView::dimensionworld };

12
ebos/eclequilinitializer.hh
View File

@ -53,12 +53,12 @@ namespace Opm {
template <class TypeTag> template <class TypeTag>
class EclEquilInitializer class EclEquilInitializer
{ {
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw; using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; using Indices = GetPropType<TypeTag, Properties::Indices>;
enum { numPhases = FluidSystem::numPhases }; enum { numPhases = FluidSystem::numPhases };
enum { oilPhaseIdx = FluidSystem::oilPhaseIdx }; enum { oilPhaseIdx = FluidSystem::oilPhaseIdx };

16
ebos/eclfluxmodule.hh
View File

@ -86,7 +86,7 @@ class EclTransBaseProblem
template <class TypeTag> template <class TypeTag>
class EclTransIntensiveQuantities class EclTransIntensiveQuantities
{ {
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
protected: protected:
void update_(const ElementContext& elemCtx OPM_UNUSED, unsigned dofIdx OPM_UNUSED, unsigned timeIdx OPM_UNUSED) void update_(const ElementContext& elemCtx OPM_UNUSED, unsigned dofIdx OPM_UNUSED, unsigned timeIdx OPM_UNUSED)
{ } { }
@ -99,14 +99,14 @@ protected:
template <class TypeTag> template <class TypeTag>
class EclTransExtensiveQuantities class EclTransExtensiveQuantities
{ {
typedef typename GET_PROP_TYPE(TypeTag, ExtensiveQuantities) Implementation; using Implementation = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation; using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw; using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
enum { dimWorld = GridView::dimensionworld }; enum { dimWorld = GridView::dimensionworld };
enum { gasPhaseIdx = FluidSystem::gasPhaseIdx }; enum { gasPhaseIdx = FluidSystem::gasPhaseIdx };

22
ebos/eclnewtonmethod.hh
View File

@ -54,18 +54,18 @@ template <class TypeTag>
class EclNewtonMethod : public BlackOilNewtonMethod<TypeTag> class EclNewtonMethod : public BlackOilNewtonMethod<TypeTag>
{ {
typedef BlackOilNewtonMethod<TypeTag> ParentType; typedef BlackOilNewtonMethod<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, DiscNewtonMethod) DiscNewtonMethod; using DiscNewtonMethod = GetPropType<TypeTag, Properties::DiscNewtonMethod>;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector; using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) GlobalEqVector; using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
typedef typename GET_PROP_TYPE(TypeTag, EqVector) EqVector; using EqVector = GetPropType<TypeTag, Properties::EqVector>;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; using Indices = GetPropType<TypeTag, Properties::Indices>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Linearizer) Linearizer; using Linearizer = GetPropType<TypeTag, Properties::Linearizer>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
static const unsigned numEq = GET_PROP_VALUE(TypeTag, NumEq); static const unsigned numEq = GET_PROP_VALUE(TypeTag, NumEq);

23
ebos/ecloutputblackoilmodule.hh
View File

@ -70,18 +70,17 @@ class EcfvDiscretization;
template <class TypeTag> template <class TypeTag>
class EclOutputBlackOilModule class EclOutputBlackOilModule
{ {
using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Discretization = GetPropType<TypeTag, Properties::Discretization>;
typedef typename GET_PROP_TYPE(TypeTag, Discretization) Discretization; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw; using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using GridView = GetPropType<TypeTag, Properties::GridView>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using Element = typename GridView::template Codim<0>::Entity;
typedef typename GridView::template Codim<0>::Entity Element; using ElementIterator = typename GridView::template Codim<0>::Iterator;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
enum { numPhases = FluidSystem::numPhases }; enum { numPhases = FluidSystem::numPhases };
enum { oilPhaseIdx = FluidSystem::oilPhaseIdx }; enum { oilPhaseIdx = FluidSystem::oilPhaseIdx };

32
ebos/eclpeacemanwell.hh
View File

@ -73,22 +73,22 @@ class EcfvDiscretization;
template <class TypeTag> template <class TypeTag>
class EclPeacemanWell : public BaseAuxiliaryModule<TypeTag> class EclPeacemanWell : public BaseAuxiliaryModule<TypeTag>
{ {
typedef BaseAuxiliaryModule<TypeTag> AuxModule; using AuxModule = BaseAuxiliaryModule<TypeTag>;
typedef typename AuxModule::NeighborSet NeighborSet; using NeighborSet = typename AuxModule::NeighborSet;
typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter; using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector; using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) GlobalEqVector; using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation; using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
typedef typename GET_PROP_TYPE(TypeTag, Discretization) Discretization; using Discretization = GetPropType<TypeTag, Properties::Discretization>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, IntensiveQuantities) IntensiveQuantities; using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector; using RateVector = GetPropType<TypeTag, Properties::RateVector>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
typedef Opm::MathToolbox<Evaluation> Toolbox; typedef Opm::MathToolbox<Evaluation> Toolbox;
@ -115,8 +115,8 @@ class EclPeacemanWell : public BaseAuxiliaryModule<TypeTag>
static const unsigned gasCompIdx = FluidSystem::gasCompIdx; static const unsigned gasCompIdx = FluidSystem::gasCompIdx;
static const unsigned numModelEq = GET_PROP_VALUE(TypeTag, NumEq); static const unsigned numModelEq = GET_PROP_VALUE(TypeTag, NumEq);
static const unsigned conti0EqIdx = GET_PROP_TYPE(TypeTag, Indices)::conti0EqIdx; static const unsigned conti0EqIdx = GetPropType<TypeTag, Properties::Indices>::conti0EqIdx;
static const unsigned contiEnergyEqIdx = GET_PROP_TYPE(TypeTag, Indices)::contiEnergyEqIdx; static const unsigned contiEnergyEqIdx = GetPropType<TypeTag, Properties::Indices>::contiEnergyEqIdx;
static constexpr unsigned historySize = GET_PROP_VALUE(TypeTag, TimeDiscHistorySize); static constexpr unsigned historySize = GET_PROP_VALUE(TypeTag, TimeDiscHistorySize);

12
ebos/eclpolyhedralgridvanguard.hh
View File

@ -44,7 +44,7 @@ NEW_TYPE_TAG(EclPolyhedralGridVanguard, INHERITS_FROM(EclBaseVanguard));
// declare the properties // declare the properties
SET_TYPE_PROP(EclPolyhedralGridVanguard, Vanguard, Opm::EclPolyhedralGridVanguard<TypeTag>); SET_TYPE_PROP(EclPolyhedralGridVanguard, Vanguard, Opm::EclPolyhedralGridVanguard<TypeTag>);
SET_TYPE_PROP(EclPolyhedralGridVanguard, Grid, Dune::PolyhedralGrid<3, 3>); SET_TYPE_PROP(EclPolyhedralGridVanguard, Grid, Dune::PolyhedralGrid<3, 3>);
SET_TYPE_PROP(EclPolyhedralGridVanguard, EquilGrid, typename GET_PROP_TYPE(TypeTag, Grid)); SET_TYPE_PROP(EclPolyhedralGridVanguard, EquilGrid, GetPropType<TypeTag, Properties::Grid>);
} // namespace Opm::Properties } // namespace Opm::Properties
@ -63,13 +63,13 @@ class EclPolyhedralGridVanguard : public EclBaseVanguard<TypeTag>
friend class EclBaseVanguard<TypeTag>; friend class EclBaseVanguard<TypeTag>;
typedef EclBaseVanguard<TypeTag> ParentType; typedef EclBaseVanguard<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
public: public:
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
typedef typename GET_PROP_TYPE(TypeTag, EquilGrid) EquilGrid; using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
private: private:
typedef Grid* GridPointer; typedef Grid* GridPointer;

70
ebos/eclproblem.hh
View File

@ -176,8 +176,8 @@ SET_TAG_PROP(EclBaseProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
SET_PROP(EclBaseProblem, MaterialLaw) SET_PROP(EclBaseProblem, MaterialLaw)
{ {
private: private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef Opm::ThreePhaseMaterialTraits<Scalar, typedef Opm::ThreePhaseMaterialTraits<Scalar,
/*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx, /*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
@ -194,8 +194,8 @@ public:
SET_PROP(EclBaseProblem, SolidEnergyLaw) SET_PROP(EclBaseProblem, SolidEnergyLaw)
{ {
private: private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::EclThermalLawManager<Scalar, FluidSystem> EclThermalLawManager; typedef Opm::EclThermalLawManager<Scalar, FluidSystem> EclThermalLawManager;
@ -207,8 +207,8 @@ public:
SET_PROP(EclBaseProblem, ThermalConductionLaw) SET_PROP(EclBaseProblem, ThermalConductionLaw)
{ {
private: private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::EclThermalLawManager<Scalar, FluidSystem> EclThermalLawManager; typedef Opm::EclThermalLawManager<Scalar, FluidSystem> EclThermalLawManager;
@ -221,8 +221,8 @@ public:
SET_PROP(EclBaseProblem, Stencil) SET_PROP(EclBaseProblem, Stencil)
{ {
private: private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
public: public:
typedef Opm::EcfvStencil<Scalar, typedef Opm::EcfvStencil<Scalar,
@ -386,17 +386,17 @@ namespace Opm {
* commercial ECLiPSE simulator. * commercial ECLiPSE simulator.
*/ */
template <class TypeTag> template <class TypeTag>
class EclProblem : public GET_PROP_TYPE(TypeTag, BaseProblem) class EclProblem : public GetPropType<TypeTag, Properties::BaseProblem>
{ {
typedef typename GET_PROP_TYPE(TypeTag, BaseProblem) ParentType; using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation; using Implementation = GetPropType<TypeTag, Properties::Problem>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
typedef typename GET_PROP_TYPE(TypeTag, Stencil) Stencil; using Stencil = GetPropType<TypeTag, Properties::Stencil>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) GlobalEqVector; using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
typedef typename GET_PROP_TYPE(TypeTag, EqVector) EqVector; using EqVector = GetPropType<TypeTag, Properties::EqVector>;
// Grid and world dimension // Grid and world dimension
@ -424,24 +424,24 @@ class EclProblem : public GET_PROP_TYPE(TypeTag, BaseProblem)
enum { oilCompIdx = FluidSystem::oilCompIdx }; enum { oilCompIdx = FluidSystem::oilCompIdx };
enum { waterCompIdx = FluidSystem::waterCompIdx }; enum { waterCompIdx = FluidSystem::waterCompIdx };
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector; using RateVector = GetPropType<TypeTag, Properties::RateVector>;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryRateVector) BoundaryRateVector; using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GridView::template Codim<0>::Entity Element; using Element = typename GridView::template Codim<0>::Entity;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager EclMaterialLawManager; using EclMaterialLawManager = typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager;
typedef typename GET_PROP(TypeTag, SolidEnergyLaw)::EclThermalLawManager EclThermalLawManager; using EclThermalLawManager = typename GET_PROP(TypeTag, SolidEnergyLaw)::EclThermalLawManager;
typedef typename EclMaterialLawManager::MaterialLawParams MaterialLawParams; using MaterialLawParams = typename EclMaterialLawManager::MaterialLawParams;
typedef typename EclThermalLawManager::SolidEnergyLawParams SolidEnergyLawParams; using SolidEnergyLawParams = typename EclThermalLawManager::SolidEnergyLawParams;
typedef typename EclThermalLawManager::ThermalConductionLawParams ThermalConductionLawParams; using ThermalConductionLawParams = typename EclThermalLawManager::ThermalConductionLawParams;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw; using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
typedef typename GET_PROP_TYPE(TypeTag, DofMapper) DofMapper; using DofMapper = GetPropType<TypeTag, Properties::DofMapper>;
typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation; using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; using Indices = GetPropType<TypeTag, Properties::Indices>;
typedef typename GET_PROP_TYPE(TypeTag, IntensiveQuantities) IntensiveQuantities; using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
typedef typename GET_PROP_TYPE(TypeTag, EclWellModel) EclWellModel; using EclWellModel = GetPropType<TypeTag, Properties::EclWellModel>;
typedef typename GET_PROP_TYPE(TypeTag, EclAquiferModel) EclAquiferModel; using EclAquiferModel = GetPropType<TypeTag, Properties::EclAquiferModel>;
typedef BlackOilSolventModule<TypeTag> SolventModule; typedef BlackOilSolventModule<TypeTag> SolventModule;
typedef BlackOilPolymerModule<TypeTag> PolymerModule; typedef BlackOilPolymerModule<TypeTag> PolymerModule;

10
ebos/eclthresholdpressure.hh
View File

@ -64,11 +64,11 @@ namespace Opm {
template <class TypeTag> template <class TypeTag>
class EclThresholdPressure class EclThresholdPressure
{ {
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation; using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
enum { enableExperiments = GET_PROP_VALUE(TypeTag, EnableExperiments) }; enum { enableExperiments = GET_PROP_VALUE(TypeTag, EnableExperiments) };
enum { numPhases = FluidSystem::numPhases }; enum { numPhases = FluidSystem::numPhases };

18
ebos/ecltracermodel.hh
View File

@ -60,15 +60,15 @@ namespace Opm {
template <class TypeTag> template <class TypeTag>
class EclTracerModel class EclTracerModel
{ {
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Stencil) Stencil; using Stencil = GetPropType<TypeTag, Properties::Stencil>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector; using RateVector = GetPropType<TypeTag, Properties::RateVector>;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; using Indices = GetPropType<TypeTag, Properties::Indices>;
typedef Opm::DenseAd::Evaluation<Scalar,1> TracerEvaluation; typedef Opm::DenseAd::Evaluation<Scalar,1> TracerEvaluation;

12
ebos/ecltransmissibility.hh
View File

@ -66,12 +66,12 @@ namespace Opm {
template <class TypeTag> template <class TypeTag>
class EclTransmissibility class EclTransmissibility
{ {
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper; using ElementMapper = GetPropType<TypeTag, Properties::ElementMapper>;
typedef typename GridView::Intersection Intersection; using Intersection = typename GridView::Intersection;
static const bool enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy); static const bool enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy);

16
ebos/eclwellmanager.hh
View File

@ -65,14 +65,14 @@ namespace Opm {
template <class TypeTag> template <class TypeTag>
class EclWellManager class EclWellManager
{ {
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation; using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector; using RateVector = GetPropType<TypeTag, Properties::RateVector>;
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) }; enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
enum { numPhases = FluidSystem::numPhases }; enum { numPhases = FluidSystem::numPhases };

20
ebos/eclwriter.hh
View File

@ -149,16 +149,16 @@ bool directVerticalNeighbors(const std::array<int, 3>& cartDims,
template <class TypeTag> template <class TypeTag>
class EclWriter class EclWriter
{ {
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
typedef typename GET_PROP_TYPE(TypeTag, EquilGrid) EquilGrid; using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GridView::template Codim<0>::Entity Element; using Element = typename GridView::template Codim<0>::Entity;
typedef typename GridView::template Codim<0>::Iterator ElementIterator; using ElementIterator = typename GridView::template Codim<0>::Iterator;
typedef CollectDataToIORank<Vanguard> CollectDataToIORankType; typedef CollectDataToIORank<Vanguard> CollectDataToIORankType;

6
ebos/equil/initstateequil.hh
View File

@ -1571,9 +1571,9 @@ equilnum(const Opm::EclipseState& eclipseState,
template<class TypeTag> template<class TypeTag>
class InitialStateComputer class InitialStateComputer
{ {
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
public: public:
template<class MaterialLawManager> template<class MaterialLawManager>

12
ebos/vtkecltracermodule.hh
View File

@ -64,13 +64,13 @@ namespace Opm {
{ {
typedef BaseOutputModule<TypeTag> ParentType; typedef BaseOutputModule<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation; using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
static const int vtkFormat = GET_PROP_VALUE(TypeTag, VtkOutputFormat); static const int vtkFormat = GET_PROP_VALUE(TypeTag, VtkOutputFormat);
typedef Opm::VtkMultiWriter<GridView, vtkFormat> VtkMultiWriter; typedef Opm::VtkMultiWriter<GridView, vtkFormat> VtkMultiWriter;

7
flow/flow_blackoil_dunecpr.cpp
View File

@ -44,9 +44,8 @@ namespace Opm {
SET_PROP(EclFlowProblemSimple, FluidSystem) SET_PROP(EclFlowProblemSimple, FluidSystem)
{ {
private: private:
//typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
public: public:
typedef Opm::BlackOilFluidSystem<Scalar> type; typedef Opm::BlackOilFluidSystem<Scalar> type;
@ -70,7 +69,7 @@ namespace Opm {
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
using TypeTag = TTAG(EclFlowProblemSimple); using TypeTag = Opm::Properties::TTag::EclFlowProblemSimple;
auto mainObject = Opm::Main(argc, argv); auto mainObject = Opm::Main(argc, argv);
return mainObject.runStatic<TypeTag>(); return mainObject.runStatic<TypeTag>();
} }

8
flow/flow_ebos_blackoil.cpp
View File

@ -36,8 +36,8 @@ namespace Opm {
void flowEbosBlackoilSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosBlackoilSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
{ {
typedef TTAG(EclFlowProblem) TypeTag; using TypeTag = Properties::TTag::EclFlowProblem;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(setupTime); Vanguard::setExternalSetupTime(setupTime);
Vanguard::setExternalDeck(deck); Vanguard::setExternalDeck(deck);
@ -46,7 +46,7 @@ void flowEbosBlackoilSetDeck(double setupTime, Deck *deck, EclipseState& eclStat
Vanguard::setExternalSummaryConfig(&summaryConfig); Vanguard::setExternalSummaryConfig(&summaryConfig);
} }
std::unique_ptr<Opm::FlowMainEbos<TTAG(EclFlowProblem)>> std::unique_ptr<Opm::FlowMainEbos<Properties::TTag::EclFlowProblem>>
flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles) flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles)
{ {
// we always want to use the default locale, and thus spare us the trouble // we always want to use the default locale, and thus spare us the trouble
@ -59,7 +59,7 @@ flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFile
Dune::MPIHelper::instance(argc, argv); Dune::MPIHelper::instance(argc, argv);
#endif #endif
return std::make_unique<Opm::FlowMainEbos<TTAG(EclFlowProblem)>>( return std::make_unique<Opm::FlowMainEbos<Properties::TTag::EclFlowProblem>>(
argc, argv, outputCout, outputFiles); argc, argv, outputCout, outputFiles);
} }

2
flow/flow_ebos_blackoil.hpp
View File

@ -28,7 +28,7 @@ void flowEbosBlackoilSetDeck(double setupTime, Deck *deck, EclipseState& eclStat
int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles); int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles);
std::unique_ptr<Opm::FlowMainEbos<TTAG(EclFlowProblem)>> std::unique_ptr<Opm::FlowMainEbos<Properties::TTag::EclFlowProblem>>
flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles); flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles);
} }

6
flow/flow_ebos_brine.cpp
View File

@ -38,8 +38,8 @@ SET_BOOL_PROP(EclFlowBrineProblem, EnableBrine, true);
namespace Opm { namespace Opm {
void flowEbosBrineSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosBrineSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
{ {
typedef TTAG(EclFlowBrineProblem) TypeTag; using TypeTag = Properties::TTag::EclFlowBrineProblem;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(setupTime); Vanguard::setExternalSetupTime(setupTime);
Vanguard::setExternalDeck(deck); Vanguard::setExternalDeck(deck);
@ -63,7 +63,7 @@ int flowEbosBrineMain(int argc, char** argv, bool outputCout, bool outputFiles)
Dune::MPIHelper::instance(argc, argv).rank(); Dune::MPIHelper::instance(argc, argv).rank();
#endif #endif
Opm::FlowMainEbos<TTAG(EclFlowBrineProblem)> Opm::FlowMainEbos<Properties::TTag::EclFlowBrineProblem>
mainfunc {argc, argv, outputCout, outputFiles}; mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute(); return mainfunc.execute();
} }

6
flow/flow_ebos_energy.cpp
View File

@ -38,8 +38,8 @@ SET_BOOL_PROP(EclFlowEnergyProblem, EnableEnergy, true);
namespace Opm { namespace Opm {
void flowEbosEnergySetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosEnergySetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
{ {
typedef TTAG(EclFlowEnergyProblem) TypeTag; using TypeTag = Properties::TTag::EclFlowEnergyProblem;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(setupTime); Vanguard::setExternalSetupTime(setupTime);
Vanguard::setExternalDeck(deck); Vanguard::setExternalDeck(deck);
@ -62,7 +62,7 @@ int flowEbosEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles)
Dune::MPIHelper::instance(argc, argv).rank(); Dune::MPIHelper::instance(argc, argv).rank();
#endif #endif
Opm::FlowMainEbos<TTAG(EclFlowEnergyProblem)> Opm::FlowMainEbos<Properties::TTag::EclFlowEnergyProblem>
mainfunc {argc, argv, outputCout, outputFiles}; mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute(); return mainfunc.execute();
} }

6
flow/flow_ebos_foam.cpp
View File

@ -38,8 +38,8 @@ SET_BOOL_PROP(EclFlowFoamProblem, EnableFoam, true);
namespace Opm { namespace Opm {
void flowEbosFoamSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosFoamSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
{ {
typedef TTAG(EclFlowFoamProblem) TypeTag; using TypeTag = Properties::TTag::EclFlowFoamProblem;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(setupTime); Vanguard::setExternalSetupTime(setupTime);
Vanguard::setExternalDeck(deck); Vanguard::setExternalDeck(deck);
@ -63,7 +63,7 @@ int flowEbosFoamMain(int argc, char** argv, bool outputCout, bool outputFiles)
Dune::MPIHelper::instance(argc, argv).rank(); Dune::MPIHelper::instance(argc, argv).rank();
#endif #endif
Opm::FlowMainEbos<TTAG(EclFlowFoamProblem)> Opm::FlowMainEbos<Properties::TTag::EclFlowFoamProblem>
mainfunc {argc, argv, outputCout, outputFiles}; mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute(); return mainfunc.execute();
} }

10
flow/flow_ebos_gasoil.cpp
View File

@ -45,8 +45,8 @@ private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads // it is unfortunately not possible to simply use 'TypeTag' here because this leads
// to cyclic definitions of some properties. if this happens the compiler error // to cyclic definitions of some properties. if this happens the compiler error
// messages unfortunately are *really* confusing and not really helpful. // messages unfortunately are *really* confusing and not really helpful.
typedef TTAG(EclFlowProblem) BaseTypeTag; using BaseTypeTag = TTag::EclFlowProblem;
typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent), typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@ -62,8 +62,8 @@ public:
namespace Opm { namespace Opm {
void flowEbosGasOilSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosGasOilSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
{ {
typedef TTAG(EclFlowGasOilProblem) TypeTag; using TypeTag = Properties::TTag::EclFlowGasOilProblem;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(setupTime); Vanguard::setExternalSetupTime(setupTime);
Vanguard::setExternalDeck(deck); Vanguard::setExternalDeck(deck);
@ -86,7 +86,7 @@ int flowEbosGasOilMain(int argc, char** argv, bool outputCout, bool outputFiles)
Dune::MPIHelper::instance(argc, argv); Dune::MPIHelper::instance(argc, argv);
#endif #endif
Opm::FlowMainEbos<TTAG(EclFlowGasOilProblem)> Opm::FlowMainEbos<Properties::TTag::EclFlowGasOilProblem>
mainfunc {argc, argv, outputCout, outputFiles} ; mainfunc {argc, argv, outputCout, outputFiles} ;
return mainfunc.execute(); return mainfunc.execute();
} }

10
flow/flow_ebos_oilwater.cpp
View File

@ -45,8 +45,8 @@ private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads // it is unfortunately not possible to simply use 'TypeTag' here because this leads
// to cyclic definitions of some properties. if this happens the compiler error // to cyclic definitions of some properties. if this happens the compiler error
// messages unfortunately are *really* confusing and not really helpful. // messages unfortunately are *really* confusing and not really helpful.
typedef TTAG(EclFlowProblem) BaseTypeTag; using BaseTypeTag = TTag::EclFlowProblem;
typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent), typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@ -62,8 +62,8 @@ public:
namespace Opm { namespace Opm {
void flowEbosOilWaterSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosOilWaterSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
{ {
typedef TTAG(EclFlowOilWaterProblem) TypeTag; using TypeTag = Properties::TTag::EclFlowOilWaterProblem;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(setupTime); Vanguard::setExternalSetupTime(setupTime);
Vanguard::setExternalDeck(deck); Vanguard::setExternalDeck(deck);
@ -85,7 +85,7 @@ int flowEbosOilWaterMain(int argc, char** argv, bool outputCout, bool outputFile
Dune::MPIHelper::instance(argc, argv); Dune::MPIHelper::instance(argc, argv);
#endif #endif
Opm::FlowMainEbos<TTAG(EclFlowOilWaterProblem)> Opm::FlowMainEbos<Properties::TTag::EclFlowOilWaterProblem>
mainfunc {argc, argv, outputCout, outputFiles}; mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute(); return mainfunc.execute();
} }

10
flow/flow_ebos_oilwater_brine.cpp
View File

@ -45,8 +45,8 @@ private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads // it is unfortunately not possible to simply use 'TypeTag' here because this leads
// to cyclic definitions of some properties. if this happens the compiler error // to cyclic definitions of some properties. if this happens the compiler error
// messages unfortunately are *really* confusing and not really helpful. // messages unfortunately are *really* confusing and not really helpful.
typedef TTAG(EclFlowProblem) BaseTypeTag; using BaseTypeTag = TTag::EclFlowProblem;
typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent), typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@ -62,8 +62,8 @@ public:
namespace Opm { namespace Opm {
void flowEbosOilWaterBrineSetDeck(double setupTime, Deck* deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosOilWaterBrineSetDeck(double setupTime, Deck* deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
{ {
typedef TTAG(EclFlowOilWaterBrineProblem) TypeTag; using TypeTag = Properties::TTag::EclFlowOilWaterBrineProblem;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(setupTime); Vanguard::setExternalSetupTime(setupTime);
Vanguard::setExternalDeck(deck); Vanguard::setExternalDeck(deck);
@ -85,7 +85,7 @@ int flowEbosOilWaterBrineMain(int argc, char** argv, bool outputCout, bool outpu
Dune::MPIHelper::instance(argc, argv); Dune::MPIHelper::instance(argc, argv);
#endif #endif
Opm::FlowMainEbos<TTAG(EclFlowOilWaterBrineProblem)> Opm::FlowMainEbos<Properties::TTag::EclFlowOilWaterBrineProblem>
mainfunc {argc, argv, outputCout, outputFiles}; mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute(); return mainfunc.execute();
} }

10
flow/flow_ebos_oilwater_polymer.cpp
View File

@ -46,8 +46,8 @@ private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads // it is unfortunately not possible to simply use 'TypeTag' here because this leads
// to cyclic definitions of some properties. if this happens the compiler error // to cyclic definitions of some properties. if this happens the compiler error
// messages unfortunately are *really* confusing and not really helpful. // messages unfortunately are *really* confusing and not really helpful.
typedef TTAG(EclFlowProblem) BaseTypeTag; using BaseTypeTag = TTag::EclFlowProblem;
typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent), typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@ -63,8 +63,8 @@ public:
namespace Opm { namespace Opm {
void flowEbosOilWaterPolymerSetDeck(double setupTime, Deck* deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosOilWaterPolymerSetDeck(double setupTime, Deck* deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
{ {
typedef TTAG(EclFlowOilWaterPolymerProblem) TypeTag; using TypeTag = Properties::TTag::EclFlowOilWaterPolymerProblem;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(setupTime); Vanguard::setExternalSetupTime(setupTime);
Vanguard::setExternalDeck(deck); Vanguard::setExternalDeck(deck);
@ -86,7 +86,7 @@ int flowEbosOilWaterPolymerMain(int argc, char** argv, bool outputCout, bool out
Dune::MPIHelper::instance(argc, argv); Dune::MPIHelper::instance(argc, argv);
#endif #endif
Opm::FlowMainEbos<TTAG(EclFlowOilWaterPolymerProblem)> Opm::FlowMainEbos<Properties::TTag::EclFlowOilWaterPolymerProblem>
mainfunc {argc, argv, outputCout, outputFiles}; mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute(); return mainfunc.execute();
} }

10
flow/flow_ebos_oilwater_polymer_injectivity.cpp
View File

@ -48,8 +48,8 @@ private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads // it is unfortunately not possible to simply use 'TypeTag' here because this leads
// to cyclic definitions of some properties. if this happens the compiler error // to cyclic definitions of some properties. if this happens the compiler error
// messages unfortunately are *really* confusing and not really helpful. // messages unfortunately are *really* confusing and not really helpful.
typedef TTAG(EclFlowProblem) BaseTypeTag; using BaseTypeTag = TTag::EclFlowProblem;
typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::BlackOilTwoPhaseIndices<0, typedef Opm::BlackOilTwoPhaseIndices<0,
@ -65,8 +65,8 @@ public:
namespace Opm { namespace Opm {
/* void flowEbosOilWaterPolymerInjectivitySetDeck(Deck& deck, EclipseState& eclState) /* void flowEbosOilWaterPolymerInjectivitySetDeck(Deck& deck, EclipseState& eclState)
{ {
typedef TTAG(EclFlowOilWaterPolymerInjectivityProblem) TypeTag; using TypeTag = Properties::TTag::EclFlowOilWaterPolymerInjectivityProblem;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setExternalDeck(&deck, &eclState); Vanguard::setExternalDeck(&deck, &eclState);
} */ } */
@ -84,7 +84,7 @@ int flowEbosOilWaterPolymerInjectivityMain(int argc, char** argv, bool outputCou
Dune::MPIHelper::instance(argc, argv); Dune::MPIHelper::instance(argc, argv);
#endif #endif
Opm::FlowMainEbos<TTAG(EclFlowOilWaterPolymerInjectivityProblem)> Opm::FlowMainEbos<Properties::TTag::EclFlowOilWaterPolymerInjectivityProblem>
mainfunc {argc, argv, outputCout, outputFiles}; mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute(); return mainfunc.execute();
} }

6
flow/flow_ebos_polymer.cpp
View File

@ -38,8 +38,8 @@ SET_BOOL_PROP(EclFlowPolymerProblem, EnablePolymer, true);
namespace Opm { namespace Opm {
void flowEbosPolymerSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosPolymerSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
{ {
typedef TTAG(EclFlowPolymerProblem) TypeTag; using TypeTag = Properties::TTag::EclFlowPolymerProblem;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(setupTime); Vanguard::setExternalSetupTime(setupTime);
Vanguard::setExternalDeck(deck); Vanguard::setExternalDeck(deck);
@ -62,7 +62,7 @@ int flowEbosPolymerMain(int argc, char** argv, bool outputCout, bool outputFiles
Dune::MPIHelper::instance(argc, argv).rank(); Dune::MPIHelper::instance(argc, argv).rank();
#endif #endif
Opm::FlowMainEbos<TTAG(EclFlowPolymerProblem)> Opm::FlowMainEbos<Properties::TTag::EclFlowPolymerProblem>
mainfunc {argc, argv, outputCout, outputFiles}; mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute(); return mainfunc.execute();
} }

6
flow/flow_ebos_solvent.cpp
View File

@ -38,8 +38,8 @@ SET_BOOL_PROP(EclFlowSolventProblem, EnableSolvent, true);
namespace Opm { namespace Opm {
void flowEbosSolventSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosSolventSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
{ {
typedef TTAG(EclFlowSolventProblem) TypeTag; using TypeTag = Properties::TTag::EclFlowSolventProblem;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setExternalSetupTime(setupTime); Vanguard::setExternalSetupTime(setupTime);
Vanguard::setExternalDeck(deck); Vanguard::setExternalDeck(deck);
@ -63,7 +63,7 @@ int flowEbosSolventMain(int argc, char** argv, bool outputCout, bool outputFiles
Dune::MPIHelper::instance(argc, argv).rank(); Dune::MPIHelper::instance(argc, argv).rank();
#endif #endif
Opm::FlowMainEbos<TTAG(EclFlowSolventProblem)> Opm::FlowMainEbos<Properties::TTag::EclFlowSolventProblem>
mainfunc {argc, argv, outputCout, outputFiles}; mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute(); return mainfunc.execute();
} }

6
flow/flow_onephase.cpp
View File

@ -33,8 +33,8 @@ private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads // it is unfortunately not possible to simply use 'TypeTag' here because this leads
// to cyclic definitions of some properties. if this happens the compiler error // to cyclic definitions of some properties. if this happens the compiler error
// messages unfortunately are *really* confusing and not really helpful. // messages unfortunately are *really* confusing and not really helpful.
typedef TTAG(EclFlowProblem) BaseTypeTag; using BaseTypeTag = TTag::EclFlowProblem;
typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::BlackOilOnePhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent), typedef Opm::BlackOilOnePhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@ -51,7 +51,7 @@ public:
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
using TypeTag = TTAG(EclFlowProblemSimple); using TypeTag = Opm::Properties::TTag::EclFlowProblemSimple;
auto mainObject = Opm::Main(argc, argv); auto mainObject = Opm::Main(argc, argv);
return mainObject.runStatic<TypeTag>(); return mainObject.runStatic<TypeTag>();
} }

6
flow/flow_onephase_energy.cpp
View File

@ -33,8 +33,8 @@ private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads // it is unfortunately not possible to simply use 'TypeTag' here because this leads
// to cyclic definitions of some properties. if this happens the compiler error // to cyclic definitions of some properties. if this happens the compiler error
// messages unfortunately are *really* confusing and not really helpful. // messages unfortunately are *really* confusing and not really helpful.
typedef TTAG(EclFlowProblem) BaseTypeTag; using BaseTypeTag = TTag::EclFlowProblem;
typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::BlackOilOnePhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent), typedef Opm::BlackOilOnePhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@ -51,7 +51,7 @@ public:
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
using TypeTag = TTAG(EclFlowProblemSimple); using TypeTag = Opm::Properties::TTag::EclFlowProblemSimple;
auto mainObject = Opm::Main(argc, argv); auto mainObject = Opm::Main(argc, argv);
return mainObject.runStatic<TypeTag>(); return mainObject.runStatic<TypeTag>();
} }

12
opm/simulators/aquifers/AquiferInterface.hpp
View File

@ -44,12 +44,12 @@ template <typename TypeTag>
class AquiferInterface class AquiferInterface
{ {
public: public:
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, Indices) BlackoilIndices; using BlackoilIndices = GetPropType<TypeTag, Properties::Indices>;
typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector; using RateVector = GetPropType<TypeTag, Properties::RateVector>;
typedef typename GET_PROP_TYPE(TypeTag, IntensiveQuantities) IntensiveQuantities; using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
enum { enableTemperature = GET_PROP_VALUE(TypeTag, EnableTemperature) }; enum { enableTemperature = GET_PROP_VALUE(TypeTag, EnableTemperature) };
enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) }; enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };

8
opm/simulators/aquifers/BlackoilAquiferModel.hpp
View File

@ -46,8 +46,8 @@ namespace Opm
template <typename TypeTag> template <typename TypeTag>
class BlackoilAquiferModel class BlackoilAquiferModel
{ {
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector; using RateVector = GetPropType<TypeTag, Properties::RateVector>;
public: public:
explicit BlackoilAquiferModel(Simulator& simulator); explicit BlackoilAquiferModel(Simulator& simulator);
@ -73,8 +73,8 @@ public:
protected: protected:
// --------- Types --------- // --------- Types ---------
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef AquiferCarterTracy<TypeTag> AquiferCarterTracy_object; typedef AquiferCarterTracy<TypeTag> AquiferCarterTracy_object;
typedef AquiferFetkovich<TypeTag> AquiferFetkovich_object; typedef AquiferFetkovich<TypeTag> AquiferFetkovich_object;

20
opm/simulators/flow/BlackoilModelEbos.hpp
View File

@ -109,16 +109,16 @@ namespace Opm {
typedef WellStateFullyImplicitBlackoil WellState; typedef WellStateFullyImplicitBlackoil WellState;
typedef BlackoilModelParametersEbos<TypeTag> ModelParameters; typedef BlackoilModelParametersEbos<TypeTag> ModelParameters;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter; using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector ; using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables ; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; using Indices = GetPropType<TypeTag, Properties::Indices>;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw; using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams; using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
typedef double Scalar; typedef double Scalar;
static const int numEq = Indices::numEq; static const int numEq = Indices::numEq;

2
opm/simulators/flow/BlackoilModelParametersEbos.hpp
View File

@ -104,7 +104,7 @@ namespace Opm
struct BlackoilModelParametersEbos struct BlackoilModelParametersEbos
{ {
private: private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public: public:
/// Max relative change in bhp in single iteration. /// Max relative change in bhp in single iteration.

14
opm/simulators/flow/FlowMainEbos.hpp
View File

@ -70,12 +70,12 @@ namespace Opm
{ {
public: public:
typedef typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager MaterialLawManager; typedef typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager MaterialLawManager;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) EbosSimulator; using EbosSimulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem; using Problem = GetPropType<TypeTag, Properties::Problem>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef Opm::SimulatorFullyImplicitBlackoilEbos<TypeTag> Simulator; typedef Opm::SimulatorFullyImplicitBlackoilEbos<TypeTag> Simulator;
@ -419,7 +419,7 @@ namespace Opm
omp_set_num_threads(std::min(2, omp_get_num_procs())); omp_set_num_threads(std::min(2, omp_get_num_procs()));
#endif #endif
typedef typename GET_PROP_TYPE(TypeTag, ThreadManager) ThreadManager; using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>;
ThreadManager::init(); ThreadManager::init();
} }

12
opm/simulators/flow/Main.hpp
View File

@ -80,7 +80,7 @@ namespace Opm {
template <class TypeTag> template <class TypeTag>
void flowEbosSetDeck(Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosSetDeck(Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
{ {
using Vanguard = typename GET_PROP_TYPE(TypeTag, Vanguard); using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setExternalDeck(deck); Vanguard::setExternalDeck(deck);
Vanguard::setExternalEclState(&eclState); Vanguard::setExternalEclState(&eclState);
Vanguard::setExternalSchedule(&schedule); Vanguard::setExternalSchedule(&schedule);
@ -118,7 +118,7 @@ namespace Opm
class Main class Main
{ {
private: private:
using FlowMainEbosType = Opm::FlowMainEbos<TTAG(EclFlowProblem)>; using FlowMainEbosType = Opm::FlowMainEbos<Opm::Properties::TTag::EclFlowProblem>;
enum class FileOutputMode { enum class FileOutputMode {
//! \brief No output to files. //! \brief No output to files.
@ -159,7 +159,7 @@ namespace Opm
int runDynamic() int runDynamic()
{ {
int exitCode = EXIT_SUCCESS; int exitCode = EXIT_SUCCESS;
if (initialize_<TTAG(FlowEarlyBird)>(exitCode)) { if (initialize_<Properties::TTag::FlowEarlyBird>(exitCode)) {
return dispatchDynamic_(); return dispatchDynamic_();
} else { } else {
return exitCode; return exitCode;
@ -184,7 +184,7 @@ namespace Opm
std::unique_ptr<FlowMainEbosType> initFlowEbosBlackoil(int& exitCode) std::unique_ptr<FlowMainEbosType> initFlowEbosBlackoil(int& exitCode)
{ {
exitCode = EXIT_SUCCESS; exitCode = EXIT_SUCCESS;
if (initialize_<TTAG(FlowEarlyBird)>(exitCode)) { if (initialize_<Properties::TTag::FlowEarlyBird>(exitCode)) {
// TODO: check that this deck really represents a blackoil // TODO: check that this deck really represents a blackoil
// case. E.g. check that number of phases == 3 // case. E.g. check that number of phases == 3
Opm::flowEbosBlackoilSetDeck( Opm::flowEbosBlackoilSetDeck(
@ -341,7 +341,7 @@ namespace Opm
// simulator object. (Which parses the parameters again, but since this is done in an // simulator object. (Which parses the parameters again, but since this is done in an
// identical manner it does not matter.) // identical manner it does not matter.)
typedef TypeTagEarlyBird PreTypeTag; typedef TypeTagEarlyBird PreTypeTag;
typedef typename GET_PROP_TYPE(PreTypeTag, Problem) PreProblem; using PreProblem = GetPropType<PreTypeTag, Properties::Problem>;
PreProblem::setBriefDescription("Flow, an advanced reservoir simulator for ECL-decks provided by the Open Porous Media project."); PreProblem::setBriefDescription("Flow, an advanced reservoir simulator for ECL-decks provided by the Open Porous Media project.");
int status = Opm::FlowMainEbos<PreTypeTag>::setupParameters_(argc_, argv_); int status = Opm::FlowMainEbos<PreTypeTag>::setupParameters_(argc_, argv_);
@ -374,7 +374,7 @@ namespace Opm
deckFilename = EWOMS_GET_PARAM(PreTypeTag, std::string, EclDeckFileName); deckFilename = EWOMS_GET_PARAM(PreTypeTag, std::string, EclDeckFileName);
} }
typedef typename GET_PROP_TYPE(PreTypeTag, Vanguard) PreVanguard; using PreVanguard = GetPropType<PreTypeTag, Properties::Vanguard>;
try { try {
deckFilename = PreVanguard::canonicalDeckPath(deckFilename).string(); deckFilename = PreVanguard::canonicalDeckPath(deckFilename).string();
} }

2
opm/simulators/flow/NonlinearSolverEbos.hpp
View File

@ -58,7 +58,7 @@ namespace Opm {
template <class TypeTag, class PhysicalModel> template <class TypeTag, class PhysicalModel>
class NonlinearSolverEbos class NonlinearSolverEbos
{ {
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public: public:
// Available relaxation scheme types. // Available relaxation scheme types.

18
opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -53,15 +53,15 @@ template<class TypeTag>
class SimulatorFullyImplicitBlackoilEbos class SimulatorFullyImplicitBlackoilEbos
{ {
public: public:
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, Indices) BlackoilIndices; using BlackoilIndices = GetPropType<TypeTag, Properties::Indices>;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw; using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector ; using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams; using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
typedef AdaptiveTimeSteppingEbos<TypeTag> TimeStepper; typedef AdaptiveTimeSteppingEbos<TypeTag> TimeStepper;
typedef Opm::BlackOilPolymerModule<TypeTag> PolymerModule; typedef Opm::BlackOilPolymerModule<TypeTag> PolymerModule;

22
opm/simulators/linalg/ISTLSolverEbos.hpp
View File

@ -66,7 +66,7 @@ struct EclWellModel;
SET_PROP(FlowIstlSolver, SparseMatrixAdapter) SET_PROP(FlowIstlSolver, SparseMatrixAdapter)
{ {
private: private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) }; enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
typedef Opm::MatrixBlock<Scalar, numEq, numEq> Block; typedef Opm::MatrixBlock<Scalar, numEq, numEq> Block;
@ -97,21 +97,21 @@ DenseMatrix transposeDenseMatrix(const DenseMatrix& M)
class ISTLSolverEbos class ISTLSolverEbos
{ {
protected: protected:
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; using GridView = GetPropType<TypeTag, Properties::GridView>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter; using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) Vector; using Vector = GetPropType<TypeTag, Properties::GlobalEqVector>;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; using Indices = GetPropType<TypeTag, Properties::Indices>;
typedef typename GET_PROP_TYPE(TypeTag, EclWellModel) WellModel; using WellModel = GetPropType<TypeTag, Properties::EclWellModel>;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename SparseMatrixAdapter::IstlMatrix Matrix; typedef typename SparseMatrixAdapter::IstlMatrix Matrix;
typedef typename SparseMatrixAdapter::MatrixBlock MatrixBlockType; typedef typename SparseMatrixAdapter::MatrixBlock MatrixBlockType;
typedef typename Vector::block_type BlockVector; typedef typename Vector::block_type BlockVector;
typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation; using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
typedef typename GET_PROP_TYPE(TypeTag, ThreadManager) ThreadManager; using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>;
typedef typename GridView::template Codim<0>::Entity Element; typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
using FlexibleSolverType = Dune::FlexibleSolver<Matrix, Vector>; using FlexibleSolverType = Dune::FlexibleSolver<Matrix, Vector>;
using AbstractOperatorType = Dune::AssembledLinearOperator<Matrix, Vector, Vector>; using AbstractOperatorType = Dune::AssembledLinearOperator<Matrix, Vector, Vector>;
using WellModelOperator = WellModelAsLinearOperator<WellModel, Vector, Vector>; using WellModelOperator = WellModelAsLinearOperator<WellModel, Vector, Vector>;

23
opm/simulators/linalg/ISTLSolverEbosFlexible.hpp
View File

@ -55,13 +55,13 @@ namespace Opm
template <class TypeTag> template <class TypeTag>
class ISTLSolverEbosFlexible class ISTLSolverEbosFlexible
{ {
using GridView = typename GET_PROP_TYPE(TypeTag, GridView); using GridView = GetPropType<TypeTag, Properties::GridView>;
using SparseMatrixAdapter = typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter); using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
using VectorType = typename GET_PROP_TYPE(TypeTag, GlobalEqVector); using VectorType = GetPropType<TypeTag, Properties::GlobalEqVector>;
using Simulator = typename GET_PROP_TYPE(TypeTag, Simulator); using Simulator = GetPropType<TypeTag, Properties::Simulator>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using MatrixType = typename SparseMatrixAdapter::IstlMatrix; using MatrixType = typename SparseMatrixAdapter::IstlMatrix;
using WellModel = typename GET_PROP_TYPE(TypeTag, EclWellModel); using WellModel = GetPropType<TypeTag, Properties::EclWellModel>;
#if HAVE_MPI #if HAVE_MPI
using Communication = Dune::OwnerOverlapCopyCommunication<int, int>; using Communication = Dune::OwnerOverlapCopyCommunication<int, int>;
#else #else
@ -72,16 +72,15 @@ class ISTLSolverEbosFlexible
using SolverType = Dune::FlexibleSolver<MatrixType, VectorType>; using SolverType = Dune::FlexibleSolver<MatrixType, VectorType>;
// for quasiImpesWeights // for quasiImpesWeights
typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) Vector; using Vector = GetPropType<TypeTag, Properties::GlobalEqVector>;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; using Indices = GetPropType<TypeTag, Properties::Indices>;
typedef typename SparseMatrixAdapter::IstlMatrix Matrix; typedef typename SparseMatrixAdapter::IstlMatrix Matrix;
typedef typename SparseMatrixAdapter::MatrixBlock MatrixBlockType; typedef typename SparseMatrixAdapter::MatrixBlock MatrixBlockType;
typedef typename Vector::block_type BlockVector; typedef typename Vector::block_type BlockVector;
typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation; using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
typedef typename GET_PROP_TYPE(TypeTag, ThreadManager) ThreadManager; using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>;
typedef typename GridView::template Codim<0>::Entity Element; typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
public: public:
static void registerParameters() static void registerParameters()

18
opm/simulators/wells/BlackoilWellModel.hpp
View File

@ -78,15 +78,15 @@ namespace Opm {
typedef WellStateFullyImplicitBlackoil WellState; typedef WellStateFullyImplicitBlackoil WellState;
typedef BlackoilModelParametersEbos<TypeTag> ModelParameters; typedef BlackoilModelParametersEbos<TypeTag> ModelParameters;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; using Indices = GetPropType<TypeTag, Properties::Indices>;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector; using RateVector = GetPropType<TypeTag, Properties::RateVector>;
typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) GlobalEqVector; using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter; using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
typedef typename Opm::BaseAuxiliaryModule<TypeTag>::NeighborSet NeighborSet; typedef typename Opm::BaseAuxiliaryModule<TypeTag>::NeighborSet NeighborSet;

4
opm/simulators/wells/WellConnectionAuxiliaryModule.hpp
View File

@ -33,8 +33,8 @@ template<class TypeTag>
class WellConnectionAuxiliaryModule class WellConnectionAuxiliaryModule
: public Opm::BaseAuxiliaryModule<TypeTag> : public Opm::BaseAuxiliaryModule<TypeTag>
{ {
typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) GlobalEqVector; using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter; using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
public: public:

16
opm/simulators/wells/WellInterface.hpp
View File

@ -74,14 +74,14 @@ namespace Opm
static const int Oil = BlackoilPhases::Liquid; static const int Oil = BlackoilPhases::Liquid;
static const int Gas = BlackoilPhases::Vapour; static const int Gas = BlackoilPhases::Vapour;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; using Grid = GetPropType<TypeTag, Properties::Grid>;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; using Indices = GetPropType<TypeTag, Properties::Indices>;
typedef typename GET_PROP_TYPE(TypeTag, IntensiveQuantities) IntensiveQuantities; using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw; using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter; using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector; using RateVector = GetPropType<TypeTag, Properties::RateVector>;
static const int numEq = Indices::numEq; static const int numEq = Indices::numEq;
typedef double Scalar; typedef double Scalar;

10
tests/test_ecl_output.cc
View File

@ -105,10 +105,10 @@ double ecl_sum_get_general_var(const Opm::EclIO::ESmry* smry,
} }
template <class TypeTag> template <class TypeTag>
std::unique_ptr<typename GET_PROP_TYPE(TypeTag, Simulator)> std::unique_ptr<Opm::GetPropType<TypeTag, Opm::Properties::Simulator>>
initSimulator(const char *filename) initSimulator(const char *filename)
{ {
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = Opm::GetPropType<TypeTag, Opm::Properties::Simulator>;
std::string filenameArg = "--ecl-deck-file-name="; std::string filenameArg = "--ecl-deck-file-name=";
filenameArg += filename; filenameArg += filename;
@ -125,12 +125,12 @@ initSimulator(const char *filename)
void test_summary() void test_summary()
{ {
typedef typename TTAG(TestEclOutputTypeTag) TypeTag; using TypeTag = Opm::Properties::TTag::TestEclOutputTypeTag;
const std::string filename = "SUMMARY_DECK_NON_CONSTANT_POROSITY.DATA"; const std::string filename = "SUMMARY_DECK_NON_CONSTANT_POROSITY.DATA";
const std::string casename = "SUMMARY_DECK_NON_CONSTANT_POROSITY"; const std::string casename = "SUMMARY_DECK_NON_CONSTANT_POROSITY";
auto simulator = initSimulator<TypeTag>(filename.data()); auto simulator = initSimulator<TypeTag>(filename.data());
typedef typename GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; using Vanguard = Opm::GetPropType<TypeTag, Opm::Properties::Vanguard>;
typedef Opm::CollectDataToIORank< Vanguard > CollectDataToIORankType; typedef Opm::CollectDataToIORank< Vanguard > CollectDataToIORankType;
CollectDataToIORankType collectToIORank(simulator->vanguard()); CollectDataToIORankType collectToIORank(simulator->vanguard());
Opm::EclOutputBlackOilModule<TypeTag> eclOutputModule(*simulator, collectToIORank); Opm::EclOutputBlackOilModule<TypeTag> eclOutputModule(*simulator, collectToIORank);
@ -270,7 +270,7 @@ int main(int argc, char** argv)
Dune::MPIHelper::instance(argc, argv); Dune::MPIHelper::instance(argc, argv);
#endif #endif
typedef TTAG(TestEclOutputTypeTag) TypeTag; using TypeTag = Opm::Properties::TTag::TestEclOutputTypeTag;
Opm::registerAllParameters_<TypeTag>(); Opm::registerAllParameters_<TypeTag>();
test_summary(); test_summary();
test_readWriteWells(); test_readWriteWells();

59
tests/test_equil.cc
View File

@ -77,10 +77,10 @@ NEW_TYPE_TAG(TestEquilTypeTag, INHERITS_FROM(BlackOilModel, EclBaseProblem));
END_PROPERTIES END_PROPERTIES
template <class TypeTag> template <class TypeTag>
std::unique_ptr<typename GET_PROP_TYPE(TypeTag, Simulator)> std::unique_ptr<Opm::GetPropType<TypeTag, Opm::Properties::Simulator>>
initSimulator(const char *filename) initSimulator(const char *filename)
{ {
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; using Simulator = Opm::GetPropType<TypeTag, Opm::Properties::Simulator>;
std::string filenameArg = "--ecl-deck-file-name="; std::string filenameArg = "--ecl-deck-file-name=";
filenameArg += filename; filenameArg += filename;
@ -98,7 +98,7 @@ initSimulator(const char *filename)
template <class TypeTag> template <class TypeTag>
static void initDefaultFluidSystem() static void initDefaultFluidSystem()
{ {
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
std::vector<std::pair<double, double> > Bo = { std::vector<std::pair<double, double> > Bo = {
{ 101353, 1. }, { 101353, 1. },
@ -179,8 +179,8 @@ void test_PhasePressure()
{ {
const auto record = mkEquilRecord( 0, 1e5, 5, 0, 0, 0 ); const auto record = mkEquilRecord( 0, 1e5, 5, 0, 0, 0 );
using TypeTag = TTAG(TestEquilTypeTag); using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
using FluidSystem = GET_PROP_TYPE(TypeTag, FluidSystem); using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
using TabulatedFunction = Opm::Tabulated1DFunction<double>; using TabulatedFunction = Opm::Tabulated1DFunction<double>;
std::vector<double> x = {0.0,100.0}; std::vector<double> x = {0.0,100.0};
@ -228,8 +228,8 @@ void test_CellSubset()
{ {
using PVal = std::vector<double>; using PVal = std::vector<double>;
using PPress = std::vector<PVal>; using PPress = std::vector<PVal>;
using TypeTag = TTAG(TestEquilTypeTag); using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
using FluidSystem = GET_PROP_TYPE(TypeTag, FluidSystem); using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
auto simulator = initSimulator<TypeTag>("equil_base.DATA"); auto simulator = initSimulator<TypeTag>("equil_base.DATA");
const auto& eclipseState = simulator->vanguard().eclState(); const auto& eclipseState = simulator->vanguard().eclState();
@ -339,8 +339,8 @@ void test_RegMapping()
using PVal = std::vector<double>; using PVal = std::vector<double>;
using PPress = std::vector<PVal>; using PPress = std::vector<PVal>;
using TypeTag = TTAG(TestEquilTypeTag); using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
using FluidSystem = GET_PROP_TYPE(TypeTag, FluidSystem); using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
auto simulator = initSimulator<TypeTag>("equil_base.DATA"); auto simulator = initSimulator<TypeTag>("equil_base.DATA");
initDefaultFluidSystem<TypeTag>(); initDefaultFluidSystem<TypeTag>();
@ -439,8 +439,8 @@ void test_RegMapping()
void test_DeckAllDead() void test_DeckAllDead()
{ {
typedef TTAG(TestEquilTypeTag) TypeTag; using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
auto simulator = initSimulator<TypeTag>("equil_deadfluids.DATA"); auto simulator = initSimulator<TypeTag>("equil_deadfluids.DATA");
const auto& eclipseState = simulator->vanguard().eclState(); const auto& eclipseState = simulator->vanguard().eclState();
Opm::GridManager gm(eclipseState.getInputGrid()); Opm::GridManager gm(eclipseState.getInputGrid());
@ -465,10 +465,11 @@ void test_DeckAllDead()
void test_CapillaryInversion() void test_CapillaryInversion()
{ {
// Test setup. // Test setup.
typedef typename TTAG(TestEquilTypeTag) TypeTag; using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw; using MaterialLaw = Opm::GetPropType<TypeTag, Opm::Properties::MaterialLaw>;
typedef typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager MaterialLawManager; using MaterialLawManager = typename Opm::GetProp<TypeTag, Opm::Properties::MaterialLaw>::EclMaterialLawManager;
auto simulator = initSimulator<TypeTag>("equil_capillary.DATA"); auto simulator = initSimulator<TypeTag>("equil_capillary.DATA");
// Test the capillary inversion for oil-water. // Test the capillary inversion for oil-water.
@ -515,8 +516,8 @@ void test_CapillaryInversion()
void test_DeckWithCapillary() void test_DeckWithCapillary()
{ {
typedef typename TTAG(TestEquilTypeTag) TypeTag; using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
auto simulator = initSimulator<TypeTag>("equil_capillary.DATA"); auto simulator = initSimulator<TypeTag>("equil_capillary.DATA");
auto& eclipseState = simulator->vanguard().eclState(); auto& eclipseState = simulator->vanguard().eclState();
Opm::GridManager gm(eclipseState.getInputGrid()); Opm::GridManager gm(eclipseState.getInputGrid());
@ -553,8 +554,8 @@ void test_DeckWithCapillary()
void test_DeckWithCapillaryOverlap() void test_DeckWithCapillaryOverlap()
{ {
typedef typename TTAG(TestEquilTypeTag) TypeTag; using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
auto simulator = initSimulator<TypeTag>("equil_capillary_overlap.DATA"); auto simulator = initSimulator<TypeTag>("equil_capillary_overlap.DATA");
const auto& eclipseState = simulator->vanguard().eclState(); const auto& eclipseState = simulator->vanguard().eclState();
Opm::GridManager gm(eclipseState.getInputGrid()); Opm::GridManager gm(eclipseState.getInputGrid());
@ -611,8 +612,8 @@ void test_DeckWithCapillaryOverlap()
void test_DeckWithLiveOil() void test_DeckWithLiveOil()
{ {
typedef typename TTAG(TestEquilTypeTag) TypeTag; using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
auto simulator = initSimulator<TypeTag>("equil_liveoil.DATA"); auto simulator = initSimulator<TypeTag>("equil_liveoil.DATA");
const auto& eclipseState = simulator->vanguard().eclState(); const auto& eclipseState = simulator->vanguard().eclState();
Opm::GridManager gm(eclipseState.getInputGrid()); Opm::GridManager gm(eclipseState.getInputGrid());
@ -687,8 +688,8 @@ void test_DeckWithLiveOil()
void test_DeckWithLiveGas() void test_DeckWithLiveGas()
{ {
typedef typename TTAG(TestEquilTypeTag) TypeTag; using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
auto simulator = initSimulator<TypeTag>("equil_livegas.DATA"); auto simulator = initSimulator<TypeTag>("equil_livegas.DATA");
const auto& eclipseState = simulator->vanguard().eclState(); const auto& eclipseState = simulator->vanguard().eclState();
Opm::GridManager gm(eclipseState.getInputGrid()); Opm::GridManager gm(eclipseState.getInputGrid());
@ -765,8 +766,8 @@ void test_DeckWithLiveGas()
void test_DeckWithRSVDAndRVVD() void test_DeckWithRSVDAndRVVD()
{ {
typedef typename TTAG(TestEquilTypeTag) TypeTag; using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
auto simulator = initSimulator<TypeTag>("equil_rsvd_and_rvvd.DATA"); auto simulator = initSimulator<TypeTag>("equil_rsvd_and_rvvd.DATA");
const auto& eclipseState = simulator->vanguard().eclState(); const auto& eclipseState = simulator->vanguard().eclState();
Opm::GridManager gm(eclipseState.getInputGrid()); Opm::GridManager gm(eclipseState.getInputGrid());
@ -863,8 +864,8 @@ void test_DeckWithRSVDAndRVVD()
void test_DeckWithPBVDAndPDVD() void test_DeckWithPBVDAndPDVD()
{ {
typedef typename TTAG(TestEquilTypeTag) TypeTag; using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
auto simulator = initSimulator<TypeTag>("equil_pbvd_and_pdvd.DATA"); auto simulator = initSimulator<TypeTag>("equil_pbvd_and_pdvd.DATA");
const auto& eclipseState = simulator->vanguard().eclState(); const auto& eclipseState = simulator->vanguard().eclState();
Opm::GridManager gm(eclipseState.getInputGrid()); Opm::GridManager gm(eclipseState.getInputGrid());
@ -954,7 +955,7 @@ void test_DeckWithPBVDAndPDVD()
void test_DeckWithSwatinit() void test_DeckWithSwatinit()
{ {
#if 0 #if 0
typedef typename TTAG(TestEquilTypeTag) TypeTag; using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
auto simulator = initSimulator<TypeTag>("equil_capillary_swatinit.DATA"); auto simulator = initSimulator<TypeTag>("equil_capillary_swatinit.DATA");
const auto& eclipseState = simulator->vanguard().eclState(); const auto& eclipseState = simulator->vanguard().eclState();
Opm::GridManager gm(eclipseState.getInputGrid()); Opm::GridManager gm(eclipseState.getInputGrid());
@ -1106,7 +1107,7 @@ try {
Dune::MPIHelper::instance(argc, argv); Dune::MPIHelper::instance(argc, argv);
#endif #endif
typedef TTAG(TestEquilTypeTag) TypeTag; using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
Opm::registerAllParameters_<TypeTag>(); Opm::registerAllParameters_<TypeTag>();
test_PhasePressure(); test_PhasePressure();

8
tests/test_wellmodel.cpp
View File

@ -57,7 +57,7 @@
using StandardWell = Opm::StandardWell<TTAG(EclFlowProblem)>; using StandardWell = Opm::StandardWell<Opm::Properties::TTag::EclFlowProblem>;
struct SetupTest { struct SetupTest {
@ -100,7 +100,7 @@ struct GlobalFixture {
Dune::MPIHelper::instance(argcDummy, argvDummy); Dune::MPIHelper::instance(argcDummy, argvDummy);
#endif #endif
Opm::FlowMainEbos<TTAG(EclFlowProblem)>::setupParameters_(argcDummy, argvDummy); Opm::FlowMainEbos<Opm::Properties::TTag::EclFlowProblem>::setupParameters_(argcDummy, argvDummy);
} }
}; };
@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE(TestStandardWellInput) {
const auto& wells_ecl = setup_test.schedule->getWells(setup_test.current_timestep); const auto& wells_ecl = setup_test.schedule->getWells(setup_test.current_timestep);
BOOST_CHECK_EQUAL( wells_ecl.size(), 2); BOOST_CHECK_EQUAL( wells_ecl.size(), 2);
const Opm::Well& well = wells_ecl[1]; const Opm::Well& well = wells_ecl[1];
const Opm::BlackoilModelParametersEbos<TTAG(EclFlowProblem) > param; const Opm::BlackoilModelParametersEbos<Opm::Properties::TTag::EclFlowProblem> param;
// For the conversion between the surface volume rate and resrevoir voidage rate // For the conversion between the surface volume rate and resrevoir voidage rate
typedef Opm::BlackOilFluidSystem<double> FluidSystem; typedef Opm::BlackOilFluidSystem<double> FluidSystem;
@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE(TestBehavoir) {
{ {
const int nw = wells_ecl.size(); const int nw = wells_ecl.size();
const Opm::BlackoilModelParametersEbos<TTAG(EclFlowProblem)> param; const Opm::BlackoilModelParametersEbos<Opm::Properties::TTag::EclFlowProblem> param;
for (int w = 0; w < nw; ++w) { for (int w = 0; w < nw; ++w) {
// For the conversion between the surface volume rate and resrevoir voidage rate // For the conversion between the surface volume rate and resrevoir voidage rate