use PMacc placeholder instead of boost::mpl::_1

ComputationalRadiationPhysics · Mar 30, 2023 · 9a2a80a · 9a2a80a
1 parent 954c09c
commit 9a2a80a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/include/picongpu/fields/incidentField/Solver.hpp b/include/picongpu/fields/incidentField/Solver.hpp
@@ -34,6 +34,7 @@
 
 #include <pmacc/mappings/kernel/AreaMapping.hpp>
 #include <pmacc/math/Vector.hpp>
+#include <pmacc/meta/Apply.hpp>
 #include <pmacc/meta/ForEach.hpp>
 #include <pmacc/meta/conversion/MakeSeq.hpp>
 #include <pmacc/traits/IsBaseTemplateOf.hpp>
@@ -633,10 +634,10 @@ namespace picongpu
                     parameters.direction = 1.0_X;
                     parameters.sourceTimeIteration = sourceTimeIteration;
                     parameters.timeIncrement = maxwellSolver::getTimeStep();
-                    meta::ForEach<T_MinProfiles, ApplyUpdateE<boost::mpl::_1>> applyMinProfiles;
+                    meta::ForEach<T_MinProfiles, ApplyUpdateE<pmacc::_1>> applyMinProfiles;
                     applyMinProfiles(parameters);
                     parameters.direction = -1.0_X;
-                    meta::ForEach<T_MaxProfiles, ApplyUpdateE<boost::mpl::_1>> applyMaxProfiles;
+                    meta::ForEach<T_MaxProfiles, ApplyUpdateE<pmacc::_1>> applyMaxProfiles;
                     applyMaxProfiles(parameters);
                 }
 
@@ -682,10 +683,10 @@ namespace picongpu
                     parameters.direction = 1.0_X;
                     parameters.sourceTimeIteration = sourceTimeIteration;
                     parameters.timeIncrement = 0.5_X * maxwellSolver::getTimeStep();
-                    meta::ForEach<T_MinProfiles, ApplyUpdateB<boost::mpl::_1>> applyMinProfiles;
+                    meta::ForEach<T_MinProfiles, ApplyUpdateB<pmacc::_1>> applyMinProfiles;
                     applyMinProfiles(parameters);
                     parameters.direction = -1.0_X;
-                    meta::ForEach<T_MaxProfiles, ApplyUpdateB<boost::mpl::_1>> applyMaxProfiles;
+                    meta::ForEach<T_MaxProfiles, ApplyUpdateB<pmacc::_1>> applyMaxProfiles;
                     applyMaxProfiles(parameters);
                 }
 

diff --git a/include/picongpu/initialization/InitialiserController.hpp b/include/picongpu/initialization/InitialiserController.hpp
@@ -35,6 +35,7 @@
 #include <pmacc/Environment.hpp>
 #include <pmacc/algorithms/math/defines/pi.hpp>
 #include <pmacc/assert.hpp>
+#include <pmacc/meta/Apply.hpp>
 #include <pmacc/pluginSystem/PluginConnector.hpp>
 
 namespace picongpu
@@ -229,8 +230,7 @@ namespace picongpu
         {
             using namespace fields;
             using IncidentFieldProfiles = fields::incidentField::UniqueEnabledProfiles;
-            meta::ForEach<IncidentFieldProfiles, PrintIncidentFieldDispersion<boost::mpl::_1>>
-                printIncidentFieldDispersion;
+            meta::ForEach<IncidentFieldProfiles, PrintIncidentFieldDispersion<pmacc::_1>> printIncidentFieldDispersion;
             printIncidentFieldDispersion();
         }
     };

diff --git a/include/picongpu/plugins/output/images/Visualisation.hpp b/include/picongpu/plugins/output/images/Visualisation.hpp
@@ -49,6 +49,7 @@
 #include <pmacc/memory/boxes/SharedBox.hpp>
 #include <pmacc/memory/buffers/GridBuffer.hpp>
 #include <pmacc/memory/shared/Allocate.hpp>
+#include <pmacc/meta/Apply.hpp>
 #include <pmacc/meta/ForEach.hpp>
 #include <pmacc/particles/algorithm/ForEach.hpp>
 #include <pmacc/particles/memory/boxes/ParticlesBox.hpp>
@@ -164,7 +165,7 @@ namespace picongpu
         HDINLINE static float_X getAmplitude()
         {
             using Profiles = fields::incidentField::UniqueEnabledProfiles;
-            meta::ForEach<Profiles, CalculateMaxAmplitude<boost::mpl::_1>> calculateMaxAmplitude;
+            meta::ForEach<Profiles, CalculateMaxAmplitude<pmacc::_1>> calculateMaxAmplitude;
             auto maxAmplitude = 0.0_X;
             calculateMaxAmplitude(maxAmplitude);
             return maxAmplitude;

diff --git a/include/picongpu/simulation/stage/AtomicPhysics.hpp b/include/picongpu/simulation/stage/AtomicPhysics.hpp
@@ -25,6 +25,7 @@
 // actual call to kernel found here
 #include <pmacc/Environment.hpp>
 #include <pmacc/dataManagement/DataConnector.hpp>
+#include <pmacc/meta/Apply.hpp>
 
 #include <cstdint>
 
@@ -81,9 +82,8 @@ namespace picongpu
                     typename pmacc::particles::traits::FilterByFlag<VectorAllSpecies, atomicPhysicsSolver<>>::type;
 
                 //! kernel to be called for each species
-                pmacc::meta::
-                    ForEach<SpeciesWithAtomicPhysics, particles::atomicPhysics::CallAtomicPhysics<boost::mpl::_1>>
-                        callAtomicPhysics;
+                pmacc::meta::ForEach<SpeciesWithAtomicPhysics, particles::atomicPhysics::CallAtomicPhysics<pmacc::_1>>
+                    callAtomicPhysics;
 
                 /** Description of cell structure used for PIC-Simulations.
                  *

diff --git a/include/pmacc/meta/Apply.hpp b/include/pmacc/meta/Apply.hpp
@@ -42,8 +42,8 @@ namespace pmacc
         struct ReplacePlaceholdersImpl<E<Ts...>, Args...>
         {
             using type = E<typename ReplacePlaceholdersImpl<Ts, Args...>::type...>;
-            // using type = typename E<typename ReplacePlaceholdersImpl<Ts, Args...>::type...>::type; // also calls
             // nested ::type of E to mimic mpl::apply
+            //using type = typename E<typename ReplacePlaceholdersImpl<Ts, Args...>::type...>::type;
         };
     } // namespace detail