diff options
author | 2021-12-08 15:27:38 -0800 | |
---|---|---|
committer | 2021-12-08 23:27:38 +0000 | |
commit | 583c78e563f7a74e89fb49ff77c7a93c0baaad78 (patch) | |
tree | af71f27e07f68a26bc64bacfed976d64c8c7bf0b /Source/FieldSolver/FiniteDifferenceSolver | |
parent | 6577874ae22634fee907fe9180080f7e6998afa1 (diff) | |
download | WarpX-583c78e563f7a74e89fb49ff77c7a93c0baaad78.tar.gz WarpX-583c78e563f7a74e89fb49ff77c7a93c0baaad78.tar.zst WarpX-583c78e563f7a74e89fb49ff77c7a93c0baaad78.zip |
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
Diffstat (limited to 'Source/FieldSolver/FiniteDifferenceSolver')
-rw-r--r-- | Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp | 2 | ||||
-rw-r--r-- | Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp index b182a836b..b8c43190f 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp @@ -192,7 +192,7 @@ void FiniteDifferenceSolver::EvolveEPMLCartesian ( const Real* sigmaj_y = sigba[mfi].sigma[1].data(); const Real* sigmaj_z = sigba[mfi].sigma[2].data(); int const x_lo = sigba[mfi].sigma[0].lo(); -#if (AMREX_SPACEDIM == 3) +#if defined(WARPX_DIM_3D) int const y_lo = sigba[mfi].sigma[1].lo(); int const z_lo = sigba[mfi].sigma[2].lo(); #else diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp index 3cd607392..8076bdf8f 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicProperties/MacroscopicProperties.cpp @@ -177,7 +177,7 @@ MacroscopicProperties::InitData () Ez_IndexType[idim] = Ez_stag[idim]; macro_cr_ratio[idim] = 1; } -#if (AMREX_SPACEDIM==2) +#if defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ) sigma_IndexType[2] = 0; epsilon_IndexType[2] = 0; mu_IndexType[2] = 0; @@ -208,7 +208,7 @@ MacroscopicProperties::InitializeMacroMultiFabUsingParser ( // Shift x, y, z position based on index type amrex::Real fac_x = (1._rt - iv[0]) * dx_lev[0] * 0.5_rt; amrex::Real x = i * dx_lev[0] + real_box.lo(0) + fac_x; -#if (AMREX_SPACEDIM==2) +#if defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ) amrex::Real y = 0._rt; amrex::Real fac_z = (1._rt - iv[1]) * dx_lev[1] * 0.5_rt; amrex::Real z = j * dx_lev[1] + real_box.lo(1) + fac_z; |