2 files changed, 5 insertions, 3 deletions

diff --git a/Source/Initialization/InjectorPosition.H b/Source/Initialization/InjectorPosition.H
index 19bb092dd..0e43f889e 100644
--- a/Source/Initialization/InjectorPosition.H
+++ b/Source/Initialization/InjectorPosition.H
@@ -33,7 +33,7 @@ struct InjectorPositionRegular
     {
         int nx = ref_fac*ppc.x;
         int ny = ref_fac*ppc.y;
-#if (AMREX_SPACEDIM == 3)
+#if (defined WARPX_DIM_3D) || (defined WARPX_DIM_RZ)
         int nz = ref_fac*ppc.z;
 #else
         int nz = 1;
diff --git a/Source/Initialization/PlasmaInjector.cpp b/Source/Initialization/PlasmaInjector.cpp
index 541999789..ce1258245 100644
--- a/Source/Initialization/PlasmaInjector.cpp
+++ b/Source/Initialization/PlasmaInjector.cpp
@@ -143,9 +143,11 @@ PlasmaInjector::PlasmaInjector (int ispecies, const std::string& name)
         parseDensity(pp);
         parseMomentum(pp);
     } else if (part_pos_s == "nuniformpercell") {
-        num_particles_per_cell_each_dim.resize(3);
+        // Note that for RZ, three numbers are expected, r, theta, and z.
+        // For 2D, only two are expected. The third is overwritten with 1.
+        num_particles_per_cell_each_dim.assign(3, 1);
         pp.getarr("num_particles_per_cell_each_dim", num_particles_per_cell_each_dim);
-#if ( AMREX_SPACEDIM == 2 )
+#if WARPX_DIM_2D
         num_particles_per_cell_each_dim[2] = 1;
 #endif
         // Construct InjectorPosition from InjectorPositionRegular.