Merge branch 'feature/deprecated-cubetopology' into 'master'

GeometryTypes::cube instead of CubeTopology

See merge request !2602

dumux/discretization/box/subcontrolvolume.hh

@@ -24,6 +24,7 @@
 #ifndef DUMUX_DISCRETIZATION_BOX_SUBCONTROLVOLUME_HH
 #define DUMUX_DISCRETIZATION_BOX_SUBCONTROLVOLUME_HH
 
+#include <dune/geometry/type.hh>
 #include <dune/geometry/multilineargeometry.hh>
 
 #include <dumux/common/math.hh>
@@ -63,7 +64,7 @@ struct BoxDefaultScvGeometryTraits
         struct hasSingleGeometryType
         {
             static const bool v = true;
-            static const unsigned int topologyId = Dune::Impl::CubeTopology< mydim >::type::id;
+            static const unsigned int topologyId = Dune::GeometryTypes::cube(mydim).id();
         };
     };
 

dumux/discretization/box/subcontrolvolumeface.hh

@@ -66,7 +66,7 @@ struct BoxDefaultScvfGeometryTraits
         struct hasSingleGeometryType
         {
             static const bool v = true;
-            static const unsigned int topologyId = Dune::Impl::CubeTopology< mydim >::type::id;
+            static const unsigned int topologyId = Dune::GeometryTypes::cube(mydim).id();
         };
     };
 

dumux/discretization/cellcentered/mpfa/omethod/scvgeometryhelper.hh

@@ -60,7 +60,7 @@ class CCMpfaOScvGeometryHelper
         struct hasSingleGeometryType
         {
             static const bool v = true;
-            static const unsigned int topologyId = Dune::Impl::CubeTopology< d >::type::id;
+            static const unsigned int topologyId = Dune::GeometryTypes::cube(d).id();
         };
     };
 

dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh

@@ -74,7 +74,7 @@ struct CCMpfaDefaultScvfGeometryTraits
         struct hasSingleGeometryType
         {
             static const bool v = true;
-            static const unsigned int topologyId = Dune::Impl::CubeTopology< dim >::type::id;
+            static const unsigned int topologyId = Dune::GeometryTypes::cube(dim).id();
         };
     };