1 files changed, 11 insertions, 2 deletions
diff --git a/Python/pywarpx/AMReX.py b/Python/pywarpx/AMReX.py
index dac675129..bdadc49bd 100644
--- a/Python/pywarpx/AMReX.py
+++ b/Python/pywarpx/AMReX.py
@@ -6,7 +6,8 @@ from .Geometry import geometry
 from .Algo import algo
 from .Langmuirwave import langmuirwave
 from .Interpolation import interpolation
-from .Particles import particles, electrons
+from . import Particles
+from .Particles import particles, particles_list
 
 import ctypes
 from ._libwarpx import libwarpx
@@ -23,7 +24,15 @@ class AMReX(object):
         argv += langmuirwave.attrlist()
         argv += interpolation.attrlist()
         argv += particles.attrlist()
-        argv += electrons.attrlist()
+
+        if not particles_list:
+            # --- This is needed in case only species_names has been set,
+            # --- assuming that only the built in particle types are being used.
+            for pstring in particles.species_names.split(' '):
+                particles_list.append(getattr(Particles, pstring))
+
+        for particle in particles_list:
+            argv += particle.attrlist()
 
         amrex_init(argv)