Commit 85fc0d89 authored by Hanchuan Wu's avatar Hanchuan Wu
Browse files

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

GeometryTypes::cube instead of CubeTopology

See merge request !2602
parents 4b4423e1 6c31c5c0
Pipeline #3937 passed with stages
in 0 seconds
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#ifndef DUMUX_DISCRETIZATION_BOX_SUBCONTROLVOLUME_HH #ifndef DUMUX_DISCRETIZATION_BOX_SUBCONTROLVOLUME_HH
#define DUMUX_DISCRETIZATION_BOX_SUBCONTROLVOLUME_HH #define DUMUX_DISCRETIZATION_BOX_SUBCONTROLVOLUME_HH
#include <dune/geometry/type.hh>
#include <dune/geometry/multilineargeometry.hh> #include <dune/geometry/multilineargeometry.hh>
#include <dumux/common/math.hh> #include <dumux/common/math.hh>
...@@ -63,7 +64,7 @@ struct BoxDefaultScvGeometryTraits ...@@ -63,7 +64,7 @@ struct BoxDefaultScvGeometryTraits
struct hasSingleGeometryType struct hasSingleGeometryType
{ {
static const bool v = true; 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();
}; };
}; };
......
...@@ -66,7 +66,7 @@ struct BoxDefaultScvfGeometryTraits ...@@ -66,7 +66,7 @@ struct BoxDefaultScvfGeometryTraits
struct hasSingleGeometryType struct hasSingleGeometryType
{ {
static const bool v = true; 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();
}; };
}; };
......
...@@ -60,7 +60,7 @@ class CCMpfaOScvGeometryHelper ...@@ -60,7 +60,7 @@ class CCMpfaOScvGeometryHelper
struct hasSingleGeometryType struct hasSingleGeometryType
{ {
static const bool v = true; 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();
}; };
}; };
......
...@@ -74,7 +74,7 @@ struct CCMpfaDefaultScvfGeometryTraits ...@@ -74,7 +74,7 @@ struct CCMpfaDefaultScvfGeometryTraits
struct hasSingleGeometryType struct hasSingleGeometryType
{ {
static const bool v = true; 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();
}; };
}; };
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment