diff --git a/src/TNL/Meshes/MeshDetails/initializer/EntitySeed.h b/src/TNL/Meshes/MeshDetails/initializer/EntitySeed.h index 5970be03a2fdb299d773ca7cdeaffda5eb597714..74af00889bc083170f20e9eb223542f8ff8cc370 100644 --- a/src/TNL/Meshes/MeshDetails/initializer/EntitySeed.h +++ b/src/TNL/Meshes/MeshDetails/initializer/EntitySeed.h @@ -41,6 +41,9 @@ class EntitySeed using HashType = EntitySeedHash< EntitySeed >; using KeyEqual = EntitySeedEq< EntitySeed >; + //this function is here only for compatibility with MeshReader + void setCornersCount( const LocalIndexType& cornersCount ) {} + static constexpr LocalIndexType getCornersCount() { return SubvertexTraits::count; @@ -81,6 +84,9 @@ class EntitySeed< MeshConfig, Topologies::Vertex > using HashType = EntitySeedHash< EntitySeed >; using KeyEqual = EntitySeedEq< EntitySeed >; + //this function is here only for compatibility with MeshReader + void setCornersCount( const LocalIndexType& cornersCount ) {} + static constexpr LocalIndexType getCornersCount() { return 1; diff --git a/src/TNL/Meshes/Readers/MeshReader.h b/src/TNL/Meshes/Readers/MeshReader.h index 6d7398c28791a027f35b92eb908d08dd86ac8848..5595fac62c93f8bac8e41e38e509739d11aa026a 100644 --- a/src/TNL/Meshes/Readers/MeshReader.h +++ b/src/TNL/Meshes/Readers/MeshReader.h @@ -199,6 +199,7 @@ public: for( std::size_t i = 0; i < NumberOfCells; i++ ) { CellSeedType& seed = meshBuilder.getCellSeed( i ); const std::size_t offsetEnd = offsets[ i ]; + seed.setCornersCount( offsetEnd - offsetStart ); for( std::size_t o = offsetStart; o < offsetEnd; o++ ) seed.setCornerId( o - offsetStart, connectivity[ o ] ); offsetStart = offsetEnd; diff --git a/src/TNL/Meshes/TypeResolver/MeshTypeResolver.hpp b/src/TNL/Meshes/TypeResolver/MeshTypeResolver.hpp index 72d3c8ef7102e847284c7cab880a29f810843e6f..58383c3001beb8aff4f679264de58d9fb71661f0 100644 --- a/src/TNL/Meshes/TypeResolver/MeshTypeResolver.hpp +++ b/src/TNL/Meshes/TypeResolver/MeshTypeResolver.hpp @@ -51,6 +51,8 @@ resolveCellTopology( Reader& reader, Functor&& functor ) return resolveSpaceDimension< Topologies::Tetrahedron >( reader, std::forward<Functor>(functor) ); case VTK::EntityShape::Hexahedron: return resolveSpaceDimension< Topologies::Hexahedron >( reader, std::forward<Functor>(functor) ); + case VTK::EntityShape::Polygon: + return resolveSpaceDimension< Topologies::Polygon >( reader, std::forward<Functor>(functor) ); default: std::cerr << "unsupported cell topology: " << VTK::getShapeName( reader.getCellShape() ) << std::endl; return false; diff --git a/src/TNL/Meshes/Writers/VTKWriter.hpp b/src/TNL/Meshes/Writers/VTKWriter.hpp index 87b7950813cde6e7a2811962789e06c8c9faa677..0a5b44f0bb337cffe1b74e722e20722dac6c80de 100644 --- a/src/TNL/Meshes/Writers/VTKWriter.hpp +++ b/src/TNL/Meshes/Writers/VTKWriter.hpp @@ -65,6 +65,8 @@ struct MeshEntitiesVTKWriter const int verticesPerEntity = VerticesPerEntity< EntityType >::count;; for( Index i = 0; i < entitiesCount; i++ ) { const auto& entity = mesh.template getEntity< EntityType >( i ); + //TODO: polygons require verticesPerEntity to be aquired like below + //const Index verticesPerEntity = entity.template getSubentitiesCount< 0 >(); writeInt( format, str, verticesPerEntity ); for( int j = 0; j < verticesPerEntity; j++ ) writeInt( format, str, entity.template getSubentityIndex< 0 >( j ) ); @@ -445,6 +447,12 @@ VTKWriter< Mesh >::writeEntities( const Mesh& mesh ) const int verticesPerEntity = VerticesPerEntity< EntityType >::count; const std::uint64_t cellsListSize = cellsCount * ( verticesPerEntity + 1 ); + //TODO: polygons need cellsListSize computed like this, but code doesnt compile, + // because function writeEntities is also used for grids, that don't contain function getSubentitiesCount + /*IndexType cellsListSize = cellsCount; + for(IndexType index = 0; index < cellsCount; index++) + cellsListSize += mesh.template getSubentitiesCount< EntityDimension, 0 >( index );*/ + str << std::endl << "CELLS " << cellsCount << " " << cellsListSize << std::endl; EntitiesWriter< EntityDimension >::exec( mesh, str, format ); diff --git a/src/TNL/Meshes/Writers/VTUWriter.hpp b/src/TNL/Meshes/Writers/VTUWriter.hpp index e26b2942aeb44b7315d82effd43d6b48a362bb87..295357bcacb9e4eea74c2d0a431d817611490f38 100644 --- a/src/TNL/Meshes/Writers/VTUWriter.hpp +++ b/src/TNL/Meshes/Writers/VTUWriter.hpp @@ -46,6 +46,8 @@ struct MeshEntitiesVTUCollector const Index verticesPerEntity = VerticesPerEntity< EntityType >::count;; for( Index i = 0; i < entitiesCount; i++ ) { const auto& entity = mesh.template getEntity< EntityType >( i ); + //TODO: polygons require verticesPerEntity to be aquired like below + //const Index verticesPerEntity = entity.template getSubentitiesCount< 0 >(); for( Index j = 0; j < verticesPerEntity; j++ ) connectivity.push_back( entity.template getSubentityIndex< 0 >( j ) ); offsets.push_back( connectivity.size() ); diff --git a/src/Tools/tnl-mesh-converter.cpp b/src/Tools/tnl-mesh-converter.cpp index bbaf821757191456a500a090e946ce98c536c67c..e125c66e3d50b802c028259e4767c40988a7d232 100644 --- a/src/Tools/tnl-mesh-converter.cpp +++ b/src/Tools/tnl-mesh-converter.cpp @@ -43,6 +43,7 @@ template<> struct MeshCellTopologyTag< MeshConverterConfigTag, Topologies::Trian template<> struct MeshCellTopologyTag< MeshConverterConfigTag, Topologies::Quadrangle > { enum { enabled = true }; }; template<> struct MeshCellTopologyTag< MeshConverterConfigTag, Topologies::Tetrahedron > { enum { enabled = true }; }; template<> struct MeshCellTopologyTag< MeshConverterConfigTag, Topologies::Hexahedron > { enum { enabled = true }; }; +//template<> struct MeshCellTopologyTag< MeshConverterConfigTag, Topologies::Polygon > { enum { enabled = true }; }; // Meshes are enabled only for the space dimension equal to the cell dimension. template< typename CellTopology, int SpaceDimension >