Fixes in Source/Particles/Pusher/GetAndSetPosition.H

Author: dpgrote

Source/Particles/Pusher/GetAndSetPosition.H

@@ -63,25 +63,16 @@ struct GetParticlePosition
 {
     using RType = amrex::ParticleReal;
 
-#if defined(WARPX_DIM_RZ) || defined(WARPX_DIM_XZ)
-    const RType* AMREX_RESTRICT m_x = nullptr;
-    const RType* AMREX_RESTRICT m_z = nullptr;
-#elif defined(WARPX_DIM_3D)
     const RType* AMREX_RESTRICT m_x = nullptr;
     const RType* AMREX_RESTRICT m_y = nullptr;
     const RType* AMREX_RESTRICT m_z = nullptr;
-#elif defined(WARPX_DIM_1D_Z)
-    const RType* AMREX_RESTRICT m_z = nullptr;
-#endif
 
 #if defined(WARPX_DIM_RZ)
     const RType* m_theta = nullptr;
-#elif defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ)
-    static constexpr RType m_y_default = RType(0.0);
-#elif defined(WARPX_DIM_1D_Z)
+#endif
+
     static constexpr RType m_x_default = RType(0.0);
     static constexpr RType m_y_default = RType(0.0);
-#endif
 
     GetParticlePosition () = default;
 
@@ -118,20 +109,20 @@ struct GetParticlePosition
     AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
     void operator() (const long i, RType& x, RType& y, RType& z) const noexcept
     {
-#ifdef WARPX_DIM_RZ
+#if defined(WARPX_DIM_RZ)
         RType const r = m_x[i];
         x = r*std::cos(m_theta[i]);
         y = r*std::sin(m_theta[i]);
         z = m_z[i];
-#elif WARPX_DIM_3D
+#elif defined(WARPX_DIM_3D)
         x = m_x[i];
         y = m_y[i];
         z = m_z[i];
-#elif WARPX_DIM_XZ
+#elif defined(WARPX_DIM_XZ)
         x = m_x[i];
         y = m_y_default;
         z = m_z[i];
-#else
+#elif defined(WARPX_DIM_1D_Z)
         x = m_x_default;
         y = m_y_default;
         z = m_z[i];
@@ -146,19 +137,19 @@ struct GetParticlePosition
     AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
     void AsStored (const long i, RType& x, RType& y, RType& z) const noexcept
     {
-#ifdef WARPX_DIM_RZ
+#if defined(WARPX_DIM_RZ)
         x = m_x[i];
         y = m_theta[i];
         z = m_z[i];
-#elif WARPX_DIM_3D
+#elif defined(WARPX_DIM_3D)
         x = m_x[i];
         y = m_y[i];
         z = m_z[i];
-#elif WARPX_DIM_XZ
+#elif defined(WARPX_DIM_XZ)
         x = m_x[i];
         y = m_y_default;
         z = m_z[i];
-#else
+#elif defined(WARPX_DIM_1D_Z)
         x = m_x_default;
         y = m_y_default;
         z = m_z[i];
@@ -178,16 +169,10 @@ struct SetParticlePosition
 {
     using RType = amrex::ParticleReal;
 
-#if defined(WARPX_DIM_RZ) || defined(WARPX_DIM_XZ)
-    RType* AMREX_RESTRICT m_x;
-    RType* AMREX_RESTRICT m_z;
-#elif defined(WARPX_DIM_3D)
     RType* AMREX_RESTRICT m_x;
     RType* AMREX_RESTRICT m_y;
     RType* AMREX_RESTRICT m_z;
-#elif defined(WARPX_DIM_1D_Z)
-    RType* AMREX_RESTRICT m_z;
-#endif
+
 #if defined(WARPX_DIM_RZ)
     RType* AMREX_RESTRICT m_theta;
 #endif
@@ -217,18 +202,18 @@ struct SetParticlePosition
     void operator() (const long i, RType x, RType y, RType z) const noexcept
     {
         amrex::ignore_unused(x,y,z);
-#ifdef WARPX_DIM_RZ
+#if defined(WARPX_DIM_RZ)
         m_theta[i] = std::atan2(y, x);
         m_x[i] = std::sqrt(x*x + y*y);
         m_z[i] = z;
-#elif WARPX_DIM_3D
+#elif defined(WARPX_DIM_3D)
         m_x[i] = x;
         m_y[i] = y;
         m_z[i] = z;
-#elif WARPX_DIM_XZ
+#elif defined(WARPX_DIM_XZ)
         m_x[i] = x;
         m_z[i] = z;
-#else
+#elif defined(WARPX_DIM_1D_Z)
         m_z[i] = z;
 #endif
     }
@@ -241,18 +226,18 @@ struct SetParticlePosition
     void AsStored (const long i, RType x, RType y, RType z) const noexcept
     {
         amrex::ignore_unused(x,y,z);
-#ifdef WARPX_DIM_RZ
+#if defined(WARPX_DIM_RZ)
         m_x[i] = x;
         m_theta[i] = y;
         m_z[i] = z;
-#elif WARPX_DIM_3D
+#elif defined(WARPX_DIM_3D)
         m_x[i] = x;
         m_y[i] = y;
         m_z[i] = z;
-#elif WARPX_DIM_XZ
+#elif defined(WARPX_DIM_XZ)
         m_x[i] = x;
         m_z[i] = z;
-#else
+#elif defined(WARPX_DIM_1D_Z)
         m_z[i] = z;
 #endif
     }