13 files changed, 87 insertions, 82 deletions
diff --git a/Examples/Tests/langmuir/PICMI_inputs_langmuir2d.py b/Examples/Tests/langmuir/PICMI_inputs_2d.py
index 4b9c3ac30..4b9c3ac30 100755
--- a/Examples/Tests/langmuir/PICMI_inputs_langmuir2d.py
+++ b/Examples/Tests/langmuir/PICMI_inputs_2d.py
diff --git a/Examples/Tests/langmuir/PICMI_inputs_langmuir_rt.py b/Examples/Tests/langmuir/PICMI_inputs_3d.py
index 180180f5f..180180f5f 100755
--- a/Examples/Tests/langmuir/PICMI_inputs_langmuir_rt.py
+++ b/Examples/Tests/langmuir/PICMI_inputs_3d.py
diff --git a/Examples/Tests/langmuir/PICMI_inputs_langmuir_rz_multimode_analyze.py b/Examples/Tests/langmuir/PICMI_inputs_rz.py
index 018303a96..018303a96 100755
--- a/Examples/Tests/langmuir/PICMI_inputs_langmuir_rz_multimode_analyze.py
+++ b/Examples/Tests/langmuir/PICMI_inputs_rz.py
diff --git a/Examples/Tests/langmuir/README.md b/Examples/Tests/langmuir/README.md
index 7ee467328..febf280d4 100644
--- a/Examples/Tests/langmuir/README.md
+++ b/Examples/Tests/langmuir/README.md
@@ -1,21 +1,26 @@
-Simple example of Langmuir oscillations in a uniform plasma.
+# Examples of Langmuir oscillations in a uniform plasma in 1D, 2D, 3D, and RZ
 
-To see an example of how to use the level 0 dynamic load balancing, follow the following steps
-in this directory.
+In each case, a uniform plasma is setup with a sinusoidal perturbation in the
+electron momentum along each axis. The plasma is followed for a short period
+of time, long enough so that E fields develop. The resulting fields can be
+compared to the analytic solutions.
 
-1) Build an MPI-enabled executable.
+# Input files (for C++ version)
 
-2) Run with 4 processes using inputs.lb
-   mv plt00010 to plt00010.lb
+    inputs_1d
+    inputs_2d
+    inputs_3d
+    inputs_rz
 
-3) Run with 4 processes using inputs.nolb
-   mv plt00010 to plt00010.nolb
+# Input files (for Python version)
 
-4) amrvis3d plt00010.lb plt00010.nolb
-   set the field to "part_per_cell"
+    PICMI_inputs_2d.py
+    PICMI_inputs_3d.py
+    PICMI_inputs_rz.py
 
-You should see the effect of load balancing based of the number of particles.
+# Analysis scripts to check the results
 
-In the nolb case, there are 4484 particles per process on two of the processes, and 644 on the other two.
-
-In the   lb case, there are 2916, 2852, 2244, and 2244 particles per process.
+    analysis_1d.py
+    analysis_2d.py
+    analysis_3d.py
+    analysis_rz.py
diff --git a/Examples/Tests/langmuir/analysis_langmuir_multi_1d.py b/Examples/Tests/langmuir/analysis_1d.py
index 7b05fac66..7b05fac66 100755
--- a/Examples/Tests/langmuir/analysis_langmuir_multi_1d.py
+++ b/Examples/Tests/langmuir/analysis_1d.py
diff --git a/Examples/Tests/langmuir/analysis_langmuir_multi_2d.py b/Examples/Tests/langmuir/analysis_2d.py
index e137d5022..e137d5022 100755
--- a/Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+++ b/Examples/Tests/langmuir/analysis_2d.py
diff --git a/Examples/Tests/langmuir/analysis_langmuir_multi.py b/Examples/Tests/langmuir/analysis_3d.py
index 2e56e64d6..2e56e64d6 100755
--- a/Examples/Tests/langmuir/analysis_langmuir_multi.py
+++ b/Examples/Tests/langmuir/analysis_3d.py
diff --git a/Examples/Tests/langmuir/analysis_langmuir_multi_rz.py b/Examples/Tests/langmuir/analysis_rz.py
index e5ae21941..e5ae21941 100755
--- a/Examples/Tests/langmuir/analysis_langmuir_multi_rz.py
+++ b/Examples/Tests/langmuir/analysis_rz.py
diff --git a/Examples/Tests/langmuir/inputs_1d_multi_rt b/Examples/Tests/langmuir/inputs_1d
index af1cf3675..af1cf3675 100644
--- a/Examples/Tests/langmuir/inputs_1d_multi_rt
+++ b/Examples/Tests/langmuir/inputs_1d
diff --git a/Examples/Tests/langmuir/inputs_2d_multi_rt b/Examples/Tests/langmuir/inputs_2d
index 242ac8c19..242ac8c19 100644
--- a/Examples/Tests/langmuir/inputs_2d_multi_rt
+++ b/Examples/Tests/langmuir/inputs_2d
diff --git a/Examples/Tests/langmuir/inputs_3d_multi_rt b/Examples/Tests/langmuir/inputs_3d
index 432b47881..432b47881 100644
--- a/Examples/Tests/langmuir/inputs_3d_multi_rt
+++ b/Examples/Tests/langmuir/inputs_3d
diff --git a/Examples/Tests/langmuir/inputs_2d_multi_rz_rt b/Examples/Tests/langmuir/inputs_rz
index 534296759..534296759 100644
--- a/Examples/Tests/langmuir/inputs_2d_multi_rz_rt
+++ b/Examples/Tests/langmuir/inputs_rz
diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini
index 0a8eba780..bcb3942b1 100644
--- a/Regression/WarpX-tests.ini
+++ b/Regression/WarpX-tests.ini
@@ -368,7 +368,7 @@ analysisRoutine = Examples/Tests/single_particle/analysis_bilinear_filter.py
 
 [Langmuir_multi]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = warpx.do_dynamic_scheduling=0
 dim = 3
 addToCompileString =
