updating the python-ctypes branch for recent changes in master

2 files changed, 17 insertions, 1 deletions

diff --git a/Python/pywarpx/AMReX.py b/Python/pywarpx/AMReX.py
index e84c240af..0cf9290b8 100644
--- a/Python/pywarpx/AMReX.py
+++ b/Python/pywarpx/AMReX.py
@@ -6,7 +6,7 @@ from .Geometry import geometry
 from .Algo import algo
 from .Langmuirwave import langmuirwave
 from .Interpolation import interpolation
-from .Particles import particles
+from .Particles import particles, electrons
 
 import ctypes
 from ._libwarpx import libwarpx
@@ -23,6 +23,7 @@ class AMReX(object):
         argv += langmuirwave.attrlist()
         argv += interpolation.attrlist()
         argv += particles.attrlist()
+        argv += electrons.attrlist()
 
         amrex_init(argv)
 
diff --git a/Python/pywarpx/Particles.py b/Python/pywarpx/Particles.py
index a11da823d..a166b029e 100644
--- a/Python/pywarpx/Particles.py
+++ b/Python/pywarpx/Particles.py
@@ -1,3 +1,18 @@
 from .Bucket import Bucket
 
 particles = Bucket('particles')
+
+electrons = Bucket('electrons')
+electrons.charge = "-q_e"
+electrons.mass = "m_e"
+electrons.injection_style = "python"
+
+positrons = Bucket('positrons')
+positrons.charge = "q_e"
+positrons.mass = "m_e"
+positrons.injection_style = "python"
+
+protons = Bucket('protons')
+protons.charge = "q_e"
+protons.mass = "m_p"
+protons.injection_style = "python"