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

Swapped template parameters EntitiesProcessor and UserData in the grid traverser

parent a3b33a5f
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -597,8 +597,7 @@ getExplicitUpdate( const RealType& time,
            Pointers::synchronizeSmartPointersOnDevice< Devices::Cuda >();
            int cudaErr;
            Meshes::Traverser< MeshType, Cell > meshTraverser;
            meshTraverser.template processInteriorEntities< UserData,
                                                      InteriorEntitiesProcessor >
            meshTraverser.template processInteriorEntities< InteriorEntitiesProcessor >
                                                          ( mesh,
                                                            userData );
             // */
@@ -613,8 +612,7 @@ getExplicitUpdate( const RealType& time,
               return;
            }
            
            meshTraverser.template processBoundaryEntities< UserData,
                                                      BoundaryEntitiesProcessor >
            meshTraverser.template processBoundaryEntities< BoundaryEntitiesProcessor >
                                                          ( mesh,
                                                            userData );
            // */
@@ -701,8 +699,7 @@ applyBoundaryConditions( const RealType& time,
      userData.boundaryConditions = &this->boundaryConditionPointer.template getData< Devices::Cuda >();
      Meshes::Traverser< MeshType, Cell > meshTraverser;
      // */
      /*meshTraverser.template processBoundaryEntities< UserData,
                                                BoundaryEntitiesProcessor >
      /*meshTraverser.template processBoundaryEntities< BoundaryEntitiesProcessor >
                                                    ( mesh,
                                                      userData );*/

+6 −12
Original line number Diff line number Diff line
@@ -130,37 +130,31 @@ evaluateEntities( OutMeshFunctionPointer& meshFunction,
   {
      case all:
         if( outFunctionMultiplicator )
            meshTraverser.template processAllEntities< TraverserUserData,
                                                       AdditionEntitiesProcessor >
            meshTraverser.template processAllEntities< AdditionEntitiesProcessor >
                                                     ( meshFunction->getMeshPointer(),
                                                       userData );
         else
            meshTraverser.template processAllEntities< TraverserUserData,
                                                       AssignmentEntitiesProcessor >
            meshTraverser.template processAllEntities< AssignmentEntitiesProcessor >
                                                    ( meshFunction->getMeshPointer(),
                                                      userData );
         break;
      case interior:
         if( outFunctionMultiplicator )
            meshTraverser.template processInteriorEntities< TraverserUserData,
                                                            AdditionEntitiesProcessor >
            meshTraverser.template processInteriorEntities< AdditionEntitiesProcessor >
                                                          ( meshFunction->getMeshPointer(),
                                                            userData );
         else
            meshTraverser.template processInteriorEntities< TraverserUserData,
                                                            AssignmentEntitiesProcessor >
            meshTraverser.template processInteriorEntities< AssignmentEntitiesProcessor >
                                                          ( meshFunction->getMeshPointer(),
                                                            userData );
         break;
      case boundary:
         if( outFunctionMultiplicator )
            meshTraverser.template processBoundaryEntities< TraverserUserData,
                                                            AdditionEntitiesProcessor >
            meshTraverser.template processBoundaryEntities< AdditionEntitiesProcessor >
                                                          ( meshFunction->getMeshPointer(),
                                                            userData );
         else
            meshTraverser.template processBoundaryEntities< TraverserUserData,
                                                            AssignmentEntitiesProcessor >
            meshTraverser.template processBoundaryEntities< AssignmentEntitiesProcessor >
                                                          ( meshFunction->getMeshPointer(),
                                                            userData );
         break;
+2 −4
Original line number Diff line number Diff line
@@ -33,12 +33,10 @@ getCompressedRowLengths( const MeshPointer& meshPointer,
                   &boundaryConditionsPointer.template getData< DeviceType >(),
                   &rowLengthsPointer.template modifyData< DeviceType >() );
      Meshes::Traverser< MeshType, EntityType > meshTraverser;
      meshTraverser.template processBoundaryEntities< TraverserUserData,
                                                      TraverserBoundaryEntitiesProcessor >
      meshTraverser.template processBoundaryEntities< TraverserBoundaryEntitiesProcessor >
                                                    ( meshPointer,
                                                      userData );
      meshTraverser.template processInteriorEntities< TraverserUserData,
                                                      TraverserInteriorEntitiesProcessor >
      meshTraverser.template processInteriorEntities< TraverserInteriorEntitiesProcessor >
                                                    ( meshPointer,
                                                      userData );
   }
+12 −12
Original line number Diff line number Diff line
@@ -29,18 +29,18 @@ class Traverser< Meshes::Grid< 1, Real, Device, Index >, GridEntity, 1 >
      using DistributedGridType = Meshes::DistributedMeshes::DistributedMesh< GridType >;
      using SubdomainOverlapsType = typename DistributedGridType::SubdomainOverlapsType;

      template< typename UserData,
                typename EntitiesProcessor >
      template< typename EntitiesProcessor,
                typename UserData >
      void processBoundaryEntities( const GridPointer& gridPointer,
                                    UserData& userData ) const;

      template< typename UserData,
                typename EntitiesProcessor >
      template< typename EntitiesProcessor,
                typename UserData >
      void processInteriorEntities( const GridPointer& gridPointer,
                                    UserData& userData ) const;

      template< typename UserData,
                typename EntitiesProcessor >
      template< typename EntitiesProcessor,
                typename UserData >
      void processAllEntities( const GridPointer& gridPointer,
                               UserData& userData ) const;
};
@@ -59,18 +59,18 @@ class Traverser< Meshes::Grid< 1, Real, Device, Index >, GridEntity, 0 >
      using DistributedGridType = Meshes::DistributedMeshes::DistributedMesh< GridType >;
      using SubdomainOverlapsType = typename DistributedGridType::SubdomainOverlapsType;

      template< typename UserData,
                typename EntitiesProcessor >
      template< typename EntitiesProcessor,
                typename UserData >
      void processBoundaryEntities( const GridPointer& gridPointer,
                                    UserData& userData ) const;

      template< typename UserData,
                typename EntitiesProcessor >
      template< typename EntitiesProcessor,
                typename UserData >
      void processInteriorEntities( const GridPointer& gridPointer,
                                    UserData& userData ) const;

      template< typename UserData,
                typename EntitiesProcessor >
      template< typename EntitiesProcessor,
                typename UserData >
      void processAllEntities( const GridPointer& gridPointer,
                               UserData& userData ) const;
};
+12 −12
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ template< typename Real,
          typename Device,
          typename Index,
          typename GridEntity >
   template< typename UserData,
             typename EntitiesProcessor >
   template< typename EntitiesProcessor,
             typename UserData >
void
Traverser< Meshes::Grid< 1, Real, Device, Index >, GridEntity, 1 >::
processBoundaryEntities( const GridPointer& gridPointer,
@@ -76,8 +76,8 @@ template< typename Real,
          typename Device,
          typename Index,
          typename GridEntity >
   template< typename UserData,
             typename EntitiesProcessor >
   template< typename EntitiesProcessor,
             typename UserData >
void
Traverser< Meshes::Grid< 1, Real, Device, Index >, GridEntity, 1 >::
processInteriorEntities( const GridPointer& gridPointer,
@@ -131,8 +131,8 @@ template< typename Real,
          typename Device,
          typename Index,
          typename GridEntity >
   template< typename UserData,
             typename EntitiesProcessor >
   template< typename EntitiesProcessor,
             typename UserData >
void
Traverser< Meshes::Grid< 1, Real, Device, Index >, GridEntity, 1 >::
processAllEntities(
@@ -176,8 +176,8 @@ template< typename Real,
          typename Device,
          typename Index,
          typename GridEntity >
   template< typename UserData,
             typename EntitiesProcessor >
   template< typename EntitiesProcessor,
             typename UserData >
void
Traverser< Meshes::Grid< 1, Real, Device, Index >, GridEntity, 0 >::
processBoundaryEntities( const GridPointer& gridPointer,
@@ -200,8 +200,8 @@ template< typename Real,
          typename Device,
          typename Index,
          typename GridEntity >
   template< typename UserData,
             typename EntitiesProcessor >
   template< typename EntitiesProcessor,
             typename UserData >
void
Traverser< Meshes::Grid< 1, Real, Device, Index >, GridEntity, 0 >::
processInteriorEntities( const GridPointer& gridPointer,
@@ -224,8 +224,8 @@ template< typename Real,
          typename Device,
          typename Index,
          typename GridEntity >
   template< typename UserData,
             typename EntitiesProcessor >
   template< typename EntitiesProcessor,
             typename UserData >
void
Traverser< Meshes::Grid< 1, Real, Device, Index >, GridEntity, 0 >::
processAllEntities(
Loading