Skip to content
Snippets Groups Projects
Commit eee6bf36 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Swapped template parameters EntitiesProcessor and UserData in the grid traverser

parent a3b33a5f
No related branches found
No related tags found
No related merge requests found
Showing with 123 additions and 138 deletions
......@@ -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 );*/
......
......@@ -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;
......
......@@ -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 );
}
......
......@@ -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;
};
......
......@@ -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(
......
......@@ -29,17 +29,17 @@ class Traverser< Meshes::Grid< 2, Real, Device, Index >, GridEntity, 2 >
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;
};
......@@ -57,18 +57,18 @@ class Traverser< Meshes::Grid< 2, 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;
};
......@@ -86,18 +86,18 @@ class Traverser< Meshes::Grid< 2, 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;
};
......
......@@ -22,8 +22,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 2, Real, Device, Index >, GridEntity, 2 >::
processBoundaryEntities( const GridPointer& gridPointer,
......@@ -101,8 +101,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 2, Real, Device, Index >, GridEntity, 2 >::
processInteriorEntities( const GridPointer& gridPointer,
......@@ -156,8 +156,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 2, Real, Device, Index >, GridEntity, 2 >::
processAllEntities( const GridPointer& gridPointer,
......@@ -202,8 +202,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 2, Real, Device, Index >, GridEntity, 1 >::
processBoundaryEntities( const GridPointer& gridPointer,
......@@ -239,8 +239,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 2, Real, Device, Index >, GridEntity, 1 >::
processInteriorEntities( const GridPointer& gridPointer,
......@@ -276,8 +276,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 2, Real, Device, Index >, GridEntity, 1 >::
processAllEntities( const GridPointer& gridPointer,
......@@ -313,8 +313,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 2, Real, Device, Index >, GridEntity, 0 >::
processBoundaryEntities( const GridPointer& gridPointer,
......@@ -338,8 +338,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 2, Real, Device, Index >, GridEntity, 0 >::
processInteriorEntities( const GridPointer& gridPointer,
......@@ -363,8 +363,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 2, Real, Device, Index >, GridEntity, 0 >::
processAllEntities( const GridPointer& gridPointer,
......
......@@ -29,17 +29,17 @@ class Traverser< Meshes::Grid< 3, Real, Device, Index >, GridEntity, 3 >
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;
};
......@@ -57,17 +57,17 @@ class Traverser< Meshes::Grid< 3, Real, Device, Index >, GridEntity, 2 >
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;
};
......@@ -85,18 +85,18 @@ class Traverser< Meshes::Grid< 3, 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;
};
......@@ -114,18 +114,18 @@ class Traverser< Meshes::Grid< 3, 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;
};
......
......@@ -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< 3, Real, Device, Index >, GridEntity, 3 >::
processBoundaryEntities( const GridPointer& gridPointer,
......@@ -125,8 +125,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 3, Real, Device, Index >, GridEntity, 3 >::
processInteriorEntities( const GridPointer& gridPointer,
......@@ -186,8 +186,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 3, Real, Device, Index >, GridEntity, 3 >::
processAllEntities( const GridPointer& gridPointer,
......@@ -231,8 +231,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 3, Real, Device, Index >, GridEntity, 2 >::
processBoundaryEntities( const GridPointer& gridPointer,
......@@ -278,8 +278,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 3, Real, Device, Index >, GridEntity, 2 >::
processInteriorEntities( const GridPointer& gridPointer,
......@@ -325,8 +325,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 3, Real, Device, Index >, GridEntity, 2 >::
processAllEntities( const GridPointer& gridPointer,
......@@ -374,8 +374,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 3, Real, Device, Index >, GridEntity, 1 >::
processBoundaryEntities( const GridPointer& gridPointer,
......@@ -421,8 +421,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 3, Real, Device, Index >, GridEntity, 1 >::
processInteriorEntities( const GridPointer& gridPointer,
......@@ -468,8 +468,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 3, Real, Device, Index >, GridEntity, 1 >::
processAllEntities( const GridPointer& gridPointer,
......@@ -517,8 +517,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 3, Real, Device, Index >, GridEntity, 0 >::
processBoundaryEntities( const GridPointer& gridPointer,
......@@ -542,8 +542,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 3, Real, Device, Index >, GridEntity, 0 >::
processInteriorEntities( const GridPointer& gridPointer,
......@@ -567,8 +567,8 @@ template< typename Real,
typename Device,
typename Index,
typename GridEntity >
template< typename UserData,
typename EntitiesProcessor >
template< typename EntitiesProcessor,
typename UserData >
void
Traverser< Meshes::Grid< 3, Real, Device, Index >, GridEntity, 0 >::
processAllEntities( const GridPointer& gridPointer,
......
......@@ -142,8 +142,7 @@ class ExplicitUpdater
this->userData.u = &uPointer.template modifyData< DeviceType >();
this->userData.fu = &fuPointer.template modifyData< DeviceType >();
Meshes::Traverser< MeshType, EntityType > meshTraverser;
meshTraverser.template processInteriorEntities< TraverserUserData,
TraverserInteriorEntitiesProcessor >
meshTraverser.template processInteriorEntities< TraverserInteriorEntitiesProcessor >
( meshPointer,
userData );
}
......@@ -161,8 +160,7 @@ class ExplicitUpdater
this->userData.time = time;
this->userData.u = &uPointer.template modifyData< DeviceType >();
Meshes::Traverser< MeshType, EntityType > meshTraverser;
meshTraverser.template processBoundaryEntities< TraverserUserData,
TraverserBoundaryEntitiesProcessor >
meshTraverser.template processBoundaryEntities< TraverserBoundaryEntitiesProcessor >
( meshPointer,
userData );
......
......@@ -122,12 +122,10 @@ class LinearSystemAssembler
this->userData.matrix = ( void* ) &matrixPointer.template modifyData< DeviceType >();
this->userData.b = &bPointer.template modifyData< DeviceType >();
Meshes::Traverser< MeshType, EntityType > meshTraverser;
meshTraverser.template processBoundaryEntities< TraverserUserData,
TraverserBoundaryEntitiesProcessor< Matrix> >
meshTraverser.template processBoundaryEntities< TraverserBoundaryEntitiesProcessor< Matrix> >
( meshPointer,
userData );
meshTraverser.template processInteriorEntities< TraverserUserData,
TraverserInteriorEntitiesProcessor< Matrix > >
meshTraverser.template processInteriorEntities< TraverserInteriorEntitiesProcessor< Matrix > >
( meshPointer,
userData );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment