Renamed Quadrilateral to Quadrangle (15ac29d4) · Commits · TNL / tnl-dev

src/TNL/Meshes/BuildConfigTags.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		#include <TNL/Meshes/DefaultConfig.h>
		#include <TNL/Meshes/Topologies/Edge.h>
		#include <TNL/Meshes/Topologies/Triangle.h>
		#include <TNL/Meshes/Topologies/Quadrilateral.h>
		#include <TNL/Meshes/Topologies/Quadrangle.h>
		#include <TNL/Meshes/Topologies/Tetrahedron.h>
		#include <TNL/Meshes/Topologies/Hexahedron.h>
		#include <TNL/Meshes/Topologies/Simplex.h>
		@@ -80,7 +80,7 @@ template< typename ConfigTag > struct MeshDeviceTag< ConfigTag, Devices::Cuda >
		template< typename ConfigTag, typename CellTopology > struct MeshCellTopologyTag { enum { enabled = false }; };
		//template< typename ConfigTag > struct MeshCellTopologyTag< ConfigTag, Topologies::Edge > { enum { enabled = true }; };
		//template< typename ConfigTag > struct MeshCellTopologyTag< ConfigTag, Topologies::Triangle > { enum { enabled = true }; };
		//template< typename ConfigTag > struct MeshCellTopologyTag< ConfigTag, Topologies::Quadrilateral > { enum { enabled = true }; };
		//template< typename ConfigTag > struct MeshCellTopologyTag< ConfigTag, Topologies::Quadrangle > { enum { enabled = true }; };
		//template< typename ConfigTag > struct MeshCellTopologyTag< ConfigTag, Topologies::Tetrahedron > { enum { enabled = true }; };
		//template< typename ConfigTag > struct MeshCellTopologyTag< ConfigTag, Topologies::Hexahedron > { enum { enabled = true }; };
		// TODO: Simplex has not been tested yet

