From cbaac49e083eaa0749d7e409df4fa8467d6eeba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkjak@fjfi.cvut.cz>
Date: Wed, 1 Nov 2017 10:52:54 +0100
Subject: [PATCH] Renamed MeshEntityTopology.h to SubentityVertexMap.h
---
src/TNL/Meshes/MeshConfigBase.h | 2 +-
src/TNL/Meshes/MeshDetails/config/MeshConfigValidator.h | 2 +-
src/TNL/Meshes/MeshDetails/traits/MeshEntityTraits.h | 2 +-
src/TNL/Meshes/MeshDetails/traits/MeshSubentityTraits.h | 2 +-
src/TNL/Meshes/Readers/VTKReader_libvtk.h | 4 ++--
src/TNL/Meshes/Topologies/CMakeLists.txt | 2 +-
src/TNL/Meshes/Topologies/MeshEdgeTopology.h | 2 +-
src/TNL/Meshes/Topologies/MeshSimplexTopology.h | 2 +-
.../{MeshEntityTopology.h => SubentityVertexMap.h} | 6 +-----
9 files changed, 10 insertions(+), 14 deletions(-)
rename src/TNL/Meshes/Topologies/{MeshEntityTopology.h => SubentityVertexMap.h} (88%)
diff --git a/src/TNL/Meshes/MeshConfigBase.h b/src/TNL/Meshes/MeshConfigBase.h
index 539cb37619..ce91b7ea96 100644
--- a/src/TNL/Meshes/MeshConfigBase.h
+++ b/src/TNL/Meshes/MeshConfigBase.h
@@ -18,7 +18,7 @@
#include <TNL/String.h>
#include <TNL/param-types.h>
-#include <TNL/Meshes/Topologies/MeshEntityTopology.h>
+#include <TNL/Meshes/Topologies/SubentityVertexMap.h>
namespace TNL {
namespace Meshes {
diff --git a/src/TNL/Meshes/MeshDetails/config/MeshConfigValidator.h b/src/TNL/Meshes/MeshDetails/config/MeshConfigValidator.h
index 00b393f8f5..5029b19080 100644
--- a/src/TNL/Meshes/MeshDetails/config/MeshConfigValidator.h
+++ b/src/TNL/Meshes/MeshDetails/config/MeshConfigValidator.h
@@ -16,7 +16,7 @@
#pragma once
-#include <TNL/Meshes/Topologies/MeshEntityTopology.h>
+#include <TNL/Meshes/Topologies/SubentityVertexMap.h>
#include <TNL/Meshes/DimensionTag.h>
namespace TNL {
diff --git a/src/TNL/Meshes/MeshDetails/traits/MeshEntityTraits.h b/src/TNL/Meshes/MeshDetails/traits/MeshEntityTraits.h
index 64cf27b3de..76db02b246 100644
--- a/src/TNL/Meshes/MeshDetails/traits/MeshEntityTraits.h
+++ b/src/TNL/Meshes/MeshDetails/traits/MeshEntityTraits.h
@@ -18,7 +18,7 @@
#include <TNL/Containers/Array.h>
#include <TNL/Containers/IndexedSet.h>
-#include <TNL/Meshes/Topologies/MeshEntityTopology.h>
+#include <TNL/Meshes/Topologies/SubentityVertexMap.h>
#include <TNL/Meshes/MeshDetails/traits/MeshTraits.h>
#include <TNL/Meshes/MeshDetails/initializer/MeshEntitySeed.h>
diff --git a/src/TNL/Meshes/MeshDetails/traits/MeshSubentityTraits.h b/src/TNL/Meshes/MeshDetails/traits/MeshSubentityTraits.h
index c007ec27a9..1ffff59005 100644
--- a/src/TNL/Meshes/MeshDetails/traits/MeshSubentityTraits.h
+++ b/src/TNL/Meshes/MeshDetails/traits/MeshSubentityTraits.h
@@ -19,7 +19,7 @@
#include <TNL/Containers/StaticArray.h>
#include <TNL/Meshes/MeshEntity.h>
#include <TNL/Meshes/MeshDetails/traits/MeshEntityTraits.h>
-#include <TNL/Meshes/Topologies/MeshEntityTopology.h>
+#include <TNL/Meshes/Topologies/SubentityVertexMap.h>
#include <TNL/Experimental/Multimaps/StaticEllpackIndexMultimap.h>
namespace TNL {
diff --git a/src/TNL/Meshes/Readers/VTKReader_libvtk.h b/src/TNL/Meshes/Readers/VTKReader_libvtk.h
index 9526f5ed8b..f503b4a9d9 100644
--- a/src/TNL/Meshes/Readers/VTKReader_libvtk.h
+++ b/src/TNL/Meshes/Readers/VTKReader_libvtk.h
@@ -19,7 +19,7 @@
#include <TNL/Containers/StaticVector.h>
#include <TNL/Meshes/MeshBuilder.h>
-#include <TNL/Meshes/Topologies/MeshEntityTopology.h>
+#include <TNL/Meshes/Topologies/SubentityVertexMap.h>
#include <TNL/Meshes/Readers/VTKEntityType.h>
#ifdef HAVE_VTK
@@ -78,7 +78,7 @@ public:
// https://stackoverflow.com/questions/272900/undefined-reference-to-static-class-member/272996#272996
TNL_ASSERT_EQ( this->worldDimension, + MeshType::Config::worldDimension, "world dimensions do not match" );
TNL_ASSERT_EQ( this->meshDimension, + MeshType::Config::meshDimension, "mesh dimensions do not match" );
- const int subvertices = MeshSubtopology< typename MeshType::Config::CellTopology, 0 >::count;
+ const int subvertices = Topologies::Subtopology< typename MeshType::Config::CellTopology, 0 >::count;
TNL_ASSERT_EQ( this->verticesInEntities.at( this->meshDimension ), subvertices, "numbers of cell subvertices do not match" );
using MeshBuilder = MeshBuilder< MeshType >;
diff --git a/src/TNL/Meshes/Topologies/CMakeLists.txt b/src/TNL/Meshes/Topologies/CMakeLists.txt
index 5886da9c40..6ad46481f3 100644
--- a/src/TNL/Meshes/Topologies/CMakeLists.txt
+++ b/src/TNL/Meshes/Topologies/CMakeLists.txt
@@ -1,10 +1,10 @@
SET( headers MeshEdgeTopology.h
- MeshEntityTopology.h
MeshHexahedronTopology.h
MeshQuadrilateralTopology.h
MeshTetrahedronTopology.h
MeshTriangleTopology.h
MeshVertexTopology.h
+ SubentityVertexMap.h
)
INSTALL( FILES ${headers} DESTINATION ${TNL_TARGET_INCLUDE_DIRECTORY}/Meshes/Topologies )
diff --git a/src/TNL/Meshes/Topologies/MeshEdgeTopology.h b/src/TNL/Meshes/Topologies/MeshEdgeTopology.h
index a8e4b4e59c..c8d9c9bd23 100644
--- a/src/TNL/Meshes/Topologies/MeshEdgeTopology.h
+++ b/src/TNL/Meshes/Topologies/MeshEdgeTopology.h
@@ -16,7 +16,7 @@
#pragma once
-#include <TNL/Meshes/Topologies/MeshEntityTopology.h>
+#include <TNL/Meshes/Topologies/SubentityVertexMap.h>
#include <TNL/Meshes/Topologies/MeshVertexTopology.h>
namespace TNL {
diff --git a/src/TNL/Meshes/Topologies/MeshSimplexTopology.h b/src/TNL/Meshes/Topologies/MeshSimplexTopology.h
index 7d0a7e4ff7..39ce80e00c 100644
--- a/src/TNL/Meshes/Topologies/MeshSimplexTopology.h
+++ b/src/TNL/Meshes/Topologies/MeshSimplexTopology.h
@@ -17,7 +17,7 @@
#pragma once
-#include <TNL/Meshes/Topologies/MeshEntityTopology.h>
+#include <TNL/Meshes/Topologies/SubentityVertexMap.h>
#include <TNL/Meshes/Topologies/MeshVertexTopology.h>
namespace TNL {
diff --git a/src/TNL/Meshes/Topologies/MeshEntityTopology.h b/src/TNL/Meshes/Topologies/SubentityVertexMap.h
similarity index 88%
rename from src/TNL/Meshes/Topologies/MeshEntityTopology.h
rename to src/TNL/Meshes/Topologies/SubentityVertexMap.h
index b506f4f5da..89b5fb57e0 100644
--- a/src/TNL/Meshes/Topologies/MeshEntityTopology.h
+++ b/src/TNL/Meshes/Topologies/SubentityVertexMap.h
@@ -1,5 +1,5 @@
/***************************************************************************
- MeshEntityTopology.h - description
+ SubentityVertexMap.h - description
-------------------
begin : Feb 11, 2014
copyright : (C) 2014 by Tomas Oberhuber et al.
@@ -16,10 +16,6 @@
#pragma once
-#include <type_traits>
-
-#include <TNL/Meshes/DimensionTag.h>
-
namespace TNL {
namespace Meshes{
namespace Topologies {
--
GitLab