diff options
| author |  Weiqun Zhang <weiqunzhang@lbl.gov>
| 2017-01-27 12:47:20 -0800 |
|---|---|---|
| committer | Weiqun Zhang <weiqunzhang@lbl.gov>
| 2017-01-27 12:47:20 -0800 |
| commit | a513c809587cecbb5a6b2ffaeaf8ec220e1635b4 (patch) | |
| tree | 1dccbc2f4be89f2d020e64a5183922de098b69e0 /Python/pywarpx | |
| parent | b3a8753f2784b7e0869c5ed97505234396361545 (diff) | |
| parent | 4b979e2794f00dd09bf3523f4a4acd2cb73488fc (diff) | |
| download | WarpX-a513c809587cecbb5a6b2ffaeaf8ec220e1635b4.tar.gz WarpX-a513c809587cecbb5a6b2ffaeaf8ec220e1635b4.tar.zst WarpX-a513c809587cecbb5a6b2ffaeaf8ec220e1635b4.zip | |
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
Diffstat (limited to 'Python/pywarpx')
| -rw-r--r-- | Python/pywarpx/BoxLib.py | 8 | ||||
| -rw-r--r-- | Python/pywarpx/Particles.py | 3 | ||||
| -rw-r--r-- | Python/pywarpx/WarpX.py | 16 | ||||
| -rw-r--r-- | Python/pywarpx/__init__.py | 1 |
4 files changed, 20 insertions, 8 deletions
diff --git a/Python/pywarpx/BoxLib.py b/Python/pywarpx/BoxLib.py index 1a078d3c6..a15119250 100644 --- a/Python/pywarpx/BoxLib.py +++ b/Python/pywarpx/BoxLib.py @@ -6,8 +6,9 @@ from .Geometry import geometry from .Algo import algo from .Langmuirwave import langmuirwave from .Interpolation import interpolation +from .Particles import particles -from . import _warpxC +from . import warpxC class BoxLib(object): @@ -19,8 +20,9 @@ class BoxLib(object): argv += algo.attrlist() argv += langmuirwave.attrlist() argv += interpolation.attrlist() + argv += particles.attrlist() - _warpxC.boxlib_init(argv) + warpxC.boxlib_init(argv) def finalize(self, finalize_mpi=1): - _warpxC.boxlib_finalize(finalize_mpi) + warpxC.boxlib_finalize(finalize_mpi) diff --git a/Python/pywarpx/Particles.py b/Python/pywarpx/Particles.py new file mode 100644 index 000000000..a11da823d --- /dev/null +++ b/Python/pywarpx/Particles.py @@ -0,0 +1,3 @@ +from .Bucket import Bucket + +particles = Bucket('particles') 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') diff --git a/Python/pywarpx/__init__.py b/Python/pywarpx/__init__.py index 03d53d66e..98c26af36 100644 --- a/Python/pywarpx/__init__.py +++ b/Python/pywarpx/__init__.py @@ -5,5 +5,6 @@ from .Geometry import geometry from .Algo import algo from .Langmuirwave import langmuirwave from .Interpolation import interpolation +from .Particles import particles from .BoxLib import BoxLib |