Renamed MeshConfigValidator to ConfigValidator (2961ae41) · Commits · TNL / tnl-dev

src/TNL/Meshes/Mesh.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		#include <TNL/Meshes/MeshEntity.h>
		#include <TNL/Meshes/MeshDetails/traits/MeshTraits.h>
		#include <TNL/Meshes/MeshDetails/layers/MeshStorageLayer.h>
		#include <TNL/Meshes/MeshDetails/config/MeshConfigValidator.h>
		#include <TNL/Meshes/MeshDetails/ConfigValidator.h>

		namespace TNL {
		namespace Meshes {
		@@ -56,6 +56,7 @@ template< typename MeshConfig,
		typename Device = Devices::Host >
		class Mesh
		: public Object,
		public ConfigValidator< MeshConfig >,
		protected MeshStorageLayers< MeshConfig, Device >,
		public MeshInitializableBase< MeshConfig, Device, Mesh< MeshConfig, Device > >
		{
		@@ -178,8 +179,6 @@ class Mesh
		using StorageBaseType::getSubentityStorageNetwork;
		using StorageBaseType::getSuperentityStorageNetwork;

		MeshConfigValidator< MeshConfig > configValidator;

		friend MeshInitializer< MeshConfig >;

		friend BoundaryTagsInitializer< Mesh >;

src/TNL/Meshes/MeshConfigBase.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ struct MeshConfigBase
		* - faces must store the cell indices in the superentity layer
		* - if dim(entity) < dim(face), the entities on which the tags are stored
		* must be stored as subentities of faces
		* TODO: check this in the MeshConfigValidator
		* TODO: check this in the ConfigValidator
		*/
		template< typename EntityTopology >
		static constexpr bool boundaryTagsStorage( EntityTopology )

src/TNL/Meshes/MeshDetails/CMakeLists.txt

+2 −2

Original line number	Diff line number	Diff line
		ADD_SUBDIRECTORY( config )
		ADD_SUBDIRECTORY( initializer )
		ADD_SUBDIRECTORY( layers )
		ADD_SUBDIRECTORY( traits )

		SET( headers IndexPermutationApplier.h
		SET( headers ConfigValidator.h
		IndexPermutationApplier.h
		MeshEntityIndex.h
		MeshEntityIntegrityChecker.h
		MeshEntityOrientation.h

src/TNL/Meshes/MeshDetails/config/MeshConfigValidator.h→src/TNL/Meshes/MeshDetails/ConfigValidator.h

+20 −20

Original line number	Diff line number	Diff line
		/***************************************************************************
		MeshConfigValidator.h - description
		ConfigValidator.h - description
		-------------------
		begin : Aug 14, 2015
		copyright : (C) 2015 by Tomas Oberhuber et al.
		@@ -25,8 +25,8 @@ namespace Meshes {
		template< typename MeshConfig,
		typename EntityTopology,
		typename DimensionTag >
		class MeshConfigValidatorSubtopologyLayer
		: public MeshConfigValidatorSubtopologyLayer< MeshConfig, EntityTopology, typename DimensionTag::Decrement >
		class ConfigValidatorSubtopologyLayer
		: public ConfigValidatorSubtopologyLayer< MeshConfig, EntityTopology, typename DimensionTag::Decrement >
		{
		static_assert( ! MeshConfig::subentityStorage( EntityTopology(), DimensionTag::value ) \|\|
		MeshConfig::entityStorage( EntityTopology::dimension ),
		@@ -41,7 +41,7 @@ class MeshConfigValidatorSubtopologyLayer

		template< typename MeshConfig,
		typename EntityTopology >
		class MeshConfigValidatorSubtopologyLayer< MeshConfig, EntityTopology, DimensionTag< 0 > >
		class ConfigValidatorSubtopologyLayer< MeshConfig, EntityTopology, DimensionTag< 0 > >
		{
		static_assert( ! MeshConfig::subentityStorage( EntityTopology(), 0 ) \|\|
		MeshConfig::entityStorage( EntityTopology::dimension ),
		@@ -54,8 +54,8 @@ class MeshConfigValidatorSubtopologyLayer< MeshConfig, EntityTopology, Dimension
		template< typename MeshConfig,
		typename EntityTopology,
		typename DimensionTag >
		class MeshConfigValidatorSupertopologyLayer
		: public MeshConfigValidatorSupertopologyLayer< MeshConfig, EntityTopology, typename DimensionTag::Decrement >
		class ConfigValidatorSupertopologyLayer
		: public ConfigValidatorSupertopologyLayer< MeshConfig, EntityTopology, typename DimensionTag::Decrement >
		{
		static_assert( ! MeshConfig::superentityStorage( EntityTopology(), DimensionTag::value ) \|\|
		MeshConfig::entityStorage( EntityTopology::dimension ),
		@@ -67,14 +67,14 @@ class MeshConfigValidatorSupertopologyLayer

		template< typename MeshConfig,
		typename EntityTopology >
		class MeshConfigValidatorSupertopologyLayer< MeshConfig, EntityTopology, DimensionTag< EntityTopology::dimension > >
		class ConfigValidatorSupertopologyLayer< MeshConfig, EntityTopology, DimensionTag< EntityTopology::dimension > >
		{};


		template< typename MeshConfig,
		typename EntityTopology,
		bool BoundaryTagsStorage = MeshConfig::boundaryTagsStorage( EntityTopology() ) >
		class MeshConfigValidatorBoundaryTagsLayer
		class ConfigValidatorBoundaryTagsLayer
		{
		using FaceTopology = typename Topologies::Subtopology< typename MeshConfig::CellTopology, MeshConfig::meshDimension - 1 >::Topology;

		@@ -88,21 +88,21 @@ class MeshConfigValidatorBoundaryTagsLayer

		template< typename MeshConfig,
		typename EntityTopology >
		class MeshConfigValidatorBoundaryTagsLayer< MeshConfig, EntityTopology, false >
		class ConfigValidatorBoundaryTagsLayer< MeshConfig, EntityTopology, false >
		{
		};


		template< typename MeshConfig, int dimension >
		class MeshConfigValidatorLayer
		: public MeshConfigValidatorLayer< MeshConfig, dimension - 1 >,
		public MeshConfigValidatorSubtopologyLayer< MeshConfig,
		class ConfigValidatorLayer
		: public ConfigValidatorLayer< MeshConfig, dimension - 1 >,
		public ConfigValidatorSubtopologyLayer< MeshConfig,
		typename Topologies::Subtopology< typename MeshConfig::CellTopology, dimension >::Topology,
		DimensionTag< dimension - 1 > >,
		public MeshConfigValidatorSupertopologyLayer< MeshConfig,
		public ConfigValidatorSupertopologyLayer< MeshConfig,
		typename Topologies::Subtopology< typename MeshConfig::CellTopology, dimension >::Topology,
		DimensionTag< MeshConfig::CellTopology::dimension > >,
		public MeshConfigValidatorBoundaryTagsLayer< MeshConfig,
		public ConfigValidatorBoundaryTagsLayer< MeshConfig,
		typename Topologies::Subtopology< typename MeshConfig::CellTopology, dimension >::Topology >
		{
		using Topology = typename Topologies::Subtopology< typename MeshConfig::CellTopology, dimension >::Topology;
		@@ -113,14 +113,14 @@ class MeshConfigValidatorLayer
		};

		template< typename MeshConfig >
		class MeshConfigValidatorLayer< MeshConfig, 0 >
		class ConfigValidatorLayer< MeshConfig, 0 >
		{
		};

		template< typename MeshConfig >
		class MeshConfigValidatorLayerCell
		: public MeshConfigValidatorLayer< MeshConfig, MeshConfig::CellTopology::dimension - 1 >,
		public MeshConfigValidatorSubtopologyLayer< MeshConfig,
		class ConfigValidatorLayerCell
		: public ConfigValidatorLayer< MeshConfig, MeshConfig::CellTopology::dimension - 1 >,
		public ConfigValidatorSubtopologyLayer< MeshConfig,
		typename MeshConfig::CellTopology,
		DimensionTag< MeshConfig::CellTopology::dimension - 1 > >
		{
		@@ -133,8 +133,8 @@ class MeshConfigValidatorLayerCell
		};

		template< typename MeshConfig >
		class MeshConfigValidator
		: public MeshConfigValidatorLayerCell< MeshConfig >
		class ConfigValidator
		: public ConfigValidatorLayerCell< MeshConfig >
		{
		static constexpr int meshDimension = MeshConfig::CellTopology::dimension;

src/TNL/Meshes/MeshDetails/config/CMakeLists.txt

deleted100644 → 0

+0 −3

Original line number	Diff line number	Diff line
		SET( headers MeshConfigValidator.h )

		INSTALL( FILES ${headers} DESTINATION ${TNL_TARGET_INCLUDE_DIRECTORY}/Meshes/MeshDetails/config )
		No newline at end of file