]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Namespace some macros.
authorDavid Wells <drwells@email.unc.edu>
Fri, 30 Nov 2018 16:41:09 +0000 (11:41 -0500)
committerDavid Wells <drwells@email.unc.edu>
Fri, 30 Nov 2018 20:08:43 +0000 (15:08 -0500)
include/deal.II/matrix_free/cuda_hanging_nodes_internal.h
include/deal.II/particles/particle.h
source/particles/particle_handler.cc

index b7d8e5d18a9595a6be7c597cf9c3982be89cb033..ed1b18b657debceda1dc3247c4e1678eaf2db85e 100644 (file)
@@ -104,9 +104,9 @@ namespace CUDAWrappers
     namespace internal
     {
       // TODO: use a template parameter instead of a macro
-#  define MAX_ELEM_DEGREE 10
-      __constant__ double
-        constraint_weights[(MAX_ELEM_DEGREE + 1) * (MAX_ELEM_DEGREE + 1)];
+#  define DEAL_II_MAX_ELEM_DEGREE 10
+      __constant__ double constraint_weights[(DEAL_II_MAX_ELEM_DEGREE + 1) *
+                                             (DEAL_II_MAX_ELEM_DEGREE + 1)];
 
       // Here is the system for how we store constraint types in a binary mask.
       // This is not a complete contradiction-free system, i.e., there are
index 76cf7f8c6ee93779bdb5fc21771ec41525d20d61..20148e464786bb3c860a567e35374d143e7208cc 100644 (file)
@@ -47,7 +47,7 @@ namespace types
    * An identifier that denotes the MPI type associated with
    * types::global_dof_index.
    */
-#    define PARTICLE_INDEX_MPI_TYPE MPI_UNSIGNED_LONG_LONG
+#    define DEAL_II_PARTICLE_INDEX_MPI_TYPE MPI_UNSIGNED_LONG_LONG
 #  endif
 #else
   /**
@@ -68,7 +68,7 @@ namespace types
    * An identifier that denotes the MPI type associated with
    * types::global_dof_index.
    */
-#    define PARTICLE_INDEX_MPI_TYPE MPI_UNSIGNED
+#    define DEAL_II_PARTICLE_INDEX_MPI_TYPE MPI_UNSIGNED
 #  endif
 #endif
 } // namespace types
index f8b699acbc407170d1c705287b8f7c3c2aaccf4b..71d36b4f8797cbd692582ebdd7f497cc58ff5d19 100644 (file)
@@ -331,7 +331,7 @@ namespace Particles
     const int             ierr = MPI_Scan(&particles_to_add_locally,
                               &local_start_index,
                               1,
-                              PARTICLE_INDEX_MPI_TYPE,
+                              DEAL_II_PARTICLE_INDEX_MPI_TYPE,
                               MPI_SUM,
                               triangulation->get_communicator());
     AssertThrowMPI(ierr);

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.