diff options
author | 2019-06-05 19:01:26 -0400 | |
---|---|---|
committer | 2019-06-05 19:01:26 -0400 | |
commit | f0f8a8da1c7d57f5feff454f4e22099ca6dc09d2 (patch) | |
tree | 1b0b3408d70d5c312954fb3c4ff0284d5e2c99f0 /Source/Python | |
parent | c3a5d1fa06f1c2670d7df1cc9d4acc6852b82d1b (diff) | |
parent | 6faec7af00055eb58000967f2aa6415516533a34 (diff) | |
download | WarpX-f0f8a8da1c7d57f5feff454f4e22099ca6dc09d2.tar.gz WarpX-f0f8a8da1c7d57f5feff454f4e22099ca6dc09d2.tar.zst WarpX-f0f8a8da1c7d57f5feff454f4e22099ca6dc09d2.zip |
Merge branch 'dev' of https://github.com/ECP-WarpX/WarpX into spectral_cufftOnGPU
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 () |