src/TNL/Meshes/Geometry/getEntityMeasure.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		#include <TNL/Meshes/Topologies/Vertex.h>
		#include <TNL/Meshes/Topologies/Edge.h>
		#include <TNL/Meshes/Topologies/Triangle.h>
		#include <TNL/Meshes/Topologies/Quadrilateral.h>
		#include <TNL/Meshes/Topologies/Quadrangle.h>
		#include <TNL/Meshes/Topologies/Tetrahedron.h>

		namespace TNL {
		@@ -118,12 +118,12 @@ getEntityMeasure( const Mesh< MeshConfig, Device > & mesh,
		return getTriangleArea( v2 - v0, v1 - v0 );
		}

		// Quadrilateral
		// Quadrangle
		template< typename MeshConfig, typename Device >
		__cuda_callable__
		typename MeshConfig::RealType
		getEntityMeasure( const Mesh< MeshConfig, Device > & mesh,
		const MeshEntity< MeshConfig, Device, Topologies::Quadrilateral > & entity )
		const MeshEntity< MeshConfig, Device, Topologies::Quadrangle > & entity )
		{
		// measure = 0.5 * \|AC x BD\|, where AC and BD are the diagonals
		// Hence, we can use the same formula as for the triangle area.

src/TNL/Meshes/Readers/TNLReader.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ public:
		cellShape = VTK::EntityShape::Line;
		else if( topology == "TNL::Meshes::Topologies::Triangle" )
		cellShape = VTK::EntityShape::Triangle;
		else if( topology == "TNL::Meshes::Topologies::Quadrilateral" )
		else if( topology == "TNL::Meshes::Topologies::Quadrangle" )
		cellShape = VTK::EntityShape::Quad;
		else if( topology == "TNL::Meshes::Topologies::Tetrahedron" )
		cellShape = VTK::EntityShape::Tetra;

src/TNL/Meshes/Topologies/Hexahedron.h

+26 −26

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		#pragma once

		#include <TNL/Meshes/Topologies/Quadrilateral.h>
		#include <TNL/Meshes/Topologies/Quadrangle.h>

		namespace TNL {
		namespace Meshes {
		@@ -46,7 +46,7 @@ struct Subtopology< Hexahedron, 1 >
		template<>
		struct Subtopology< Hexahedron, 2 >
		{
		typedef Quadrilateral Topology;
		typedef Quadrangle Topology;

		static constexpr int count = 6;
		};
		@@ -145,35 +145,35 @@ template<> struct SubentityVertexMap< Hexahedron, Edge, 11, 0> { enum { index =
		template<> struct SubentityVertexMap< Hexahedron, Edge, 11, 1> { enum { index = 4 }; };


		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 0, 0> { enum { index = 0 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 0, 1> { enum { index = 1 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 0, 2> { enum { index = 2 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 0, 3> { enum { index = 3 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 0, 0> { enum { index = 0 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 0, 1> { enum { index = 1 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 0, 2> { enum { index = 2 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 0, 3> { enum { index = 3 }; };

		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 1, 0> { enum { index = 0 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 1, 1> { enum { index = 1 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 1, 2> { enum { index = 5 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 1, 3> { enum { index = 4 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 1, 0> { enum { index = 0 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 1, 1> { enum { index = 1 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 1, 2> { enum { index = 5 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 1, 3> { enum { index = 4 }; };

		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 2, 0> { enum { index = 1 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 2, 1> { enum { index = 2 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 2, 2> { enum { index = 6 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 2, 3> { enum { index = 5 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 2, 0> { enum { index = 1 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 2, 1> { enum { index = 2 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 2, 2> { enum { index = 6 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 2, 3> { enum { index = 5 }; };

		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 3, 0> { enum { index = 2 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 3, 1> { enum { index = 3 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 3, 2> { enum { index = 7 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 3, 3> { enum { index = 6 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 3, 0> { enum { index = 2 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 3, 1> { enum { index = 3 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 3, 2> { enum { index = 7 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 3, 3> { enum { index = 6 }; };

		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 4, 0> { enum { index = 3 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 4, 1> { enum { index = 0 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 4, 2> { enum { index = 4 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 4, 3> { enum { index = 7 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 4, 0> { enum { index = 3 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 4, 1> { enum { index = 0 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 4, 2> { enum { index = 4 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 4, 3> { enum { index = 7 }; };

		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 5, 0> { enum { index = 4 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 5, 1> { enum { index = 5 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 5, 2> { enum { index = 6 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrilateral, 5, 3> { enum { index = 7 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 5, 0> { enum { index = 4 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 5, 1> { enum { index = 5 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 5, 2> { enum { index = 6 }; };
		template<> struct SubentityVertexMap< Hexahedron, Quadrangle, 5, 3> { enum { index = 7 }; };

		} // namespace Topologies
		} // namespace Meshes

src/TNL/Meshes/Topologies/Quadrilateral.h→src/TNL/Meshes/Topologies/Quadrangle.h

+12 −12

Original line number	Diff line number	Diff line
		/***************************************************************************
		Quadrilateral.h - description
		Quadrangle.h - description
		-------------------
		begin : Feb 11, 2014
		copyright : (C) 2014 by Tomas Oberhuber et al.
		@@ -22,14 +22,14 @@ namespace TNL {
		namespace Meshes {
		namespace Topologies {

		struct Quadrilateral
		struct Quadrangle
		{
		static constexpr int dimension = 2;
		};


		template<>
		struct Subtopology< Quadrilateral, 0 >
		struct Subtopology< Quadrangle, 0 >
		{
		typedef Vertex Topology;

		@@ -37,7 +37,7 @@ struct Subtopology< Quadrilateral, 0 >
		};

		template<>
		struct Subtopology< Quadrilateral, 1 >
		struct Subtopology< Quadrangle, 1 >
		{
		typedef Edge Topology;

		@@ -72,17 +72,17 @@ struct Subtopology< Quadrilateral, 1 >
		*
		*/

		template<> struct SubentityVertexMap< Quadrilateral, Edge, 0, 0> { enum { index = 0 }; };
		template<> struct SubentityVertexMap< Quadrilateral, Edge, 0, 1> { enum { index = 1 }; };
		template<> struct SubentityVertexMap< Quadrangle, Edge, 0, 0> { enum { index = 0 }; };
		template<> struct SubentityVertexMap< Quadrangle, Edge, 0, 1> { enum { index = 1 }; };

		template<> struct SubentityVertexMap< Quadrilateral, Edge, 1, 0> { enum { index = 1 }; };
		template<> struct SubentityVertexMap< Quadrilateral, Edge, 1, 1> { enum { index = 2 }; };
		template<> struct SubentityVertexMap< Quadrangle, Edge, 1, 0> { enum { index = 1 }; };
		template<> struct SubentityVertexMap< Quadrangle, Edge, 1, 1> { enum { index = 2 }; };

		template<> struct SubentityVertexMap< Quadrilateral, Edge, 2, 0> { enum { index = 2 }; };
		template<> struct SubentityVertexMap< Quadrilateral, Edge, 2, 1> { enum { index = 3 }; };
		template<> struct SubentityVertexMap< Quadrangle, Edge, 2, 0> { enum { index = 2 }; };
		template<> struct SubentityVertexMap< Quadrangle, Edge, 2, 1> { enum { index = 3 }; };

		template<> struct SubentityVertexMap< Quadrilateral, Edge, 3, 0> { enum { index = 3 }; };
		template<> struct SubentityVertexMap< Quadrilateral, Edge, 3, 1> { enum { index = 0 }; };
		template<> struct SubentityVertexMap< Quadrangle, Edge, 3, 0> { enum { index = 3 }; };
		template<> struct SubentityVertexMap< Quadrangle, Edge, 3, 1> { enum { index = 0 }; };

		} // namespace Topologies
		} // namespace Meshes