diff options
| author |  Remi Lehe <remi.lehe@normalesup.org>
| 2019-06-10 13:34:55 -0700 |
|---|---|---|
| committer | Remi Lehe <remi.lehe@normalesup.org>
| 2019-06-10 13:34:55 -0700 |
| commit | 4e2bc0444eacb6b3db36d7c3c3f7bbe6233c5f19 (patch) | |
| tree | 5d5bb1d98d7f0ff4394f24607f4c46a6b3b04a6a /Source/Python | |
| parent | 2c25e914fcaae826a4e28acdc1e7c5348e05a168 (diff) | |
| parent | 4c01a51d48f0f95b6ac309060d279145c5443064 (diff) | |
| download | WarpX-4e2bc0444eacb6b3db36d7c3c3f7bbe6233c5f19.tar.gz WarpX-4e2bc0444eacb6b3db36d7c3c3f7bbe6233c5f19.tar.zst WarpX-4e2bc0444eacb6b3db36d7c3c3f7bbe6233c5f19.zip | |
Merge branch 'dev' into fft_from_local_boxes
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 () |