From 4f8e7a3b47b7b50481280a130b6f96ff2d28b388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkjak@fjfi.cvut.cz>
Date: Wed, 18 Oct 2017 19:55:14 +0200
Subject: [PATCH] Use StaticFor::execHost in mesh executors
---
src/TNL/Meshes/MeshDetails/IndexPermutationApplier.h | 8 ++++----
.../MeshDetails/initializer/BoundaryTagsInitializer.h | 4 ++--
.../MeshDetails/initializer/MeshSubentitySeedCreator.h | 5 ++---
.../Meshes/MeshDetails/layers/MeshEntityStorageRebinder.h | 4 ++--
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/TNL/Meshes/MeshDetails/IndexPermutationApplier.h b/src/TNL/Meshes/MeshDetails/IndexPermutationApplier.h
index 1aa609a9d7..18a381fd45 100644
--- a/src/TNL/Meshes/MeshDetails/IndexPermutationApplier.h
+++ b/src/TNL/Meshes/MeshDetails/IndexPermutationApplier.h
@@ -167,16 +167,16 @@ public:
entities.getData() );
// permute superentities storage
- StaticFor< int, 0, Dimension, SubentitiesStorageWorker >::exec( mesh, perm );
+ StaticFor< int, 0, Dimension, SubentitiesStorageWorker >::execHost( mesh, perm );
// permute subentities storage
- StaticFor< int, Dimension + 1, Mesh::getMeshDimension() + 1, SuperentitiesStorageWorker >::exec( mesh, perm );
+ StaticFor< int, Dimension + 1, Mesh::getMeshDimension() + 1, SuperentitiesStorageWorker >::execHost( mesh, perm );
// update superentity indices from the subentities
- StaticFor< int, 0, Dimension, SubentitiesWorker >::exec( mesh, iperm );
+ StaticFor< int, 0, Dimension, SubentitiesWorker >::execHost( mesh, iperm );
// update subentity indices from the superentities
- StaticFor< int, Dimension + 1, Mesh::getMeshDimension() + 1, SuperentitiesWorker >::exec( mesh, iperm );
+ StaticFor< int, Dimension + 1, Mesh::getMeshDimension() + 1, SuperentitiesWorker >::execHost( mesh, iperm );
}
};
diff --git a/src/TNL/Meshes/MeshDetails/initializer/BoundaryTagsInitializer.h b/src/TNL/Meshes/MeshDetails/initializer/BoundaryTagsInitializer.h
index 5666264cec..2d7e2d0f41 100644
--- a/src/TNL/Meshes/MeshDetails/initializer/BoundaryTagsInitializer.h
+++ b/src/TNL/Meshes/MeshDetails/initializer/BoundaryTagsInitializer.h
@@ -113,7 +113,7 @@ public:
public:
static void exec( Mesh& mesh )
{
- StaticFor< int, 0, Mesh::getMeshDimension() + 1, ResetBoundaryTags >::exec( mesh );
+ StaticFor< int, 0, Mesh::getMeshDimension() + 1, ResetBoundaryTags >::execHost( mesh );
auto kernel = [] __cuda_callable__
( GlobalIndexType faceIndex,
@@ -137,7 +137,7 @@ public:
kernel,
&meshPointer.template modifyData< DeviceType >() );
- StaticFor< int, 0, Mesh::getMeshDimension() + 1, UpdateBoundaryIndices >::exec( mesh );
+ StaticFor< int, 0, Mesh::getMeshDimension() + 1, UpdateBoundaryIndices >::execHost( mesh );
}
};
diff --git a/src/TNL/Meshes/MeshDetails/initializer/MeshSubentitySeedCreator.h b/src/TNL/Meshes/MeshDetails/initializer/MeshSubentitySeedCreator.h
index d7fa13b1de..efb15c4b05 100644
--- a/src/TNL/Meshes/MeshDetails/initializer/MeshSubentitySeedCreator.h
+++ b/src/TNL/Meshes/MeshDetails/initializer/MeshSubentitySeedCreator.h
@@ -47,7 +47,7 @@ public:
static SubentitySeedArray create( const SubvertexAccessorType& subvertices )
{
SubentitySeedArray subentitySeeds;
- StaticFor< LocalIndexType, 0, SUBENTITIES_COUNT, CreateSubentitySeeds >::exec( subentitySeeds, subvertices );
+ StaticFor< LocalIndexType, 0, SUBENTITIES_COUNT, CreateSubentitySeeds >::execHost( subentitySeeds, subvertices );
return subentitySeeds;
}
@@ -61,7 +61,7 @@ private:
public:
static void exec( SubentitySeedArray& subentitySeeds, const SubvertexAccessorType& subvertices )
{
- StaticFor< LocalIndexType, 0, SUBENTITY_VERTICES_COUNT, SetSubentitySeedVertex >::exec( subentitySeeds[ subentityIndex ], subvertices );
+ StaticFor< LocalIndexType, 0, SUBENTITY_VERTICES_COUNT, SetSubentitySeedVertex >::execHost( subentitySeeds[ subentityIndex ], subvertices );
}
private:
@@ -107,4 +107,3 @@ public:
} // namespace Meshes
} // namespace TNL
-
diff --git a/src/TNL/Meshes/MeshDetails/layers/MeshEntityStorageRebinder.h b/src/TNL/Meshes/MeshDetails/layers/MeshEntityStorageRebinder.h
index cf113a2ba0..c5a36d304f 100644
--- a/src/TNL/Meshes/MeshDetails/layers/MeshEntityStorageRebinder.h
+++ b/src/TNL/Meshes/MeshDetails/layers/MeshEntityStorageRebinder.h
@@ -144,14 +144,14 @@ public:
static void exec( Mesh& mesh )
{
- StaticFor< int, Dimension + 1, Mesh::getMeshDimension() + 1, Inner >::exec( mesh );
+ StaticFor< int, Dimension + 1, Mesh::getMeshDimension() + 1, Inner >::execHost( mesh );
}
};
public:
static void exec( Mesh& mesh )
{
- StaticFor< int, 0, Mesh::getMeshDimension() + 1, OuterLoop >::exec( mesh );
+ StaticFor< int, 0, Mesh::getMeshDimension() + 1, OuterLoop >::execHost( mesh );
}
};
--
GitLab