Commit 886952e3 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Renamed tnlSubentityIndex to SubentityIndexMap

parent 9efd0a04

src/TNL/Meshes/MeshDetails/traits/MeshSubentityTraits.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public: 
             LocalIndexType subentityVertexIndex >

   struct Vertex

   {

      enum { index = tnlSubentityVertex< EntityTopology,

      enum { index = SubentityVertexMap< EntityTopology,

                                         SubentityTopology,

                                         subentityIndex,

                                         subentityVertexIndex>::index };

src/TNL/Meshes/Topologies/MeshEntityTopology.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ template< typename MeshEntityTopology, 
          typename SubentityTopology,

          int SubentityIndex,

          int SubentityVertexIndex >

struct tnlSubentityVertex

struct SubentityVertexMap

{

};

src/TNL/Meshes/Topologies/MeshHexahedronTopology.h

+48 −48
Original line number Diff line number Diff line
@@ -112,72 +112,72 @@ struct MeshSubtopology< MeshHexahedronTopology, 2 > 
 *

 */



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  0, 0> { enum { index = 0 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  0, 1> { enum { index = 1 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  0, 0> { enum { index = 0 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  0, 1> { enum { index = 1 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  1, 0> { enum { index = 1 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  1, 1> { enum { index = 2 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  1, 0> { enum { index = 1 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  1, 1> { enum { index = 2 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  2, 0> { enum { index = 2 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  2, 1> { enum { index = 3 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  2, 0> { enum { index = 2 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  2, 1> { enum { index = 3 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  3, 0> { enum { index = 3 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  3, 1> { enum { index = 0 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  3, 0> { enum { index = 3 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  3, 1> { enum { index = 0 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  4, 0> { enum { index = 0 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  4, 1> { enum { index = 4 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  4, 0> { enum { index = 0 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  4, 1> { enum { index = 4 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  5, 0> { enum { index = 1 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  5, 1> { enum { index = 5 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  5, 0> { enum { index = 1 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  5, 1> { enum { index = 5 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  6, 0> { enum { index = 2 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  6, 1> { enum { index = 6 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  6, 0> { enum { index = 2 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  6, 1> { enum { index = 6 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  7, 0> { enum { index = 3 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  7, 1> { enum { index = 7 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  7, 0> { enum { index = 3 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  7, 1> { enum { index = 7 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  8, 0> { enum { index = 4 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  8, 1> { enum { index = 5 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  8, 0> { enum { index = 4 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  8, 1> { enum { index = 5 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  9, 0> { enum { index = 5 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology,  9, 1> { enum { index = 6 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  9, 0> { enum { index = 5 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology,  9, 1> { enum { index = 6 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology, 10, 0> { enum { index = 6 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology, 10, 1> { enum { index = 7 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology, 10, 0> { enum { index = 6 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology, 10, 1> { enum { index = 7 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology, 11, 0> { enum { index = 7 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshEdgeTopology, 11, 1> { enum { index = 4 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology, 11, 0> { enum { index = 7 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshEdgeTopology, 11, 1> { enum { index = 4 }; };





template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 0, 0> { enum { index = 0 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 0, 1> { enum { index = 1 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 0, 2> { enum { index = 2 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 0, 3> { enum { index = 3 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 0, 0> { enum { index = 0 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 0, 1> { enum { index = 1 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 0, 2> { enum { index = 2 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 0, 3> { enum { index = 3 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 1, 0> { enum { index = 0 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 1, 1> { enum { index = 1 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 1, 2> { enum { index = 5 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 1, 3> { enum { index = 4 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 1, 0> { enum { index = 0 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 1, 1> { enum { index = 1 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 1, 2> { enum { index = 5 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 1, 3> { enum { index = 4 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 2, 0> { enum { index = 1 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 2, 1> { enum { index = 2 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 2, 2> { enum { index = 6 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 2, 3> { enum { index = 5 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 2, 0> { enum { index = 1 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 2, 1> { enum { index = 2 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 2, 2> { enum { index = 6 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 2, 3> { enum { index = 5 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 3, 0> { enum { index = 2 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 3, 1> { enum { index = 3 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 3, 2> { enum { index = 7 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 3, 3> { enum { index = 6 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 3, 0> { enum { index = 2 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 3, 1> { enum { index = 3 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 3, 2> { enum { index = 7 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 3, 3> { enum { index = 6 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 4, 0> { enum { index = 3 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 4, 1> { enum { index = 0 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 4, 2> { enum { index = 4 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 4, 3> { enum { index = 7 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 4, 0> { enum { index = 3 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 4, 1> { enum { index = 0 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 4, 2> { enum { index = 4 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 4, 3> { enum { index = 7 }; };



template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 5, 0> { enum { index = 4 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 5, 1> { enum { index = 5 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 5, 2> { enum { index = 6 }; };

template<> struct tnlSubentityVertex< MeshHexahedronTopology, MeshQuadrilateralTopology, 5, 3> { enum { index = 7 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 5, 0> { enum { index = 4 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 5, 1> { enum { index = 5 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 5, 2> { enum { index = 6 }; };

template<> struct SubentityVertexMap< MeshHexahedronTopology, MeshQuadrilateralTopology, 5, 3> { enum { index = 7 }; };



} // namespace Meshes

} // namespace TNL

src/TNL/Meshes/Topologies/MeshQuadrilateralTopology.h

+8 −8
Original line number Diff line number Diff line
@@ -76,17 +76,17 @@ struct MeshSubtopology< MeshQuadrilateralTopology, 1 > 
 *

 */



template<> struct tnlSubentityVertex< MeshQuadrilateralTopology, MeshEdgeTopology, 0, 0> { enum { index = 0 }; };

template<> struct tnlSubentityVertex< MeshQuadrilateralTopology, MeshEdgeTopology, 0, 1> { enum { index = 1 }; };

template<> struct SubentityVertexMap< MeshQuadrilateralTopology, MeshEdgeTopology, 0, 0> { enum { index = 0 }; };

template<> struct SubentityVertexMap< MeshQuadrilateralTopology, MeshEdgeTopology, 0, 1> { enum { index = 1 }; };



template<> struct tnlSubentityVertex< MeshQuadrilateralTopology, MeshEdgeTopology, 1, 0> { enum { index = 1 }; };

template<> struct tnlSubentityVertex< MeshQuadrilateralTopology, MeshEdgeTopology, 1, 1> { enum { index = 2 }; };

template<> struct SubentityVertexMap< MeshQuadrilateralTopology, MeshEdgeTopology, 1, 0> { enum { index = 1 }; };

template<> struct SubentityVertexMap< MeshQuadrilateralTopology, MeshEdgeTopology, 1, 1> { enum { index = 2 }; };



template<> struct tnlSubentityVertex< MeshQuadrilateralTopology, MeshEdgeTopology, 2, 0> { enum { index = 2 }; };

template<> struct tnlSubentityVertex< MeshQuadrilateralTopology, MeshEdgeTopology, 2, 1> { enum { index = 3 }; };

template<> struct SubentityVertexMap< MeshQuadrilateralTopology, MeshEdgeTopology, 2, 0> { enum { index = 2 }; };

template<> struct SubentityVertexMap< MeshQuadrilateralTopology, MeshEdgeTopology, 2, 1> { enum { index = 3 }; };



template<> struct tnlSubentityVertex< MeshQuadrilateralTopology, MeshEdgeTopology, 3, 0> { enum { index = 3 }; };

template<> struct tnlSubentityVertex< MeshQuadrilateralTopology, MeshEdgeTopology, 3, 1> { enum { index = 0 }; };

template<> struct SubentityVertexMap< MeshQuadrilateralTopology, MeshEdgeTopology, 3, 0> { enum { index = 3 }; };

template<> struct SubentityVertexMap< MeshQuadrilateralTopology, MeshEdgeTopology, 3, 1> { enum { index = 0 }; };



} // namespace Meshes

} // namespace TNL

src/TNL/Meshes/Topologies/MeshSimplexTopology.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ template< int dimension, 
          typename Subtopology,

          int subtopologyIndex,

          int vertexIndex >

struct tnlSubentityVertex< MeshSimplexTopology< dimension >, Subtopology, subtopologyIndex, vertexIndex >

struct SubentityVertexMap< MeshSimplexTopology< dimension >, Subtopology, subtopologyIndex, vertexIndex >

{

   private:

      static constexpr int subtopologyCount = Subtopology< MeshSimplexTopology< dimension >, Subtopology::dimension >::count;