Fixed NeighborEntityGetter for 3D grids (2aac55c2) · Commits · TNL / tnl-dev

src/TNL/Meshes/GridDetails/NeighborGridEntityGetter3D_impl.h

+43 −38

Original line number	Diff line number	Diff line
		@@ -63,7 +63,8 @@ class NeighborGridEntityGetter<
		std::cerr << "entity.getCoordinates() + CoordinatesType( stepX, stepY ) = " << entity.getCoordinates() + CoordinatesType( stepX, stepY )
		<< " entity.getMesh().getDimensions() = " << entity.getMesh().getDimensions()
		<< " EntityDimension = " << EntityDimension );
		return NeighborGridEntity( CoordinatesType( entity.getCoordinates().x() + stepX,
		return NeighborGridEntityType( this->entity.getMesh(),
		CoordinatesType( entity.getCoordinates().x() + stepX,
		entity.getCoordinates().y() + stepY,
		entity.getCoordinates().z() + stepZ ) );
		}
		@@ -143,7 +144,8 @@ class NeighborGridEntityGetter<
		std::cerr << "entity.getCoordinates() + CoordinatesType( stepX, stepY ) = " << entity.getCoordinates() + CoordinatesType( stepX, stepY, stepZ )
		<< " entity.getMesh().getDimensions() = " << entity.getMesh().getDimensions()
		<< " EntityDimension = " << EntityDimension );
		return NeighborGridEntityType( this->entity.getMesh(), CoordinatesType( entity.getCoordinates().x() + stepX,
		return NeighborGridEntityType( this->entity.getMesh(),
		CoordinatesType( entity.getCoordinates().x() + stepX,
		entity.getCoordinates().y() + stepY,
		entity.getCoordinates().z() + stepZ ) );
		}
		@@ -462,7 +464,8 @@ class NeighborGridEntityGetter<
		<< entity.getCoordinates() + CoordinatesType( stepX + ( stepX < 0 ), stepY + ( stepY < 0 ), stepZ + ( stepZ < 0 ) )
		<< " entity.getMesh().getDimensions() = " << entity.getMesh().getDimensions()
		<< " EntityDimension = " << EntityDimension );
		return NeighborGridEntity( CoordinatesType( entity.getCoordinates().x() + stepX + ( stepX < 0 ),
		return NeighborGridEntityType( this->entity.getMesh(),
		CoordinatesType( entity.getCoordinates().x() + stepX + ( stepX < 0 ),
		entity.getCoordinates().y() + stepY + ( stepY < 0 ),
		entity.getCoordinates().z() + stepZ + ( stepZ < 0 ) ),
		EntityOrientationType( !!stepX, !!stepY, !!stepZ ),
		@@ -473,7 +476,7 @@ class NeighborGridEntityGetter<
		__cuda_callable__ inline
		IndexType getEntityIndex() const
		{
		return GridEntityGetterType::getEntityIndex( this->entity.getMesh(), getEntity< stepX, stepY, stepZ >( entity ) );
		return GridEntityGetterType::getEntityIndex( this->entity.getMesh(), getEntity< stepX, stepY, stepZ >() );
		}

		__cuda_callable__
		@@ -545,7 +548,8 @@ class NeighborGridEntityGetter<
		<< " entity.getMesh().getDimensions() + CoordinatesType( sign( stepX ), sign( stepY ), sign( stepZ ) ) = "
		<< entity.getMesh().getDimensions() + CoordinatesType( sign( stepX ), sign( stepY ), sign( stepZ ) )
		<< " EntityDimension = " << EntityDimension );
		return NeighborGridEntity( CoordinatesType( entity.getCoordinates().x() + stepX + ( stepX < 0 ),
		return NeighborGridEntityType( this->entity.getMesh(),
		CoordinatesType( entity.getCoordinates().x() + stepX + ( stepX < 0 ),
		entity.getCoordinates().y() + stepY + ( stepY < 0 ),
		entity.getCoordinates().z() + stepZ + ( stepZ < 0 ) ) );
		}
		@@ -554,7 +558,7 @@ class NeighborGridEntityGetter<
		__cuda_callable__ inline
		IndexType getEntityIndex() const
		{
		return GridEntityGetterType::getEntityIndex( entity.getMesh(), getEntity< stepX, stepY, stepZ >( entity ) );
		return GridEntityGetterType::getEntityIndex( entity.getMesh(), getEntity< stepX, stepY, stepZ >() );
		}

		__cuda_callable__
		@@ -627,7 +631,7 @@ class NeighborGridEntityGetter<
		stepZ + ( stepZ < 0 ) * ( entity.getOrientation().z() != 0.0 ) )
		<< " entity.getMesh().getDimensions() = " << entity.getMesh().getDimensions()
		<< " EntityDimension = " << EntityDimension );
		return NeighborGridEntityType( entity.getMesh(),
		return NeighborGridEntityType( this->entity.getMesh(),
		CoordinatesType( entity.getCoordinates().x() + stepX - ( stepX > 0 ) * ( entity.getOrientation().x() != 0.0 ),
		entity.getCoordinates().y() + stepY - ( stepY > 0 ) * ( entity.getOrientation().y() != 0.0 ),
		entity.getCoordinates().z() + stepZ - ( stepZ > 0 ) * ( entity.getOrientation().z() != 0.0 ) ) );
		@@ -695,7 +699,8 @@ class NeighborGridEntityGetter<
		<< entity.getCoordinates() + CoordinatesType( stepX, stepY, stepZ )
		<< " entity.getMesh().getDimensions() = " << entity.getMesh().getDimensions()
		<< " EntityDimension = " << EntityDimension );
		return NeighborGridEntity( CoordinatesType( entity.getCoordinates().x() + stepX,
		return NeighborGridEntityType( this->entity.getMesh(),
		CoordinatesType( entity.getCoordinates().x() + stepX,
		entity.getCoordinates().y() + stepY,
		entity.getCoordinates().z() + stepZ ) );
		}