changed: remove NEW_TYPE_TAG macro usage

This commit is contained in:
Arne Morten Kvarving
2020-08-27 13:01:51 +02:00
parent 914053ac3c
commit e8248b44ff
42 changed files with 213 additions and 56 deletions
+7 -4
View File
@@ -76,13 +76,16 @@
}
BEGIN_PROPERTIES
NEW_TYPE_TAG(TestEclOutputTypeTag, INHERITS_FROM(BlackOilModel, EclBaseProblem));
namespace Opm::Properties {
namespace TTag {
struct TestEclOutputTypeTag {
using InheritsFrom = std::tuple<EclBaseProblem, BlackOilModel>;
};
}
SET_BOOL_PROP(TestEclOutputTypeTag, EnableGravity, false);
SET_BOOL_PROP(TestEclOutputTypeTag, EnableAsyncEclOutput, false);
END_PROPERTIES
} // namespace Opm::Properties
namespace {
std::unique_ptr<Opm::EclIO::ESmry> readsum(const std::string& base)
+7 -5
View File
@@ -70,11 +70,13 @@
throw std::runtime_error("Test condition failed"); \
}
BEGIN_PROPERTIES
NEW_TYPE_TAG(TestEquilTypeTag, INHERITS_FROM(BlackOilModel, EclBaseProblem));
END_PROPERTIES
namespace Opm::Properties {
namespace TTag {
struct TestEquilTypeTag {
using InheritsFrom = std::tuple<EclBaseProblem, BlackOilModel>;
};
}
} // namespace Opm::Properties
template <class TypeTag>
std::unique_ptr<Opm::GetPropType<TypeTag, Opm::Properties::Simulator>>