Merge branch 'cleanup/replace-leftover-macros' into 'master'

[cleanup] Replace property macros

See merge request !1463

test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh

@@ -79,8 +79,9 @@ template<class TypeTag>
 struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePTwoC> { static constexpr int value = 3; };
 
 //! Use a model with constant tortuosity for the effective diffusivity
-SET_TYPE_PROP(DarcyOnePTwoC, EffectiveDiffusivityModel,
-              DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct EffectiveDiffusivityModel<TypeTag, TTag::DarcyOnePTwoC>
+{ using type = DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>; };
 
 // Set the grid type
 template<class TypeTag>

test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh

@@ -69,8 +69,9 @@ template<class TypeTag>
 struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePThreeC> { static constexpr int value = 3; };
 
 //! Use a model with constant tortuosity for the effective diffusivity
-SET_TYPE_PROP(DarcyOnePThreeC, EffectiveDiffusivityModel,
-              DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>);
+template<class TypeTag>
+struct EffectiveDiffusivityModel<TypeTag, TTag::DarcyOnePThreeC>
+{ using type = DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>; };
 
 // Set the grid type
 template<class TypeTag>

test/multidomain/facet/1p_1p/gravity/main.cc

@@ -28,9 +28,6 @@
 
 #include <dune/common/parallel/mpihelper.hh>
 
-#include "problem_bulk.hh"
-#include "problem_lowdim.hh"
-
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/dumuxmessage.hh>
@@ -49,19 +46,23 @@
 
 #include <dumux/io/vtkoutputmodule.hh>
 
+#include "problem_bulk.hh"
+#include "problem_lowdim.hh"
+
+namespace Dumux {
+
 // obtain/define some types to be used below in the property definitions and in main
 template< class BulkTypeTag, class LowDimTypeTag >
 class TestTraits
 {
-    using BulkFVGridGeometry = typename GET_PROP_TYPE(BulkTypeTag, FVGridGeometry);
-    using LowDimFVGridGeometry = typename GET_PROP_TYPE(LowDimTypeTag, FVGridGeometry);
+    using BulkFVGridGeometry = GetPropType<BulkTypeTag, Properties::FVGridGeometry>;
+    using LowDimFVGridGeometry = GetPropType<LowDimTypeTag, Properties::FVGridGeometry>;
 public:
     using MDTraits = Dumux::MultiDomainTraits<BulkTypeTag, LowDimTypeTag>;
     using CouplingMapper = Dumux::FacetCouplingMapper<BulkFVGridGeometry, LowDimFVGridGeometry>;
     using CouplingManager = Dumux::FacetCouplingManager<MDTraits, CouplingMapper>;
 };
 
-namespace Dumux {
 namespace Properties {
 
 // set cm property in the sub-problems

test/multidomain/facet/1p_1p/linearprofile/main.cc

@@ -27,9 +27,6 @@
 
 #include <dune/common/parallel/mpihelper.hh>
 
-#include "problem_bulk.hh"
-#include "problem_lowdim.hh"
-
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/dumuxmessage.hh>
@@ -48,19 +45,23 @@
 
 #include <dumux/io/vtkoutputmodule.hh>
 
+#include "problem_bulk.hh"
+#include "problem_lowdim.hh"
+
+namespace Dumux {
+
 // obtain/define some types to be used below in the property definitions and in main
 template< class BulkTypeTag, class LowDimTypeTag >
 class TestTraits
 {
-    using BulkFVGridGeometry = typename GET_PROP_TYPE(BulkTypeTag, FVGridGeometry);
-    using LowDimFVGridGeometry = typename GET_PROP_TYPE(LowDimTypeTag, FVGridGeometry);
+    using BulkFVGridGeometry = GetPropType<BulkTypeTag, Properties::FVGridGeometry>;
+    using LowDimFVGridGeometry = GetPropType<LowDimTypeTag, Properties::FVGridGeometry>;
 public:
     using MDTraits = Dumux::MultiDomainTraits<BulkTypeTag, LowDimTypeTag>;
     using CouplingMapper = Dumux::FacetCouplingMapper<BulkFVGridGeometry, LowDimFVGridGeometry>;
     using CouplingManager = Dumux::FacetCouplingManager<MDTraits, CouplingMapper>;
 };
 
-namespace Dumux {
 namespace Properties {
 
 // set cm property in the sub-problems