Commit 7c07f1e1 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Fixed copy-constructor in MeshSuperentityAccessLayer

parent fe39a59b

src/TNL/Meshes/MeshDetails/MeshEntity_impl.h

+1 −23
Original line number Diff line number Diff line
@@ -21,28 +21,13 @@ 
namespace TNL {

namespace Meshes {



template< typename MeshConfig,

          typename EntityTopology >

MeshEntity< MeshConfig, EntityTopology >::

MeshEntity()

{

}



template< typename MeshConfig,

          typename EntityTopology >

MeshEntity< MeshConfig, EntityTopology >::

~MeshEntity()

{

   //cerr << "   Destroying entity with " << EntityTopology::dimensions << " dimensions..." << std::endl;

}



template< typename MeshConfig,

          typename EntityTopology >

String

MeshEntity< MeshConfig, EntityTopology >::

getType()

{

   return String( "Mesh< ... >" );

   return String( "MeshEntity< ... >" );

}



template< typename MeshConfig,
@@ -299,13 +284,6 @@ getTypeVirtual() const 
   return this->getType();

}



template< typename MeshConfig >

MeshEntity< MeshConfig, MeshVertexTopology >::

~MeshEntity()

{

   //cerr << "   Destroying entity with " << MeshVertexTopology::dimensions << " dimensions..." << std::endl;

}



template< typename MeshConfig >

bool

MeshEntity< MeshConfig, MeshVertexTopology >::

src/TNL/Meshes/MeshDetails/layers/MeshSuperentityAccess.h

+2 −0
Original line number Diff line number Diff line
@@ -136,12 +136,14 @@ public: 
   MeshSuperentityAccessLayer() = default;



   explicit MeshSuperentityAccessLayer( const MeshSuperentityAccessLayer& layer )

      : BaseType( layer )

   {

      this->superentityIndices.bind( layer.superentityIndices );

   }



   MeshSuperentityAccessLayer& operator=( const MeshSuperentityAccessLayer& layer )

   {

      BaseType::operator=( layer );

      this->superentityIndices.bind( layer.superentityIndices );

   }

src/TNL/Meshes/MeshEntity.h

+1 −7
Original line number Diff line number Diff line
@@ -54,10 +54,6 @@ class MeshEntity 
      template< int SuperDimensions >

      using SuperentityTraits = typename MeshTraitsType::template SuperentityTraits< EntityTopology, SuperDimensions >;



      MeshEntity();

 

      ~MeshEntity();



      static String getType();



      String getTypeVirtual() const;
@@ -158,8 +154,6 @@ class MeshEntity< MeshConfig, MeshVertexTopology > 


      String getTypeVirtual() const;



      ~MeshEntity();



      bool save( File& file ) const;



      bool load( File& file );

src/UnitTests/Meshes/MeshEntityTest.h

+19 −0
Original line number Diff line number Diff line
@@ -621,6 +621,25 @@ TEST( MeshEntityTest, OneTriangleComparisonTest ) 
   EXPECT_NE( edges[ 0 ], edges[ 1 ] );

   edges[ 1 ].template setSuperentityIndex< 2 >( 0, 1 );

   EXPECT_EQ( edges[ 0 ], edges[ 1 ] );





   /*

    * Tests for copy-assignment

    */

   VertexMeshEntityType v1( vertices[ 0 ] );

   EXPECT_EQ( v1, vertices[ 0 ] );

   VertexMeshEntityType v2 = vertices[ 0 ];

   EXPECT_EQ( v2, vertices[ 0 ] );



   EdgeMeshEntityType e1( edges[ 0 ] );

   EXPECT_EQ( e1, edges[ 0 ] );

   EdgeMeshEntityType e2 = edges[ 0 ];

   EXPECT_EQ( e2, edges[ 0 ] );



   TriangleMeshEntityType t1( triangle );

   EXPECT_EQ( t1, triangle );

   TriangleMeshEntityType t2 = triangle;

   EXPECT_EQ( t2, triangle );

}



#endif