From 9a2a80aa6203cf9f3db7b619a52d010347045584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Widera?= Date: Thu, 30 Mar 2023 10:29:20 +0200 Subject: [PATCH] use PMacc placeholder instead of `boost::mpl::_1` --- include/picongpu/fields/incidentField/Solver.hpp | 9 +++++---- .../picongpu/initialization/InitialiserController.hpp | 4 ++-- include/picongpu/plugins/output/images/Visualisation.hpp | 3 ++- include/picongpu/simulation/stage/AtomicPhysics.hpp | 6 +++--- include/pmacc/meta/Apply.hpp | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/picongpu/fields/incidentField/Solver.hpp b/include/picongpu/fields/incidentField/Solver.hpp index 4c6cb1b4847..8240145d866 100644 --- a/include/picongpu/fields/incidentField/Solver.hpp +++ b/include/picongpu/fields/incidentField/Solver.hpp @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -633,10 +634,10 @@ namespace picongpu parameters.direction = 1.0_X; parameters.sourceTimeIteration = sourceTimeIteration; parameters.timeIncrement = maxwellSolver::getTimeStep(); - meta::ForEach> applyMinProfiles; + meta::ForEach> applyMinProfiles; applyMinProfiles(parameters); parameters.direction = -1.0_X; - meta::ForEach> applyMaxProfiles; + meta::ForEach> 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> applyMinProfiles; + meta::ForEach> applyMinProfiles; applyMinProfiles(parameters); parameters.direction = -1.0_X; - meta::ForEach> applyMaxProfiles; + meta::ForEach> applyMaxProfiles; applyMaxProfiles(parameters); } diff --git a/include/picongpu/initialization/InitialiserController.hpp b/include/picongpu/initialization/InitialiserController.hpp index c25d80b4d36..177cc2f3290 100644 --- a/include/picongpu/initialization/InitialiserController.hpp +++ b/include/picongpu/initialization/InitialiserController.hpp @@ -35,6 +35,7 @@ #include #include #include +#include #include namespace picongpu @@ -229,8 +230,7 @@ namespace picongpu { using namespace fields; using IncidentFieldProfiles = fields::incidentField::UniqueEnabledProfiles; - meta::ForEach> - printIncidentFieldDispersion; + meta::ForEach> printIncidentFieldDispersion; printIncidentFieldDispersion(); } }; diff --git a/include/picongpu/plugins/output/images/Visualisation.hpp b/include/picongpu/plugins/output/images/Visualisation.hpp index 5ac2b4783c2..2e0673cfce4 100644 --- a/include/picongpu/plugins/output/images/Visualisation.hpp +++ b/include/picongpu/plugins/output/images/Visualisation.hpp @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -164,7 +165,7 @@ namespace picongpu HDINLINE static float_X getAmplitude() { using Profiles = fields::incidentField::UniqueEnabledProfiles; - meta::ForEach> calculateMaxAmplitude; + meta::ForEach> 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 index c0ec2be34fb..4a99eae00dd 100644 --- 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 #include +#include #include @@ -81,9 +82,8 @@ namespace picongpu typename pmacc::particles::traits::FilterByFlag>::type; //! kernel to be called for each species - pmacc::meta:: - ForEach> - callAtomicPhysics; + pmacc::meta::ForEach> + callAtomicPhysics; /** Description of cell structure used for PIC-Simulations. * diff --git a/include/pmacc/meta/Apply.hpp b/include/pmacc/meta/Apply.hpp index 456051dd9ee..d9578760def 100644 --- a/include/pmacc/meta/Apply.hpp +++ b/include/pmacc/meta/Apply.hpp @@ -42,8 +42,8 @@ namespace pmacc struct ReplacePlaceholdersImpl, Args...> { using type = E::type...>; - // using type = typename E::type...>::type; // also calls // nested ::type of E to mimic mpl::apply + //using type = typename E::type...>::type; }; } // namespace detail