From a3ea28a385002ee499f213ac3e450032e92235d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkjak@fjfi.cvut.cz> Date: Wed, 3 Jul 2019 13:03:16 +0200 Subject: [PATCH] Used std::vector instead of TNL::Array for ReferenceOrientationArrayType --- src/TNL/Meshes/MeshDetails/initializer/Initializer.h | 4 ++-- src/TNL/Meshes/MeshDetails/traits/MeshEntityTraits.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TNL/Meshes/MeshDetails/initializer/Initializer.h b/src/TNL/Meshes/MeshDetails/initializer/Initializer.h index fe97e530ea..759490234a 100644 --- a/src/TNL/Meshes/MeshDetails/initializer/Initializer.h +++ b/src/TNL/Meshes/MeshDetails/initializer/Initializer.h @@ -366,7 +366,7 @@ class InitializerLayer< MeshConfig, //std::cout << " Initiating entities with dimension " << DimensionTag::value << " ... " << std::endl; const GlobalIndexType numberOfEntities = getEntitiesCount( initializer, mesh ); initializer.template setEntitiesCount< DimensionTag::value >( numberOfEntities ); - this->referenceOrientations.setSize( numberOfEntities ); + this->referenceOrientations.resize( numberOfEntities ); using SubentitySeedsCreator = SubentitySeedsCreator< MeshConfig, Meshes::DimensionTag< MeshType::getMeshDimension() >, DimensionTag >; for( GlobalIndexType i = 0; i < mesh.template getEntitiesCount< MeshType::getMeshDimension() >(); i++ ) @@ -387,7 +387,7 @@ class InitializerLayer< MeshConfig, EntityInitializerType::initSuperentities( initializer, mesh ); this->seedsIndexedSet.clear(); - this->referenceOrientations.reset(); + this->referenceOrientations.clear(); BaseType::initEntities( initializer, points, mesh ); } diff --git a/src/TNL/Meshes/MeshDetails/traits/MeshEntityTraits.h b/src/TNL/Meshes/MeshDetails/traits/MeshEntityTraits.h index c665c461d2..796cc1b1e9 100644 --- a/src/TNL/Meshes/MeshDetails/traits/MeshEntityTraits.h +++ b/src/TNL/Meshes/MeshDetails/traits/MeshEntityTraits.h @@ -63,7 +63,7 @@ public: using StorageArrayType = Containers::Array< EntityType, Device, GlobalIndexType >; using SeedIndexedSetType = Containers::UnorderedIndexedSet< SeedType, GlobalIndexType, typename SeedType::HashType, typename SeedType::KeyEqual >; using SeedSetType = std::unordered_set< typename SeedIndexedSetType::key_type, typename SeedIndexedSetType::hasher, typename SeedIndexedSetType::key_equal >; - using ReferenceOrientationArrayType = Containers::Array< ReferenceOrientationType, Device, GlobalIndexType >; + using ReferenceOrientationArrayType = std::vector< ReferenceOrientationType >; static constexpr bool storageEnabled = MeshConfig::entityStorage( Dimension ); static constexpr bool orientationNeeded = 0 < Dimension && Dimension < MeshConfig::meshDimension; -- GitLab