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/__init__.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/__init__.py')
| -rw-r--r-- | Python/pywarpx/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
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 |