@@ -382,12 +382,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = langmuir_multi_analysis.png
 
 [Langmuir_multi_single_precision]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = warpx.do_dynamic_scheduling=0
 dim = 3
 addToCompileString = PRECISION=FLOAT USE_SINGLE_PRECISION_PARTICLES=TRUE
@@ -401,12 +401,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = langmuir_multi_analysis.png
 
 [Langmuir_multi_nodal]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = warpx.do_dynamic_scheduling=0 warpx.grid_type=collocated algo.current_deposition=direct
 dim = 3
 addToCompileString =
@@ -420,12 +420,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = langmuir_multi_analysis.png
 
 [Langmuir_multi_psatd]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = algo.maxwell_solver=psatd warpx.cfl = 0.5773502691896258
 dim = 3
 addToCompileString = USE_PSATD=TRUE
@@ -439,12 +439,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = langmuir_multi_analysis.png
 
 [Langmuir_multi_psatd_multiJ]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.5773502691896258 algo.current_deposition=direct psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium
 dim = 3
 addToCompileString = USE_PSATD=TRUE
@@ -458,12 +458,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = Langmuir_multi_psatd_multiJ.png
 
 [Langmuir_multi_psatd_multiJ_nodal]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.5773502691896258 algo.current_deposition=direct psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium warpx.grid_type=collocated
 dim = 3
 addToCompileString = USE_PSATD=TRUE
@@ -477,12 +477,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = Langmuir_multi_psatd_multiJ_nodal.png
 
 [Langmuir_multi_psatd_div_cleaning]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = algo.maxwell_solver=psatd warpx.cfl = 0.5773502691896258  psatd.update_with_rho = 1  algo.current_deposition = direct  warpx.do_dive_cleaning = 1  warpx.do_divb_cleaning = 1  diag1.intervals = 0, 38:40:1 diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz part_per_cell rho divE F warpx.abort_on_warning_threshold=medium
 dim = 3
 addToCompileString = USE_PSATD=TRUE
@@ -496,12 +496,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = langmuir_multi_analysis.png
 
 [Langmuir_multi_psatd_current_correction]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = algo.maxwell_solver=psatd algo.current_deposition=esirkepov psatd.periodic_single_box_fft=1 psatd.current_correction=1 diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz part_per_cell rho divE warpx.cfl = 0.5773502691896258
 dim = 3
 addToCompileString = USE_PSATD=TRUE
@@ -515,12 +515,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = langmuir_multi_analysis.png
 
 [Langmuir_multi_psatd_current_correction_nodal]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = algo.maxwell_solver=psatd algo.current_deposition=direct psatd.periodic_single_box_fft=1 psatd.current_correction=1 warpx.grid_type=collocated diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz part_per_cell rho divE warpx.cfl = 0.5773502691896258
 dim = 3
 addToCompileString = USE_PSATD=TRUE
