Improved assertions in MeshFunction and VectorField (2f510c6f) · Commits · TNL / tnl-dev

src/TNL/Functions/MeshFunction_impl.h

+8 −15

Original line number	Diff line number	Diff line
		@@ -62,10 +62,9 @@ MeshFunction( const MeshPointer& meshPointer,
		const IndexType& offset )
		: meshPointer( meshPointer )
		{
		TNL_ASSERT_GE( data.getSize(), 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 > >() );
		}


		@@ -79,10 +78,9 @@ MeshFunction( const MeshPointer& meshPointer,
		const IndexType& offset )
		: meshPointer( meshPointer )
		{
		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,
		@@ -190,11 +188,10 @@ bind( const MeshPointer& meshPointer,
		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->meshPointer = meshPointer;
		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,
		@@ -207,11 +204,10 @@ bind( const MeshPointer& meshPointer,
		const SharedPointer< 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->meshPointer = meshPointer;
		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 > >() );
		}


		@@ -224,9 +220,6 @@ setMesh( 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,

src/TNL/Functions/VectorField.h

+6 −2

Original line number	Diff line number	Diff line
		@@ -187,24 +187,28 @@ class VectorField< Size, MeshFunction< Mesh, MeshEntityDimension, Real > >
		const Vector& data,
		IndexType offset = 0 )
		{
		TNL_ASSERT_GE( data.getSize(), offset + Size * this->vectorField[ 0 ]->getDofs( meshPointer ),
		"Attempt to bind vector which is not large enough." );
		for( int i = 0; i < Size; i ++ )
		{
		this->vectorField[ i ].bind( meshPointer, data, offset );
		offset += this->vectorField[ i ]->getDofs();
		}
		};
		}

		template< typename Vector >
		void bind( const MeshPointer& meshPointer,
		const SharedPointer< Vector >& dataPtr,
		IndexType offset = 0 )
		{
		TNL_ASSERT_GE( dataPtr->getSize(), offset + Size * this->vectorField[ 0 ]->getDofs( meshPointer ),
		"Attempt to bind vector which is not large enough." );
		for( int i = 0; i < Size; i ++ )
		{
		this->vectorField[ i ]->bind( meshPointer, dataPtr, offset );
		offset += this->vectorField[ i ]->getDofs( meshPointer );
		}
		};
		}

		__cuda_callable__
		const FunctionPointer& operator[]( int i ) const

src/TNL/Solvers/ODE/Euler_impl.h

+1 −1

File changed.

Contains only whitespace changes.