diff options
author | 2020-01-22 10:55:31 -0800 | |
---|---|---|
committer | 2020-01-22 10:55:31 -0800 | |
commit | 37658d9be9d9368f94bd95ec6d2f1cd0e5f3bf3b (patch) | |
tree | 10c4d4c2a5efeee1642f88fca4591abc2266855c /Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp | |
parent | 3c8d481997a0a5063fd32b68d907cf1f70b10e8e (diff) | |
parent | 6abaac6d206162963ce9fab6c833708425f7a2ab (diff) | |
download | WarpX-37658d9be9d9368f94bd95ec6d2f1cd0e5f3bf3b.tar.gz WarpX-37658d9be9d9368f94bd95ec6d2f1cd0e5f3bf3b.tar.zst WarpX-37658d9be9d9368f94bd95ec6d2f1cd0e5f3bf3b.zip |
fixing merge conflict with dev
Diffstat (limited to 'Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp')
-rw-r--r-- | Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp index aee131324..c21388aba 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp @@ -144,12 +144,7 @@ SpectralKSpace::getSpectralShiftFactor( const DistributionMapping& dm, } const Complex I{0,1}; for (int i=0; i<k.size(); i++ ){ -#ifdef AMREX_USE_GPU - shift[i] = thrust::exp( I*sign*k[i]*0.5*dx[i_dim] ); -#else - shift[i] = std::exp( I*sign*k[i]*0.5*dx[i_dim] ); -#endif - + shift[i] = exp( I*sign*k[i]*0.5*dx[i_dim]); } } return shift_factor; |