@@ -534,12 +534,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = langmuir_multi_analysis.png
 
 [Langmuir_multi_psatd_Vay_deposition]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = algo.maxwell_solver=psatd algo.current_deposition=vay diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.5773502691896258
 dim = 3
 addToCompileString = USE_PSATD=TRUE
@@ -553,12 +553,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = langmuir_multi_analysis.png
 
 [Langmuir_multi_psatd_Vay_deposition_nodal]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = algo.maxwell_solver=psatd warpx.grid_type=collocated algo.current_deposition=vay diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.5773502691896258
 dim = 3
 addToCompileString = USE_PSATD=TRUE
@@ -572,12 +572,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = langmuir_multi_analysis.png
 
 [Langmuir_multi_psatd_momentum_conserving]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = algo.maxwell_solver=psatd algo.field_gathering=momentum-conserving warpx.cfl = 0.5773502691896258
 dim = 3
 addToCompileString = USE_PSATD=TRUE
@@ -591,12 +591,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = langmuir_multi_analysis.png
 
 [Langmuir_multi_psatd_nodal]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = algo.maxwell_solver=psatd warpx.do_dynamic_scheduling=0 warpx.grid_type=collocated algo.current_deposition=direct warpx.cfl = 0.5773502691896258 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium
 dim = 3
 addToCompileString = USE_PSATD=TRUE
@@ -610,12 +610,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = langmuir_multi_analysis.png
 
 [Langmuir_multi_psatd_single_precision]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_3d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_3d
 runtime_params = algo.maxwell_solver=psatd warpx.cfl = 0.5773502691896258
 dim = 3
 addToCompileString = USE_PSATD=TRUE PRECISION=FLOAT USE_SINGLE_PRECISION_PARTICLES=TRUE
@@ -629,12 +629,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi.py
+analysisRoutine = Examples/Tests/langmuir/analysis_3d.py
 analysisOutputImage = langmuir_multi_analysis.png
 
 [Langmuir_multi_2d_nodal]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_2d
 runtime_params = warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=w ux uy uz diag1.positrons.variables=w ux uy uz
 dim = 2
 addToCompileString =
@@ -648,12 +648,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_2d.py
 analysisOutputImage = langmuir_multi_2d_analysis.png
 
 [Langmuir_multi_2d_MR]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_2d
 runtime_params = algo.maxwell_solver = ckc  warpx.use_filter = 1  amr.max_level = 1  amr.ref_ratio = 4  warpx.fine_tag_lo = -10.e-6 -10.e-6  warpx.fine_tag_hi = 10.e-6 10.e-6  diag1.electrons.variables = w ux uy uz  diag1.positrons.variables = w ux uy uz
 dim = 2
 addToCompileString =
@@ -667,12 +667,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_2d.py
 analysisOutputImage = Langmuir_multi_2d_MR.png
 
 [Langmuir_multi_2d_MR_anisotropic]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_2d
 runtime_params = algo.maxwell_solver = ckc  warpx.use_filter = 1  amr.max_level = 1 amr.ref_ratio_vect = 4 2 warpx.fine_tag_lo = -10.e-6 -10.e-6  warpx.fine_tag_hi = 10.e-6 10.e-6  diag1.electrons.variables = w ux uy uz  diag1.positrons.variables = w ux uy uz
 dim = 2
 addToCompileString =
@@ -686,12 +686,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_2d.py
 analysisOutputImage = Langmuir_multi_2d_MR.png
 
 [Langmuir_multi_2d_MR_psatd]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_2d
 runtime_params = algo.maxwell_solver = psatd  warpx.use_filter = 1  amr.max_level = 1  amr.ref_ratio = 4  warpx.fine_tag_lo = -10.e-6 -10.e-6  warpx.fine_tag_hi = 10.e-6 10.e-6  diag1.electrons.variables = w ux uy uz  diag1.positrons.variables = w ux uy uz psatd.current_correction=0 warpx.abort_on_warning_threshold=medium
 dim = 2
 addToCompileString = USE_PSATD=TRUE
@@ -705,12 +705,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_2d.py
 analysisOutputImage = Langmuir_multi_2d_MR_psatd.png
 
 [Langmuir_multi_2d_psatd]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_2d
 runtime_params = algo.maxwell_solver=psatd diag1.electrons.variables=w ux uy uz diag1.positrons.variables=w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium
 dim = 2
 addToCompileString = USE_PSATD=TRUE
