Commit 4d7c5d66 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Restored CUDA grid traverser.

parent 8f89a95f
Loading
Loading
Loading
Loading
+19 −5
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ GridTraverser2D(
   coordinates.x() = begin.x() + ( gridXIdx * Devices::Cuda::getMaxGridSize() + blockIdx.x ) * blockDim.x + threadIdx.x;
   coordinates.y() = begin.y() + ( gridYIdx * Devices::Cuda::getMaxGridSize() + blockIdx.y ) * blockDim.y + threadIdx.y;  

   if( ( !processOnlyBoundaryEntities && coordinates <= end ) ||
   /*if( ( !processOnlyBoundaryEntities && coordinates <= end ) ||
       (  processOnlyBoundaryEntities &&
          ( coordinates.x() == begin.x() || coordinates.y() == begin.y() ||
            coordinates.x() == end.x() || coordinates.y() == end.y() ) ) )
@@ -320,8 +320,22 @@ GridTraverser2D(
      GridEntity entity( *grid, coordinates, gridEntityParameters... );
      entity.refresh();
      EntitiesProcessor::processEntity( entity.getMesh(), *userData, entity );      
   }*/
   
   if( coordinates <= end )
   {
      GridEntity entity( *grid, coordinates, gridEntityParameters... );
      entity.refresh();
      if( ! processOnlyBoundaryEntities || entity.isBoundaryEntity() )
      {
         EntitiesProcessor::processEntity
         ( *grid,
           *userData,
           entity );
      }
   }
   
}
#endif

template< typename Real,
@@ -520,7 +534,7 @@ GridTraverser3D(
   coordinates.z() = begin.z() + ( gridZIdx * Devices::Cuda::getMaxGridSize() + blockIdx.z ) * blockDim.z + threadIdx.z;

   
   if( ( !processOnlyBoundaryEntities && coordinates <= end ) ||
   /*if( ( !processOnlyBoundaryEntities && coordinates <= end ) ||
    (  processOnlyBoundaryEntities &&
       ( coordinates.x() == begin.x() || coordinates.y() == begin.y() || coordinates.z() == begin.z() ||
         coordinates.x() == end.x() || coordinates.y() == end.y() || coordinates.z() == end.z() ) ) )
@@ -528,10 +542,10 @@ GridTraverser3D(
      GridEntity entity( *grid, coordinates, gridEntityParameters... );
      entity.refresh();
      EntitiesProcessor::processEntity( entity.getMesh(), *userData, entity );      
   }
   }*/

   
   /*if( coordinates <= end )
   if( coordinates <= end )
   {
      GridEntity entity( *grid, coordinates, gridEntityParameters... );
      entity.refresh();
@@ -542,7 +556,7 @@ GridTraverser3D(
           *userData,
           entity );
      }
   }*/
   }
}
#endif