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/BoxLib.py | |
| 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/BoxLib.py')
| -rw-r--r-- | Python/pywarpx/BoxLib.py | 8 |
1 files changed, 5 insertions, 3 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) |