@@ -724,12 +724,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_2d.py
 analysisOutputImage = langmuir_multi_2d_analysis.png
 
 [Langmuir_multi_2d_psatd_multiJ]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_2d
 runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium
 dim = 2
 addToCompileString = USE_PSATD=TRUE
@@ -743,12 +743,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_2d.py
 analysisOutputImage = Langmuir_multi_2d_psatd_multiJ.png
 
 [Langmuir_multi_2d_psatd_multiJ_nodal]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_2d
 runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium warpx.grid_type=collocated
 dim = 2
 addToCompileString = USE_PSATD=TRUE
@@ -762,12 +762,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_2d.py
 analysisOutputImage = Langmuir_multi_2d_psatd_multiJ_nodal.png
 
 [Langmuir_multi_2d_psatd_momentum_conserving]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_2d
 runtime_params = algo.maxwell_solver=psatd algo.field_gathering=momentum-conserving diag1.electrons.variables=w ux uy uz diag1.positrons.variables=w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium
 dim = 2
 addToCompileString = USE_PSATD=TRUE
@@ -781,12 +781,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_2d.py
 analysisOutputImage = langmuir_multi_2d_analysis.png
 
 [Langmuir_multi_2d_psatd_current_correction]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_2d
 runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=esirkepov psatd.periodic_single_box_fft=1 psatd.current_correction=1 diag1.electrons.variables=w ux uy uz diag1.positrons.variables=w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475
 dim = 2
 addToCompileString = USE_PSATD=TRUE
@@ -800,12 +800,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_2d.py
 analysisOutputImage = langmuir_multi_2d_analysis.png
 
 [Langmuir_multi_2d_psatd_current_correction_nodal]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_2d
 runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=direct psatd.periodic_single_box_fft=1 psatd.current_correction=1 warpx.grid_type=collocated diag1.electrons.variables=w ux uy uz diag1.positrons.variables=w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475
 dim = 2
 addToCompileString = USE_PSATD=TRUE
@@ -819,12 +819,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_2d.py
 analysisOutputImage = langmuir_multi_2d_analysis.png
 
 [Langmuir_multi_2d_psatd_Vay_deposition]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_2d
 runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=w ux uy uz diag1.positrons.variables=w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475
 dim = 2
 addToCompileString = USE_PSATD=TRUE
@@ -838,12 +838,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_2d.py
 analysisOutputImage = langmuir_multi_2d_analysis.png
 
 [Langmuir_multi_2d_psatd_Vay_deposition_nodal]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_2d
 runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 warpx.grid_type=collocated algo.current_deposition=vay diag1.electrons.variables=w ux uy uz diag1.positrons.variables=w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475
 dim = 2
 addToCompileString = USE_PSATD=TRUE
@@ -857,12 +857,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_2d.py
 analysisOutputImage = langmuir_multi_2d_analysis.png
 
 [Langmuir_multi_2d_psatd_nodal]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_2d
 runtime_params = algo.maxwell_solver=psatd warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=w ux uy uz diag1.positrons.variables=w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium
 dim = 2
 addToCompileString = USE_PSATD=TRUE
@@ -876,12 +876,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_2d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_2d.py
 analysisOutputImage = langmuir_multi_2d_analysis.png
 
 [Langmuir_multi_1d]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_1d_multi_rt
+inputFile = Examples/Tests/langmuir/inputs_1d
 runtime_params = algo.current_deposition=esirkepov diag1.electrons.variables=w ux uy uz diag1.positrons.variables=w ux uy uz
 dim = 1
 addToCompileString = USE_OPENPMD=TRUE QED=FALSE
@@ -895,12 +895,12 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons positrons
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_1d.py
+analysisRoutine = Examples/Tests/langmuir/analysis_1d.py
 analysisOutputImage = langmuir_multi_1d_analysis.png
 
 [Langmuir_multi_rz]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rz_rt
+inputFile = Examples/Tests/langmuir/inputs_rz
 runtime_params = diag1.electrons.variables=w ux uy uz diag1.ions.variables=w ux uy uz diag1.dump_rz_modes=0
 dim = 2
 addToCompileString = USE_RZ=TRUE
@@ -914,7 +914,7 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons ions
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_rz.py
+analysisRoutine = Examples/Tests/langmuir/analysis_rz.py
 analysisOutputImage = Langmuir_multi_rz_analysis.png
 aux1File = Regression/PostProcessingUtils/post_processing_utils.py
 
