changed: remove NEW_TYPE_TAG macro usage

opm/simulators/flow/BlackoilModelEbos.hpp

@@ -71,7 +71,12 @@
 
 namespace Opm::Properties {
 
-NEW_TYPE_TAG(EclFlowProblem, INHERITS_FROM(BlackOilModel, EclBaseProblem, FlowNonLinearSolver, FlowModelParameters, FlowTimeSteppingParameters));
+namespace TTag {
+struct EclFlowProblem {
+    using InheritsFrom = std::tuple<FlowTimeSteppingParameters, FlowModelParameters,
+                                    FlowNonLinearSolver, EclBaseProblem, BlackOilModel>;
+};
+}
 SET_STRING_PROP(EclFlowProblem, OutputDir, "");
 SET_BOOL_PROP(EclFlowProblem, EnableDebuggingChecks, false);
 // default in flow is to formulate the equations in surface volumes

opm/simulators/flow/BlackoilModelParametersEbos.hpp

@@ -27,7 +27,9 @@
 
 namespace Opm::Properties {
 
-NEW_TYPE_TAG(FlowModelParameters);
+namespace TTag {
+struct FlowModelParameters {};
+}
 
 NEW_PROP_TAG(DbhpMaxRel);
 NEW_PROP_TAG(DwellFractionMax);

opm/simulators/flow/FlowMainEbos.hpp

@@ -69,7 +69,7 @@ namespace Opm
     class FlowMainEbos
     {
     public:
-        typedef typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager MaterialLawManager;
+        using MaterialLawManager = typename GetProp<TypeTag, Properties::MaterialLaw>::EclMaterialLawManager;
         using EbosSimulator = GetPropType<TypeTag, Properties::Simulator>;
         using Grid = GetPropType<TypeTag, Properties::Grid>;
         using GridView = GetPropType<TypeTag, Properties::GridView>;
@@ -89,7 +89,7 @@ namespace Opm
         // Read the command line parameters. Throws an exception if something goes wrong.
         static int setupParameters_(int argc, char** argv)
         {
-            using ParamsMeta = typename GET_PROP(TypeTag, ParameterMetaData);
+            using ParamsMeta = GetProp<TypeTag, Properties::ParameterMetaData>;
             if (!ParamsMeta::registrationOpen()) {
                 // We have already successfully run setupParameters_().
                 // For the dynamically chosen runs (as from the main flow

opm/simulators/flow/Main.hpp

@@ -67,7 +67,11 @@ namespace Opm::Properties {
 
 // this is a dummy type tag that is used to setup the parameters before the actual
 // simulator.
-NEW_TYPE_TAG(FlowEarlyBird, INHERITS_FROM(EclFlowProblem));
+namespace TTag {
+struct FlowEarlyBird {
+    using InheritsFrom = std::tuple<EclFlowProblem>;
+};
+}
 
 } // namespace Opm::Properties
 

opm/simulators/flow/NonlinearSolverEbos.hpp

@@ -36,7 +36,9 @@
 
 namespace Opm::Properties {
 
-NEW_TYPE_TAG(FlowNonLinearSolver);
+namespace TTag {
+struct FlowNonLinearSolver {};
+}
 
 NEW_PROP_TAG(NewtonMaxRelax);
 NEW_PROP_TAG(FlowNewtonMaxIterations);

opm/simulators/linalg/FlowLinearSolverParameters.hpp

@@ -41,7 +41,9 @@ class ISTLSolverEbos;
 
 namespace Opm::Properties {
 
-NEW_TYPE_TAG(FlowIstlSolverParams);
+namespace TTag {
+struct FlowIstlSolverParams {};
+}
 
 NEW_PROP_TAG(LinearSolverReduction);
 NEW_PROP_TAG(IluRelaxation);

opm/simulators/linalg/ISTLSolverEbos.hpp

@@ -56,7 +56,11 @@
 
 namespace Opm::Properties {
 
-NEW_TYPE_TAG(FlowIstlSolver, INHERITS_FROM(FlowIstlSolverParams));
+namespace TTag {
+struct FlowIstlSolver {
+    using InheritsFrom = std::tuple<FlowIstlSolverParams>;
+};
+}
 
 template <class TypeTag, class MyTypeTag>
 struct EclWellModel;

opm/simulators/linalg/ISTLSolverEbosFlexible.hpp

@@ -35,7 +35,11 @@
 
 namespace Opm::Properties {
 
-NEW_TYPE_TAG(FlowIstlSolverFlexible, INHERITS_FROM(FlowIstlSolverParams));
+namespace TTag {
+struct FlowIstlSolverFlexible {
+    using InheritsFrom = std::tuple<FlowIstlSolverParams>;
+};
+}
 
 } // namespace Opm::Properties
 

opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp

@@ -19,7 +19,9 @@
 
 namespace Opm::Properties {
 
-NEW_TYPE_TAG(FlowTimeSteppingParameters);
+namespace TTag {
+struct FlowTimeSteppingParameters {};
+}
 
 NEW_PROP_TAG(SolverRestartFactor);
 NEW_PROP_TAG(SolverGrowthFactor);