changed: remove SET_PROP macro usage

ebos/ebos_altidx.cc

@@ -60,7 +60,8 @@ struct EbosAltIdxTypeTag {
 }
 
 // use a fluid system with different indices than the default
-SET_PROP(EbosAltIdxTypeTag, FluidSystem)
+template<class TypeTag>
+struct FluidSystem<TypeTag, TTag::EbosAltIdxTypeTag>
 {
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 

ebos/ebos_gasoil.cc

@@ -39,7 +39,8 @@ struct EbosGasOilTypeTag {
 }
 
 //! The indices indices which only enable oil and water
-SET_PROP(EbosGasOilTypeTag, Indices)
+template<class TypeTag>
+struct Indices<TypeTag, TTag::EbosGasOilTypeTag>
 {
 private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads

ebos/ebos_oilwater.cc

@@ -39,7 +39,8 @@ struct EbosOilWaterTypeTag {
 }
 
 //! The indices indices which only enable oil and water
-SET_PROP(EbosOilWaterTypeTag, Indices)
+template<class TypeTag>
+struct Indices<TypeTag, TTag::EbosOilWaterTypeTag>
 {
 private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads

ebos/ebos_oilwaterpolymer.cc

@@ -44,7 +44,8 @@ struct EnablePolymer<TypeTag, TTag::EbosOilWaterPolymerTypeTag> {
 };
 
 //! The indices indices which only enable oil and water
-SET_PROP(EbosOilWaterPolymerTypeTag, Indices)
+template<class TypeTag>
+struct Indices<TypeTag, TTag::EbosOilWaterPolymerTypeTag>
 {
 private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads

ebos/eclproblem.hh

@@ -183,7 +183,8 @@ SET_TAG_PROP(EclBaseProblem, SpatialDiscretizationSplice, EcfvDiscretization);
 SET_TAG_PROP(EclBaseProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
 
 // Set the material law for fluid fluxes
-SET_PROP(EclBaseProblem, MaterialLaw)
+template<class TypeTag>
+struct MaterialLaw<TypeTag, TTag::EclBaseProblem>
 {
 private:
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -201,7 +202,8 @@ public:
 };
 
 // Set the material law for energy storage in rock
-SET_PROP(EclBaseProblem, SolidEnergyLaw)
+template<class TypeTag>
+struct SolidEnergyLaw<TypeTag, TTag::EclBaseProblem>
 {
 private:
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -214,7 +216,8 @@ public:
 };
 
 // Set the material law for thermal conduction
-SET_PROP(EclBaseProblem, ThermalConductionLaw)
+template<class TypeTag>
+struct ThermalConductionLaw<TypeTag, TTag::EclBaseProblem>
 {
 private:
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -228,7 +231,8 @@ public:
 
 // ebos can use a slightly faster stencil class because it does not need the normals and
 // the integration points of intersections
-SET_PROP(EclBaseProblem, Stencil)
+template<class TypeTag>
+struct Stencil<TypeTag, TTag::EclBaseProblem>
 {
 private:
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;

flow/flow_blackoil_dunecpr.cpp

@@ -82,7 +82,8 @@ namespace Opm {
         static constexpr auto value = "quasiimpes";
     };
 
-    SET_PROP(EclFlowProblemSimple, FluidSystem)
+    template<class TypeTag>
+    struct FluidSystem<TypeTag, TTag::EclFlowProblemSimple>
     {
     private:
       using Scalar = GetPropType<TypeTag, Properties::Scalar>;

flow/flow_ebos_gasoil.cpp

@@ -43,7 +43,8 @@ struct EclFlowGasOilProblem {
 }
 
 //! The indices required by the model
-SET_PROP(EclFlowGasOilProblem, Indices)
+template<class TypeTag>
+struct Indices<TypeTag, TTag::EclFlowGasOilProblem>
 {
 private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads

flow/flow_ebos_oilwater.cpp

@@ -43,7 +43,8 @@ struct EclFlowOilWaterProblem {
 }
 
 //! The indices required by the model
-SET_PROP(EclFlowOilWaterProblem, Indices)
+template<class TypeTag>
+struct Indices<TypeTag, TTag::EclFlowOilWaterProblem>
 {
 private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads

flow/flow_ebos_oilwater_brine.cpp

@@ -46,7 +46,8 @@ struct EnableBrine<TypeTag, TTag::EclFlowOilWaterBrineProblem> {
     static constexpr bool value = true;
 };
 //! The indices required by the model
-SET_PROP(EclFlowOilWaterBrineProblem, Indices)
+template<class TypeTag>
+struct Indices<TypeTag, TTag::EclFlowOilWaterBrineProblem>
 {
 private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads

flow/flow_ebos_oilwater_polymer.cpp

@@ -46,8 +46,8 @@ struct EnablePolymer<TypeTag, TTag::EclFlowOilWaterPolymerProblem> {
     static constexpr bool value = true;
 };
 //! The indices required by the model
-//! The indices required by the model
+template<class TypeTag>
-SET_PROP(EclFlowOilWaterPolymerProblem, Indices)
+struct Indices<TypeTag, TTag::EclFlowOilWaterPolymerProblem>
 {
 private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads

flow/flow_ebos_oilwater_polymer_injectivity.cpp

@@ -52,7 +52,8 @@ struct EnablePolymerMW<TypeTag, TTag::EclFlowOilWaterPolymerInjectivityProblem>
 //! The indices required by the model
 // For this case, there will be two primary variables introduced for the polymer
 // polymer concentration and polymer molecular weight
-SET_PROP(EclFlowOilWaterPolymerInjectivityProblem, Indices)
+template<class TypeTag>
+struct Indices<TypeTag, TTag::EclFlowOilWaterPolymerInjectivityProblem>
 {
 private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads

flow/flow_onephase.cpp

@@ -31,7 +31,8 @@ struct EclFlowProblemSimple {
 };
 }
 //! The indices required by the model
-SET_PROP(EclFlowProblemSimple, Indices)
+template<class TypeTag>
+struct Indices<TypeTag, TTag::EclFlowProblemSimple>
 {
 private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads

flow/flow_onephase_energy.cpp

@@ -34,7 +34,8 @@ struct EnableEnergy<TypeTag, TTag::EclFlowProblemSimple> {
     static constexpr bool value = true;
 };
 //! The indices required by the model
-SET_PROP(EclFlowProblemSimple, Indices)
+template<class TypeTag>
+struct Indices<TypeTag, TTag::EclFlowProblemSimple>
 {
 private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads

opm/simulators/linalg/ISTLSolverEbos.hpp

@@ -67,7 +67,8 @@ struct EclWellModel;
 
 //! Set the type of a global jacobian matrix for linear solvers that are based on
 //! dune-istl.
-SET_PROP(FlowIstlSolver, SparseMatrixAdapter)
+template<class TypeTag>
+struct SparseMatrixAdapter<TypeTag, TTag::FlowIstlSolver>
 {
 private:
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;