Merge branch 'master' into amrex

Conflicts:
	Exec/Make.WarpX
	Python/ParticleProb.cpp
	Source/ParticleContainer.H
	Source/ParticleContainer.cpp
	Source/ParticleIterator.cpp
	Source/WarpX.H
	Source/WarpX.cpp
	Source/WarpXConst.H
	Source/WarpX_f.H
	Source/WarpX_picsar.F90

1 files changed, 11 insertions, 5 deletions

diff --git a/Python/pywarpx/WarpX.py b/Python/pywarpx/WarpX.py
index a1c85e618..8b9ecefe5 100644
--- a/Python/pywarpx/WarpX.py
+++ b/Python/pywarpx/WarpX.py
@@ -1,18 +1,24 @@
 from .Bucket import Bucket
-from . import _warpxC
+from . import warpxC
 
 class WarpX(Bucket):
 
     def init(self):
-        _warpxC.warpx_init()
+        warpxC.warpx_init()
 
     def evolve(self, nsteps=None):
         if nsteps is None:
-            _warpxC.warpx_evolve()
+            warpxC.warpx_evolve()
         else:
-            _warpxC.warpx_evolve(nsteps)
+            warpxC.warpx_evolve(nsteps)
 
     def finalize(self):
-        _warpxC.warpx_finalize()
+        warpxC.warpx_finalize()
+
+    def getProbLo(self, direction):
+        return warpxC.warpx_getProbLo(direction)
+
+    def getProbHi(self, direction):
+        return warpxC.warpx_getProbHi(direction)
 
 warpx = WarpX('warpx')