diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | Source/FortranInterface/WarpX_f.H | 11 | ||||
| -rw-r--r-- | Source/Make.WarpX | 4 | ||||
| -rw-r--r-- | Source/Particles/PhysicalParticleContainer.cpp | 17 | ||||
| -rw-r--r-- | Tools/performance_tests/GNUmakefile_perftest | 1 |
5 files changed, 11 insertions, 24 deletions
diff --git a/GNUmakefile b/GNUmakefile index be8c80650..1acd53be7 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -17,8 +17,6 @@ TINY_PROFILE = TRUE #COMM_PROFILE = TRUE #TRACE_PROFILE = TRUE -STORE_OLD_PARTICLE_ATTRIBS = FALSE - USE_OMP = TRUE USE_GPU = FALSE diff --git a/Source/FortranInterface/WarpX_f.H b/Source/FortranInterface/WarpX_f.H index 473ca645a..f246f9f54 100644 --- a/Source/FortranInterface/WarpX_f.H +++ b/Source/FortranInterface/WarpX_f.H @@ -81,17 +81,16 @@ extern "C" { #endif -#ifdef WARPX_STORE_OLD_PARTICLE_ATTRIBS void warpx_copy_attribs(const long* np, const amrex_real* xp, const amrex_real* yp, const amrex_real* zp, const amrex_real* uxp, const amrex_real* uyp, const amrex_real* uzp, amrex_real* xpold, amrex_real* ypold, amrex_real* zpold, amrex_real* uxpold, amrex_real* uypold, amrex_real* uzpold); -#endif - void WRPX_COPY_SLICE(const int* lo, const int* hi, - const amrex_real* tmp, const int* tlo, const int* thi, - amrex_real* buf, const int* blo, const int* bhi, - const int* ncomp, const int* i_boost, const int* i_lab); + + void WRPX_COPY_SLICE(const int* lo, const int* hi, + const amrex_real* tmp, const int* tlo, const int* thi, + amrex_real* buf, const int* blo, const int* bhi, + const int* ncomp, const int* i_boost, const int* i_lab); // Charge deposition void warpx_charge_deposition(amrex::Real* rho, diff --git a/Source/Make.WarpX b/Source/Make.WarpX index 926523d82..95e2b4ec0 100644 --- a/Source/Make.WarpX +++ b/Source/Make.WarpX @@ -123,10 +123,6 @@ ifeq ($(USE_RZ),TRUE) DEFINES += -DWARPX_RZ endif -ifeq ($(STORE_OLD_PARTICLE_ATTRIBS),TRUE) - DEFINES += -DWARPX_STORE_OLD_PARTICLE_ATTRIBS -endif - ifeq ($(DO_ELECTROSTATIC),TRUE) include $(AMREX_HOME)/Src/LinearSolvers/C_to_F_MG/Make.package include $(AMREX_HOME)/Src/LinearSolvers/F_MG/FParallelMG.mak diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index e31d43204..74052f842 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -1801,7 +1801,6 @@ void PhysicalParticleContainer::GetParticleSlice(const int direction, const Real { BL_PROFILE("PhysicalParticleContainer::GetParticleSlice"); -#ifdef WARPX_STORE_OLD_PARTICLE_ATTRIBS // Assume that the boost in the positive z direction. #if (AMREX_SPACEDIM == 2) AMREX_ALWAYS_ASSERT(direction == 1); @@ -1864,12 +1863,12 @@ void PhysicalParticleContainer::GetParticleSlice(const int direction, const Real auto& uyp_new = attribs[PIdx::uy ]; auto& uzp_new = attribs[PIdx::uz ]; - auto& xp_old = attribs[PIdx::xold ]; - auto& yp_old = attribs[PIdx::yold ]; - auto& zp_old = attribs[PIdx::zold ]; - auto& uxp_old = attribs[PIdx::uxold]; - auto& uyp_old = attribs[PIdx::uyold]; - auto& uzp_old = attribs[PIdx::uzold]; + auto& xp_old = pti.GetAttribs(particle_comps["xold"]); + auto& yp_old = pti.GetAttribs(particle_comps["yold"]); + auto& zp_old = pti.GetAttribs(particle_comps["zold"]); + auto& uxp_old = pti.GetAttribs(particle_comps["uxold"]); + auto& uyp_old = pti.GetAttribs(particle_comps["uyold"]); + auto& uzp_old = pti.GetAttribs(particle_comps["uzold"]); const long np = pti.numParticles(); @@ -1919,10 +1918,6 @@ void PhysicalParticleContainer::GetParticleSlice(const int direction, const Real } } } -#else - AMREX_ALWAYS_ASSERT_WITH_MESSAGE( false , -"ERROR: WarpX must be compiled with STORE_OLD_PARTICLE_ATTRIBS=TRUE to use the back-transformed diagnostics"); -#endif } int PhysicalParticleContainer::GetRefineFac(const Real x, const Real y, const Real z) diff --git a/Tools/performance_tests/GNUmakefile_perftest b/Tools/performance_tests/GNUmakefile_perftest index bbb2cc659..7740b0a64 100644 --- a/Tools/performance_tests/GNUmakefile_perftest +++ b/Tools/performance_tests/GNUmakefile_perftest @@ -6,7 +6,6 @@ DEBUG = FALSE DIM = 3 COMP=intel TINY_PROFILE = TRUE -STORE_OLD_PARTICLE_ATTRIBS=TRUE USE_OMP = TRUE EBASE = perf_tests USE_PYTHON_MAIN = FALSE |