diff options
| author |  Dave Grote <grote1@llnl.gov>
| 2019-04-18 11:26:51 -0700 |
|---|---|---|
| committer | Dave Grote <grote1@llnl.gov>
| 2019-04-18 11:26:51 -0700 |
| commit | 5ed1a16ace5ed9d32e18e25b23ef87996679b4dc (patch) | |
| tree | 110be73bd454bf2a673e2aa73b26b16cea29865c /Python/pywarpx/WarpX.py | |
| parent | be0cbe26c1914f14e059be84b546934a3933ab85 (diff) | |
| parent | ae239587668bbadc742ce5992afc6d6f814c5a3c (diff) | |
| download | WarpX-5ed1a16ace5ed9d32e18e25b23ef87996679b4dc.tar.gz WarpX-5ed1a16ace5ed9d32e18e25b23ef87996679b4dc.tar.zst WarpX-5ed1a16ace5ed9d32e18e25b23ef87996679b4dc.zip | |
Merge branch 'dev' into RZgeometry
Diffstat (limited to 'Python/pywarpx/WarpX.py')
| -rw-r--r-- | Python/pywarpx/WarpX.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/pywarpx/WarpX.py b/Python/pywarpx/WarpX.py index f58d4f111..4e4e41187 100644 --- a/Python/pywarpx/WarpX.py +++ b/Python/pywarpx/WarpX.py @@ -1,5 +1,5 @@ from .Bucket import Bucket -from .Constants import constants +from .Constants import my_constants from .Amr import amr from .Geometry import geometry from .Algo import algo @@ -18,7 +18,7 @@ class WarpX(Bucket): def create_argv_list(self): argv = [] argv += warpx.attrlist() - argv += constants.attrlist() + argv += my_constants.attrlist() argv += amr.attrlist() argv += geometry.attrlist() argv += algo.attrlist() |