Skip to content

Commit 59c1e25

Browse files
substitute boost::mpl::string with PMACC_CSTRING
use `PMACC_CSTRING` to define particle species names
1 parent 8156bff commit 59c1e25

File tree

9 files changed

+55
-51
lines changed

9 files changed

+55
-51
lines changed

include/picongpu/param/speciesDefinition.param

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
#pragma once
3434

3535
#include "picongpu/simulation_defines.hpp"
36+
#include "picongpu/particles/Particles.hpp"
37+
3638
#include <pmacc/particles/Identifier.hpp>
3739
#include <pmacc/compileTime/conversion/MakeSeq.hpp>
3840
#include <pmacc/identifier/value_identifier.hpp>
39-
4041
#include <pmacc/particles/traits/FilterByFlag.hpp>
41-
#include "picongpu/particles/Particles.hpp"
42-
#include <boost/mpl/string.hpp>
42+
#include <pmacc/compileTime/String.hpp>
4343

4444
namespace picongpu
4545
{
@@ -72,7 +72,7 @@ using ParticleFlagsPhotons = bmpl::vector<
7272

7373
/* define species photons */
7474
using PIC_Photons = Particles<
75-
bmpl::string< 'p', 'h' >,
75+
PMACC_CSTRING( "ph" ),
7676
ParticleFlagsPhotons,
7777
DefaultParticleAttributes
7878
>;
@@ -97,7 +97,7 @@ using ParticleFlagsElectrons = bmpl::vector<
9797

9898
/* define species electrons */
9999
using PIC_Electrons = Particles<
100-
bmpl::string< 'e' >,
100+
PMACC_CSTRING( "e" ),
101101
ParticleFlagsElectrons,
102102
DefaultParticleAttributes
103103
>;
@@ -124,7 +124,7 @@ using ParticleFlagsIons = bmpl::vector<
124124

125125
/* define species ions */
126126
using PIC_Ions = Particles<
127-
bmpl::string< 'i' >,
127+
PMACC_CSTRING( "i" ),
128128
ParticleFlagsIons,
129129
DefaultParticleAttributes
130130
>;

share/picongpu/examples/Bremsstrahlung/include/picongpu/param/speciesDefinition.param

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
#pragma once
2121

2222
#include "picongpu/simulation_defines.hpp"
23+
#include "picongpu/particles/Particles.hpp"
24+
2325
#include <pmacc/particles/Identifier.hpp>
2426
#include <pmacc/compileTime/conversion/MakeSeq.hpp>
2527
#include <pmacc/identifier/value_identifier.hpp>
26-
2728
#include <pmacc/particles/traits/FilterByFlag.hpp>
28-
#include "picongpu/particles/Particles.hpp"
29-
#include <boost/mpl/string.hpp>
29+
#include <pmacc/compileTime/String.hpp>
3030

3131

3232
namespace picongpu
@@ -65,7 +65,7 @@ using ParticleFlagsPhotons = bmpl::vector<
6565

6666
/* define species photons */
6767
using PIC_Photons = Particles<
68-
bmpl::string< 'p', 'h' >,
68+
PMACC_CSTRING( "ph" ),
6969
ParticleFlagsPhotons,
7070
DefaultParticleAttributes
7171
>;
@@ -91,7 +91,7 @@ using ParticleFlagsIons = bmpl::vector<
9191

9292
/* define species ions */
9393
using PIC_Ions = Particles<
94-
bmpl::string< 'i' >,
94+
PMACC_CSTRING( "i" ),
9595
ParticleFlagsIons,
9696
DefaultParticleAttributes
9797
>;
@@ -118,7 +118,7 @@ using ParticleFlagsElectrons = bmpl::vector<
118118

119119
/* define species electrons */
120120
using PIC_Electrons = Particles<
121-
bmpl::string< 'e' >,
121+
PMACC_CSTRING( "e" ),
122122
ParticleFlagsElectrons,
123123
DefaultParticleAttributes
124124
>;

share/picongpu/examples/Bunch/include/picongpu/param/speciesDefinition.param

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
#pragma once
2121

2222
#include "picongpu/simulation_defines.hpp"
23+
#include "picongpu/particles/Particles.hpp"
24+
2325
#include <pmacc/particles/Identifier.hpp>
2426
#include <pmacc/compileTime/conversion/MakeSeq.hpp>
2527
#include <pmacc/identifier/value_identifier.hpp>
26-
2728
#include <pmacc/particles/traits/FilterByFlag.hpp>
28-
#include "picongpu/particles/Particles.hpp"
29-
#include <boost/mpl/string.hpp>
29+
#include <pmacc/compileTime/String.hpp>
3030

3131

3232
namespace picongpu
@@ -71,7 +71,7 @@ using ParticleFlagsPhotons = bmpl::vector<
7171

7272
/* define species photons */
7373
using PIC_Photons = Particles<
74-
bmpl::string< 'p', 'h' >,
74+
PMACC_CSTRING( "ph" ),
7575
ParticleFlagsPhotons,
7676
DefaultParticleAttributes
7777
>;
@@ -96,7 +96,7 @@ using ParticleFlagsElectrons = bmpl::vector<
9696

9797
/* define species electrons */
9898
using PIC_Electrons = Particles<
99-
bmpl::string< 'e' >,
99+
PMACC_CSTRING( "e" ),
100100
ParticleFlagsElectrons,
101101
DefaultParticleAttributes
102102
>;

share/picongpu/examples/FoilLCT/include/picongpu/param/speciesDefinition.param

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
#pragma once
3434

3535
#include "picongpu/simulation_defines.hpp"
36+
#include "picongpu/particles/Particles.hpp"
37+
3638
#include <pmacc/particles/Identifier.hpp>
3739
#include <pmacc/compileTime/conversion/MakeSeq.hpp>
3840
#include <pmacc/identifier/value_identifier.hpp>
39-
4041
#include <pmacc/particles/traits/FilterByFlag.hpp>
41-
#include "picongpu/particles/Particles.hpp"
42-
#include <boost/mpl/string.hpp>
42+
#include <pmacc/compileTime/String.hpp>
4343

4444

4545
namespace picongpu
@@ -81,7 +81,7 @@ using ParticleFlagsElectrons = bmpl::vector<
8181

8282
/* define species electrons */
8383
using Electrons = Particles<
84-
bmpl::string< 'e' >,
84+
PMACC_CSTRING( "e" ),
8585
ParticleFlagsElectrons,
8686
DefaultParticleAttributes
8787
>;
@@ -117,7 +117,7 @@ using ParticleFlagsHydrogen = bmpl::vector<
117117

118118
/* define species Hydrogen */
119119
using Hydrogen = Particles<
120-
bmpl::string< 'H' >,
120+
PMACC_CSTRING( "H" ),
121121
ParticleFlagsHydrogen,
122122
IonParticleAttributes
123123
>;
@@ -153,7 +153,7 @@ using ParticleFlagsCarbon = bmpl::vector<
153153

154154
/* define species Carbon */
155155
using Carbon = Particles<
156-
bmpl::string< 'C' >,
156+
PMACC_CSTRING( "C" ),
157157
ParticleFlagsCarbon,
158158
IonParticleAttributes
159159
>;
@@ -189,7 +189,7 @@ using ParticleFlagsNitrogen = bmpl::vector<
189189

190190
/* define species Nitrogen */
191191
using Nitrogen = Particles<
192-
bmpl::string< 'N' >,
192+
PMACC_CSTRING( "N" ),
193193
ParticleFlagsNitrogen,
194194
IonParticleAttributes
195195
>;
@@ -204,7 +204,7 @@ using ParticleFlagsProbes = bmpl::vector<
204204

205205
/* define species Probe */
206206
using Probes = Particles<
207-
bmpl::string< 'p', 'r', 'o', 'b', 'e' >,
207+
PMACC_CSTRING( "probe" ),
208208
ParticleFlagsProbes,
209209
MakeSeq_t<
210210
position< position_pic >,

share/picongpu/examples/KelvinHelmholtz/include/picongpu/param/speciesDefinition.param

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
#pragma once
2121

2222
#include "picongpu/simulation_defines.hpp"
23+
#include "picongpu/particles/Particles.hpp"
24+
2325
#include <pmacc/particles/Identifier.hpp>
2426
#include <pmacc/compileTime/conversion/MakeSeq.hpp>
2527
#include <pmacc/identifier/value_identifier.hpp>
26-
2728
#include <pmacc/particles/traits/FilterByFlag.hpp>
28-
#include "picongpu/particles/Particles.hpp"
29-
#include <boost/mpl/string.hpp>
29+
#include <pmacc/compileTime/String.hpp>
3030

3131

3232
#ifndef PARAM_RADIATION
@@ -71,7 +71,7 @@ using ParticleFlagsElectrons = bmpl::vector<
7171

7272
/* define species electrons */
7373
using PIC_Electrons = Particles<
74-
bmpl::string< 'e' >,
74+
PMACC_CSTRING( "e" ),
7575
ParticleFlagsElectrons,
7676
DefaultParticleAttributes
7777
>;
@@ -98,7 +98,7 @@ using ParticleFlagsIons = bmpl::vector<
9898

9999
/* define species ions */
100100
using PIC_Ions = Particles<
101-
bmpl::string< 'i' >,
101+
PMACC_CSTRING( "i" ),
102102
ParticleFlagsIons,
103103
DefaultParticleAttributes
104104
>;

share/picongpu/examples/LaserWakefield/include/picongpu/param/speciesDefinition.param

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
#pragma once
2222

2323
#include "picongpu/simulation_defines.hpp"
24+
#include "picongpu/particles/Particles.hpp"
25+
2426
#include <pmacc/particles/Identifier.hpp>
2527
#include <pmacc/compileTime/conversion/MakeSeq.hpp>
2628
#include <pmacc/identifier/value_identifier.hpp>
27-
28-
#include "picongpu/particles/Particles.hpp"
29-
#include <boost/mpl/string.hpp>
29+
#include <pmacc/particles/traits/FilterByFlag.hpp>
30+
#include <pmacc/compileTime/String.hpp>
3031

3132

3233
namespace picongpu
@@ -71,7 +72,7 @@ using ParticleFlagsElectrons = bmpl::vector<
7172

7273
/* define species: electrons */
7374
using PIC_Electrons = Particles<
74-
bmpl::string< 'e' >,
75+
PMACC_CSTRING( "e" ),
7576
ParticleFlagsElectrons,
7677
DefaultParticleAttributes
7778
>;
@@ -104,7 +105,7 @@ using ParticleFlagsIons = bmpl::vector<
104105

105106
/* define species: ions */
106107
using PIC_Ions = Particles<
107-
bmpl::string< 'i' >,
108+
PMACC_CSTRING( "i" ),
108109
ParticleFlagsIons,
109110
AttributeSeqIons
110111
>;

share/picongpu/examples/SingleParticleTest/include/picongpu/param/speciesDefinition.param

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@
2222
#pragma once
2323

2424
#include "picongpu/simulation_defines.hpp"
25+
#include "picongpu/particles/Particles.hpp"
26+
2527
#include <pmacc/particles/Identifier.hpp>
2628
#include <pmacc/compileTime/conversion/MakeSeq.hpp>
2729
#include <pmacc/identifier/value_identifier.hpp>
28-
29-
#include "picongpu/particles/Particles.hpp"
30-
#include <boost/mpl/string.hpp>
30+
#include <pmacc/particles/traits/FilterByFlag.hpp>
31+
#include <pmacc/compileTime/String.hpp>
3132

3233

3334
namespace picongpu
@@ -71,7 +72,7 @@ using ParticleFlagsElectrons = bmpl::vector<
7172

7273
/* define species electrons */
7374
using PIC_Electrons = Particles<
74-
bmpl::string<'e'>,
75+
PMACC_CSTRING( "e" ),
7576
ParticleFlagsElectrons,
7677
DefaultParticleAttributes
7778
>;

share/picongpu/examples/WarmCopper/include/picongpu/param/speciesDefinition.param

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
#pragma once
2121

2222
#include "picongpu/simulation_defines.hpp"
23+
#include "picongpu/particles/Particles.hpp"
24+
2325
#include <pmacc/particles/Identifier.hpp>
2426
#include <pmacc/compileTime/conversion/MakeSeq.hpp>
2527
#include <pmacc/identifier/value_identifier.hpp>
26-
27-
#include "picongpu/particles/Particles.hpp"
28-
#include <boost/mpl/string.hpp>
28+
#include <pmacc/particles/traits/FilterByFlag.hpp>
29+
#include <pmacc/compileTime/String.hpp>
2930

3031

3132
namespace picongpu
@@ -71,7 +72,7 @@ using ParticleFlagsPhotons = bmpl::vector<
7172

7273
/* define species photons */
7374
using Photons = Particles<
74-
bmpl::string< 'p', 'h' >,
75+
PMACC_CSTRING( "ph" ),
7576
ParticleFlagsPhotons,
7677
DefaultParticleAttributes
7778
>;
@@ -108,7 +109,7 @@ using ParticleFlagsElectrons = bmpl::vector<
108109

109110
/* thermal bulk electrons */
110111
using BulkElectrons = Particles<
111-
bmpl::string< 'e', 't', 'h' >,
112+
PMACC_CSTRING( "eth" ),
112113
MakeSeq_t<
113114
ParticleFlagsElectrons,
114115
densityRatio< DensityRatioBulkElectrons >
@@ -118,7 +119,7 @@ using BulkElectrons = Particles<
118119

119120
/* non-thermal "hot"/prompt electrons */
120121
using PromptElectrons = Particles<
121-
bmpl::string< 'e', 'h', 'o', 't' >,
122+
PMACC_CSTRING( "ehot" ),
122123
MakeSeq_t<
123124
ParticleFlagsElectrons,
124125
densityRatio< DensityRatioPromptElectrons >
@@ -162,7 +163,7 @@ using ParticleFlagsCopper = bmpl::vector<
162163

163164
/* define species ions */
164165
using CopperIons = Particles<
165-
bmpl::string< 'C', 'u' >,
166+
PMACC_CSTRING( "Cu" ),
166167
ParticleFlagsCopper,
167168
MakeSeq_t<
168169
DefaultParticleAttributes,

share/picongpu/examples/WeibelTransverse/include/picongpu/param/speciesDefinition.param

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
#pragma once
2121

2222
#include "picongpu/simulation_defines.hpp"
23+
#include "picongpu/particles/Particles.hpp"
24+
2325
#include <pmacc/particles/Identifier.hpp>
2426
#include <pmacc/compileTime/conversion/MakeSeq.hpp>
2527
#include <pmacc/identifier/value_identifier.hpp>
26-
27-
#include "picongpu/particles/Particles.hpp"
28-
#include <boost/mpl/string.hpp>
28+
#include <pmacc/particles/traits/FilterByFlag.hpp>
29+
#include <pmacc/compileTime/String.hpp>
2930

3031

3132
namespace picongpu
@@ -62,7 +63,7 @@ using ParticleFlagsElectrons = bmpl::vector<
6263

6364
/* define species electrons */
6465
using PIC_Electrons = Particles<
65-
bmpl::string< 'e' >,
66+
PMACC_CSTRING( "e" ),
6667
ParticleFlagsElectrons,
6768
DefaultParticleAttributes
6869
>;
@@ -89,7 +90,7 @@ using ParticleFlagsIons = bmpl::vector<
8990

9091
/*define specie ions*/
9192
using PIC_Ions = Particles<
92-
bmpl::string<'i'>,
93+
PMACC_CSTRING( "i" ),
9394
ParticleFlagsIons,
9495
DefaultParticleAttributes
9596
>;

0 commit comments

Comments
 (0)