Commit 36639482 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Simplified assertions in MeshFunction_impl.h

parent e3c2ea07

src/TNL/Functions/MeshFunction_impl.h

+14 −19
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ MeshFunction( const MeshPointer& meshPointer ) 


   this->meshPointer=meshPointer;

   this->data.setSize( getMesh().template getEntitiesCount< typename Mesh::template EntityType< MeshEntityDimension > >() );

   TNL_ASSERT( this->data.getSize() == this->getMesh().template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >(), 

               std::cerr << "this->data.getSize() = " << this->data.getSize() << std::endl

                         << "this->getMesh().template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >() = " << this->getMesh().template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >() );

}



template< typename Mesh,
@@ -203,10 +200,9 @@ MeshFunction< Mesh, MeshEntityDimension, Real >:: 
bind( const Vector& data,

      const IndexType& offset )

{

   TNL_ASSERT_GE( data.getSize(), offset + meshPointer->template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >(),

                  "The input vector is not large enough for binding to the mesh function." );

   this->data.bind( data, offset, getMesh().template getEntitiesCount< typename Mesh::template EntityType< MeshEntityDimension > >() );

   TNL_ASSERT( this->data.getSize() == this->getMesh().template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >(), 

               std::cerr << "this->data.getSize() = " << this->data.getSize() << std::endl

                         << "this->getMesh().template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >() = " << this->getMesh().template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >() );   

}



template< typename Mesh,
@@ -478,9 +474,8 @@ bool 
MeshFunction< Mesh, MeshEntityDimension, Real >::

save( File& file ) const

{

   TNL_ASSERT( this->data.getSize() == this->getMesh().template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >(), 

               std::cerr << "this->data.getSize() = " << this->data.getSize() << std::endl

                         << "this->getMesh().template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >() = " << this->getMesh().template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >() );

   TNL_ASSERT_EQ( this->data.getSize(), this->getMesh().template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >(),

                  "Size of the mesh function data does not match the mesh." );

   if( ! Object::save( file ) )

      return false;

   return this->data.save( file );