Merge branch 'feature/implement-getpropvalue' into 'master'

[properties] Implement getPropValue as free constexpr function

See merge request !1273

dumux/common/properties/propertysystem.hh

@@ -123,9 +123,9 @@ using GetProp = typename Properties::Detail::GetPropImpl<TypeTag, Property>::typ
 template<class TypeTag, template<class,class> class Property>
 using GetPropType = typename Properties::Detail::GetPropImpl<TypeTag, Property>::type::type;
 
-//! get the value data member of a property (C++17 only, equivalent to old macro GET_PROP_VALUE(...))
-// template<class TypeTag, template<class,class> class Property>
-// constexpr auto getPropValue = Detail::GetPropImpl<TypeTag, Property>::type::value;
+//! get the value data member of a property
+template<class TypeTag, template<class,class> class Property>
+constexpr auto getPropValue() { return Properties::Detail::GetPropImpl<TypeTag, Property>::type::value; }
 
 } // end namespace Dumux
 

test/common/propertysystem/test_propertysystem.cc

@@ -46,6 +46,9 @@ struct Scalar { using type = UndefinedProperty;  };
 template<class TypeTag, class MyTypeTag>
 struct CoordinateType { using type = UndefinedProperty; };
 
+template<class TypeTag, class MyTypeTag>
+struct UseTpfaFlux { using type = UndefinedProperty; };
+
 namespace TTag {
 // create some TypeTags (equivalent to old macro NEW_TYPE_TAG(..., INHERITS_FROM(...)))
 // the tuple is sorted by precedence, the first one overwriting the following
@@ -71,6 +74,9 @@ struct Scalar<TypeTag, TTag::OnePTest> { using type = int; };
 template<class TypeTag>
 struct CoordinateType<TypeTag, TTag::Grid> { using type = GetPropType<TypeTag, Scalar>; };
 
+template<class TypeTag>
+struct UseTpfaFlux<TypeTag, TTag::CCTpfaDisc> { static constexpr bool value = true; };
+
 } // end namespace Properties
 } // end namespace Dumux
 
@@ -105,6 +111,11 @@ int main(int argc, char* argv[]) try
         if (!std::is_same<CoordinateType, float>::value)
             DUNE_THROW(Dune::InvalidStateException, "Property CoordinateType in TTag::CCTpfaDisc should be float but is " << Dune::className<CoordinateType>());
     }
+    {
+        constexpr bool useTpfaFlux = getPropValue<TTag::CCTpfaDisc, UseTpfaFlux>();
+        if (!useTpfaFlux)
+            DUNE_THROW(Dune::InvalidStateException, "Property UseTpfaFlux in TTag::CCTpfaDisc should be true!");
+    }
 
     std::cout << "All tests passed!" << std::endl;
     return 0;