From 8ccd9bb67fa5fe100e59d999f5698d738e75d93c Mon Sep 17 00:00:00 2001 From: Remi Lehe Date: Wed, 22 May 2019 15:23:06 -0700 Subject: Implement style comments --- Source/Particles/WarpXParticleContainer.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Source/Particles/WarpXParticleContainer.cpp') diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp index e04d6aa69..fa7fda233 100644 --- a/Source/Particles/WarpXParticleContainer.cpp +++ b/Source/Particles/WarpXParticleContainer.cpp @@ -1062,14 +1062,12 @@ WarpXParticleContainer::PushX (int lev, Real dt) Real x, y, z; // Temporary variables #ifndef WARPX_RZ GetPosition( x, y, z, p ); // Initialize x, y, z -#else - GetCartesianPositionFromCylindrical( x, y, z, p, theta ); -#endif - // Even for RZ, the particles are pushed in 3D Cartesian UpdatePosition( x, y, z, ux[i], uy[i], uz[i], dt); -#ifndef WARPX_RZ SetPosition( p, x, y, z ); // Update the object p #else + // For WARPX_RZ, the particles are still pushed in 3D Cartesian + GetCartesianPositionFromCylindrical( x, y, z, p, theta ); + UpdatePosition( x, y, z, ux[i], uy[i], uz[i], dt); SetCylindricalPositionFromCartesian( p, theta, x, y, z ); #endif } -- cgit v1.2.3