Replace AMREX_SPACEDIM: Evolve & FieldSolver (#2642)

* AMREX_SPACEDIM : Boundary Conditions

* AMREX_SPACEDIM : Parallelization

* Fix compilation

* AMREX_SPACEDIM : Initialization

* Fix Typo

* space

* AMREX_SPACEDIM : Particles

* AMREX_SPACEDIM : Evolve and FieldSolver

1 files changed, 19 insertions, 19 deletions

diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp
index 1f3c67629..fe9562dba 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp
@@ -49,7 +49,7 @@ PsatdAlgorithm::PsatdAlgorithm(
     // these are computed always with the assumption of centered grids
     // (argument nodal = true), for both nodal and staggered simulations
     modified_kx_vec_centered(spectral_kspace.getModifiedKComponent(dm, 0, norder_x, true)),
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
     modified_ky_vec_centered(spectral_kspace.getModifiedKComponent(dm, 1, norder_y, true)),
     modified_kz_vec_centered(spectral_kspace.getModifiedKComponent(dm, 2, norder_z, true)),
 #else
@@ -183,7 +183,7 @@ PsatdAlgorithm::pushSpectralFields (SpectralFieldData& f) const
 
         // Extract pointers for the k vectors
         const amrex::Real* modified_kx_arr = modified_kx_vec[mfi].dataPtr();
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
         const amrex::Real* modified_ky_arr = modified_ky_vec[mfi].dataPtr();
 #endif
         const amrex::Real* modified_kz_arr = modified_kz_vec[mfi].dataPtr();
@@ -220,7 +220,7 @@ PsatdAlgorithm::pushSpectralFields (SpectralFieldData& f) const
 
             // k vector values
             const amrex::Real kx = modified_kx_arr[i];
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
             const amrex::Real ky = modified_ky_arr[j];
             const amrex::Real kz = modified_kz_arr[k];
 #else
@@ -447,7 +447,7 @@ void PsatdAlgorithm::InitializeSpectralCoefficients (
         // Extract pointers for the k vectors
         const amrex::Real* kx_s = modified_kx_vec[mfi].dataPtr();
         const amrex::Real* kx_c = modified_kx_vec_centered[mfi].dataPtr();
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
         const amrex::Real* ky_s = modified_ky_vec[mfi].dataPtr();
         const amrex::Real* ky_c = modified_ky_vec_centered[mfi].dataPtr();
 #endif
@@ -471,7 +471,7 @@ void PsatdAlgorithm::InitializeSpectralCoefficients (
 
         // Extract Galilean velocity
         amrex::Real vg_x = m_v_galilean[0];
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
         amrex::Real vg_y = m_v_galilean[1];
 #endif
         amrex::Real vg_z = m_v_galilean[2];
@@ -482,7 +482,7 @@ void PsatdAlgorithm::InitializeSpectralCoefficients (
             // Calculate norm of k vector
             const amrex::Real knorm_s = std::sqrt(
                 std::pow(kx_s[i], 2) +
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
                 std::pow(ky_s[j], 2) + std::pow(kz_s[k], 2));
 #else
                 std::pow(kz_s[j], 2));
@@ -501,7 +501,7 @@ void PsatdAlgorithm::InitializeSpectralCoefficients (
             // modified k vectors, to work correctly for both nodal and staggered simulations.
             // w_c = 0 always with standard PSATD (zero Galilean velocity).
             const amrex::Real w_c = kx_c[i]*vg_x +
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
                 ky_c[j]*vg_y + kz_c[k]*vg_z;
 #else
                 kz_c[j]*vg_z;
@@ -646,7 +646,7 @@ void PsatdAlgorithm::InitializeSpectralCoefficientsAveraging (
         // Extract pointers for the k vectors
         const amrex::Real* kx_s = modified_kx_vec[mfi].dataPtr();
         const amrex::Real* kx_c = modified_kx_vec_centered[mfi].dataPtr();
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
         const amrex::Real* ky_s = modified_ky_vec[mfi].dataPtr();
         const amrex::Real* ky_c = modified_ky_vec_centered[mfi].dataPtr();
 #endif
@@ -663,7 +663,7 @@ void PsatdAlgorithm::InitializeSpectralCoefficientsAveraging (
 
         // Extract Galilean velocity
         amrex::Real vg_x = m_v_galilean[0];
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
         amrex::Real vg_y = m_v_galilean[1];
 #endif
         amrex::Real vg_z = m_v_galilean[2];
@@ -674,7 +674,7 @@ void PsatdAlgorithm::InitializeSpectralCoefficientsAveraging (
             // Calculate norm of k vector
             const amrex::Real knorm_s = std::sqrt(
                 std::pow(kx_s[i], 2) +
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
                 std::pow(ky_s[j], 2) + std::pow(kz_s[k], 2));
 #else
                 std::pow(kz_s[j], 2));
@@ -692,7 +692,7 @@ void PsatdAlgorithm::InitializeSpectralCoefficientsAveraging (
             // modified k vectors, to work correctly for both nodal and staggered simulations.
             // w_c = 0 always with standard PSATD (zero Galilean velocity).
             const amrex::Real w_c = kx_c[i]*vg_x +
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
                 ky_c[j]*vg_y + kz_c[k]*vg_z;
 #else
                 kz_c[j]*vg_z;
@@ -836,7 +836,7 @@ void PsatdAlgorithm::InitializeSpectralCoefficientsAvgLin (
 
         // Extract pointers for the k vectors
         const Real* kx_s = modified_kx_vec[mfi].dataPtr();
-#if (AMREX_SPACEDIM==3)
+#if defined(WARPX_DIM_3D)
         const Real* ky_s = modified_ky_vec[mfi].dataPtr();
 #endif
         const Real* kz_s = modified_kz_vec[mfi].dataPtr();
@@ -853,7 +853,7 @@ void PsatdAlgorithm::InitializeSpectralCoefficientsAvgLin (
             // Calculate norm of k vector
             const Real knorm_s = std::sqrt(
                 std::pow(kx_s[i], 2) +
-#if (AMREX_SPACEDIM==3)
+#if defined(WARPX_DIM_3D)
                 std::pow(ky_s[j], 2) + std::pow(kz_s[k], 2));
 #else
                 std::pow(kz_s[j], 2));
@@ -924,7 +924,7 @@ PsatdAlgorithm::CurrentCorrection (
         // Extract pointers for the k vectors
         const amrex::Real* const modified_kx_arr = modified_kx_vec[mfi].dataPtr();
         const amrex::Real* const modified_kx_arr_c = modified_kx_vec_centered[mfi].dataPtr();
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
         const amrex::Real* const modified_ky_arr = modified_ky_vec[mfi].dataPtr();
         const amrex::Real* const modified_ky_arr_c = modified_ky_vec_centered[mfi].dataPtr();
 #endif
@@ -952,7 +952,7 @@ PsatdAlgorithm::CurrentCorrection (
             // k vector values, and coefficients
             const amrex::Real kx = modified_kx_arr[i];
             const amrex::Real kx_c = modified_kx_arr_c[i];
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
             const amrex::Real ky = modified_ky_arr[j];
             const amrex::Real kz = modified_kz_arr[k];
             const amrex::Real ky_c = modified_ky_arr_c[j];
@@ -1040,7 +1040,7 @@ PsatdAlgorithm::VayDeposition (
 
         // Extract pointers for the modified k vectors
         const amrex::Real* const modified_kx_arr = modified_kx_vec[mfi].dataPtr();
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
         const amrex::Real* const modified_ky_arr = modified_ky_vec[mfi].dataPtr();
 #endif
         const amrex::Real* const modified_kz_arr = modified_kz_vec[mfi].dataPtr();
@@ -1050,7 +1050,7 @@ PsatdAlgorithm::VayDeposition (
         {
             // Shortcuts for the values of D
             const Complex Dx = fields(i,j,k,Idx.Jx);
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
             const Complex Dy = fields(i,j,k,Idx.Jy);
 #endif
             const Complex Dz = fields(i,j,k,Idx.Jz);
@@ -1060,7 +1060,7 @@ PsatdAlgorithm::VayDeposition (
 
             // Modified k vector values
             const amrex::Real kx_mod = modified_kx_arr[i];
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
             const amrex::Real ky_mod = modified_ky_arr[j];
             const amrex::Real kz_mod = modified_kz_arr[k];
 #else
@@ -1071,7 +1071,7 @@ PsatdAlgorithm::VayDeposition (
             if (kx_mod != 0._rt) fields(i,j,k,Idx.Jx) = I * Dx / kx_mod;
             else                 fields(i,j,k,Idx.Jx) = 0._rt;
 
-#if (AMREX_SPACEDIM == 3)
+#if defined(WARPX_DIM_3D)
             // Compute Jy
             if (ky_mod != 0._rt) fields(i,j,k,Idx.Jy) = I * Dy / ky_mod;
             else                 fields(i,j,k,Idx.Jy) = 0._rt;