diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2019-06-18 14:03:14 -0700 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2019-06-18 14:03:14 -0700 |
| commit | 2628876d44bbd67c17ecb8a8db61a36aea36fad0 (patch) | |
| tree | 668dcf8ed4208f310021f6023c9c055a9cc3f81d /Source/Python | |
| parent | 828b516cd72d0e8cd0dd0225a2fde12aeee8dbff (diff) | |
| parent | 89df8eb11ed61bd6d6f58a2e096b1eb3a132538a (diff) | |
| download | WarpX-2628876d44bbd67c17ecb8a8db61a36aea36fad0.tar.gz WarpX-2628876d44bbd67c17ecb8a8db61a36aea36fad0.tar.zst WarpX-2628876d44bbd67c17ecb8a8db61a36aea36fad0.zip | |
Merge branch 'dev' into update_perftest
Diffstat (limited to 'Source/Python')
| -rw-r--r-- | Source/Python/Make.package | 8 | ||||
| -rw-r--r-- | Source/Python/WarpXWrappers.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/Python/Make.package b/Source/Python/Make.package index 71bd4ebe8..746257abf 100644 --- a/Source/Python/Make.package +++ b/Source/Python/Make.package @@ -1,7 +1,7 @@ -ifeq ($(USE_PYTHON_MAIN),TRUE) - CEXE_sources += WarpXWrappers.cpp - CEXE_headers += WarpXWrappers.h -endif +#ifeq ($(USE_PYTHON_MAIN),TRUE) +# CEXE_sources += WarpXWrappers.cpp +# CEXE_headers += WarpXWrappers.h +#endif CEXE_sources += WarpXWrappers.cpp CEXE_sources += WarpX_py.cpp CEXE_headers += WarpXWrappers.h diff --git a/Source/Python/WarpXWrappers.cpp b/Source/Python/WarpXWrappers.cpp index 16d7cd841..3c1a930b3 100644 --- a/Source/Python/WarpXWrappers.cpp +++ b/Source/Python/WarpXWrappers.cpp @@ -89,7 +89,7 @@ extern "C" void amrex_finalize (int finalize_mpi) { - amrex::Finalize(finalize_mpi); + amrex::Finalize(); } void warpx_init () |