@@ -955,7 +955,7 @@ analysisRoutine = Examples/Tests/flux_injection/analysis_flux_injection_3d.py
 
 [Langmuir_multi_rz_psatd]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rz_rt
+inputFile = Examples/Tests/langmuir/inputs_rz
 runtime_params = algo.maxwell_solver=psatd diag1.electrons.variables=w ux uy uz diag1.ions.variables=w ux uy uz diag1.dump_rz_modes=0 algo.current_deposition=direct warpx.do_dive_cleaning=0 psatd.update_with_rho=1 electrons.random_theta=0 ions.random_theta=0 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium
 dim = 2
 addToCompileString = USE_RZ=TRUE USE_PSATD=TRUE BLAS_LIB=-lblas LAPACK_LIB=-llapack
@@ -969,13 +969,13 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons ions
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_rz.py
+analysisRoutine = Examples/Tests/langmuir/analysis_rz.py
 analysisOutputImage = Langmuir_multi_rz_psatd_analysis.png
 aux1File = Regression/PostProcessingUtils/post_processing_utils.py
 
 [Langmuir_multi_rz_psatd_current_correction]
 buildDir = .
-inputFile = Examples/Tests/langmuir/inputs_2d_multi_rz_rt
+inputFile = Examples/Tests/langmuir/inputs_rz
 runtime_params = algo.maxwell_solver=psatd diag1.electrons.variables=w ux uy uz diag1.ions.variables=w ux uy uz diag1.dump_rz_modes=0 algo.current_deposition=direct warpx.do_dive_cleaning=0 amr.max_grid_size=128 psatd.periodic_single_box_fft=1 psatd.current_correction=1 diag1.fields_to_plot=jr jz Er Ez Bt rho divE electrons.random_theta=0 ions.random_theta=0
 dim = 2
 addToCompileString = USE_RZ=TRUE USE_PSATD=TRUE BLAS_LIB=-lblas LAPACK_LIB=-llapack
@@ -989,15 +989,15 @@ compileTest = 0
 doVis = 0
 compareParticles = 1
 particleTypes = electrons ions
-analysisRoutine = Examples/Tests/langmuir/analysis_langmuir_multi_rz.py
+analysisRoutine = Examples/Tests/langmuir/analysis_rz.py
 analysisOutputImage = Langmuir_multi_rz_psatd_analysis.png
 aux1File = Regression/PostProcessingUtils/post_processing_utils.py
 
 [Python_Langmuir_rz_multimode]
 buildDir = .
-inputFile = Examples/Tests/langmuir/PICMI_inputs_langmuir_rz_multimode_analyze.py
+inputFile = Examples/Tests/langmuir/PICMI_inputs_rz.py
 runtime_params =
-customRunCmd = python3 PICMI_inputs_langmuir_rz_multimode_analyze.py
+customRunCmd = python3 PICMI_inputs_rz.py
 dim = 2
 addToCompileString = USE_PYTHON_MAIN=TRUE USE_RZ=TRUE
 cmakeSetupOpts = -DWarpX_DIMS=RZ -DWarpX_APP=OFF
@@ -1312,9 +1312,9 @@ analysisRoutine = Examples/analysis_default_regression.py
 
 [Python_Langmuir]
 buildDir = .
-inputFile = Examples/Tests/langmuir/PICMI_inputs_langmuir_rt.py
+inputFile = Examples/Tests/langmuir/PICMI_inputs_3d.py
 runtime_params =
-customRunCmd = python3 PICMI_inputs_langmuir_rt.py
+customRunCmd = python3 PICMI_inputs_3d.py
 dim = 3
 addToCompileString = USE_PYTHON_MAIN=TRUE
 cmakeSetupOpts = -DWarpX_DIMS=3 -DWarpX_APP=OFF
@@ -2119,9 +2119,9 @@ analysisRoutine = Examples/analysis_default_regression.py
 
 [Python_Langmuir_2d]
 buildDir = .
-inputFile = Examples/Tests/langmuir/PICMI_inputs_langmuir2d.py
+inputFile = Examples/Tests/langmuir/PICMI_inputs_2d.py
 runtime_params =
-customRunCmd = python3 PICMI_inputs_langmuir2d.py
+customRunCmd = python3 PICMI_inputs_2d.py
 dim = 2
 addToCompileString = USE_PYTHON_MAIN=TRUE
 cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_APP=OFF