Merge branch 'qed_bw_qs_factory_class' into qed_evolve_optical_depth

21 files changed, 21 insertions, 21 deletions

diff --git a/Examples/Modules/boosted_diags/inputs.3d.slice b/Examples/Modules/boosted_diags/inputs.3d.slice
index fdd150949..ca745f347 100644
--- a/Examples/Modules/boosted_diags/inputs.3d.slice
+++ b/Examples/Modules/boosted_diags/inputs.3d.slice
@@ -13,7 +13,7 @@ geometry.prob_hi     =  128.e-6  128.e-6   0.96e-6
 
 algo.current_deposition = esirkepov
 algo.charge_deposition = standard
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 algo.particle_pusher = vay
 algo.maxwell_fdtd_solver = ckc
 interpolation.nox = 3
diff --git a/Examples/Modules/qed/breit_wheeler/inputs.2d_test_table_gen b/Examples/Modules/qed/breit_wheeler/inputs.2d_test_table_gen
index 1c1e96cf3..99a660d7c 100644
--- a/Examples/Modules/qed/breit_wheeler/inputs.2d_test_table_gen
+++ b/Examples/Modules/qed/breit_wheeler/inputs.2d_test_table_gen
@@ -21,7 +21,7 @@ warpx.fine_tag_hi =  5.e-6   -25.e-6
 #################################
 algo.current_deposition = esirkepov
 algo.charge_deposition = standard
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 algo.particle_pusher = boris
 interpolation.nox = 3 # Particle interpolation order. Must be the same in x, y, and z
 interpolation.noy = 3
diff --git a/Examples/Modules/qed/breit_wheeler/inputs.2d_test_tau_init b/Examples/Modules/qed/breit_wheeler/inputs.2d_test_tau_init
index 78b9c198b..2cfa476f9 100644
--- a/Examples/Modules/qed/breit_wheeler/inputs.2d_test_tau_init
+++ b/Examples/Modules/qed/breit_wheeler/inputs.2d_test_tau_init
@@ -19,7 +19,7 @@ warpx.fine_tag_hi =  5.e-6   -25.e-6
 #################################
 algo.current_deposition = esirkepov
 algo.charge_deposition = standard
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 algo.particle_pusher = boris
 interpolation.nox = 3 # Particle interpolation order. Must be the same in x, y, and z
 interpolation.noy = 3
diff --git a/Examples/Modules/qed/quantum_synchrotron/inputs.2d_test_table_gen b/Examples/Modules/qed/quantum_synchrotron/inputs.2d_test_table_gen
index 2d3449fd7..fd1d90b64 100644
--- a/Examples/Modules/qed/quantum_synchrotron/inputs.2d_test_table_gen
+++ b/Examples/Modules/qed/quantum_synchrotron/inputs.2d_test_table_gen
@@ -21,7 +21,7 @@ warpx.fine_tag_hi =  5.e-6   -25.e-6
 #################################
 algo.current_deposition = esirkepov
 algo.charge_deposition = standard
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 algo.particle_pusher = boris
 interpolation.nox = 3 # Particle interpolation order. Must be the same in x, y, and z
 interpolation.noy = 3
diff --git a/Examples/Modules/qed/quantum_synchrotron/inputs.2d_test_tau_init b/Examples/Modules/qed/quantum_synchrotron/inputs.2d_test_tau_init
index 4844245e9..4ebf12e3e 100644
--- a/Examples/Modules/qed/quantum_synchrotron/inputs.2d_test_tau_init
+++ b/Examples/Modules/qed/quantum_synchrotron/inputs.2d_test_tau_init
@@ -19,7 +19,7 @@ warpx.fine_tag_hi =  5.e-6   -25.e-6
 #################################
 algo.current_deposition = esirkepov
 algo.charge_deposition = standard
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 algo.particle_pusher = boris
 interpolation.nox = 3 # Particle interpolation order. Must be the same in x, y, and z
 interpolation.noy = 3
diff --git a/Examples/Physics_applications/laser_acceleration/inputs.2d.boost b/Examples/Physics_applications/laser_acceleration/inputs.2d.boost
index d90c75ada..89bded6c0 100644
--- a/Examples/Physics_applications/laser_acceleration/inputs.2d.boost
+++ b/Examples/Physics_applications/laser_acceleration/inputs.2d.boost
@@ -21,7 +21,7 @@ warpx.verbose = 1
 amrex.v = 1
 algo.current_deposition = esirkepov
 algo.charge_deposition = standard
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 algo.particle_pusher = vay
 algo.maxwell_fdtd_solver = ckc
 interpolation.nox = 3
diff --git a/Examples/Tests/Langmuir/inputs.multi.2d.rt b/Examples/Tests/Langmuir/inputs.multi.2d.rt
index 54d4e2c16..c0b0b1286 100644
--- a/Examples/Tests/Langmuir/inputs.multi.2d.rt
+++ b/Examples/Tests/Langmuir/inputs.multi.2d.rt
@@ -25,7 +25,7 @@ warpx.serialize_ics = 1
 warpx.verbose = 1
 
 # Algorithms
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 
 # Interpolation
 interpolation.nox = 1
diff --git a/Examples/Tests/Langmuir/inputs.multi.rt b/Examples/Tests/Langmuir/inputs.multi.rt
index 0dd0da3b8..00d82cc3b 100644
--- a/Examples/Tests/Langmuir/inputs.multi.rt
+++ b/Examples/Tests/Langmuir/inputs.multi.rt
@@ -27,7 +27,7 @@ warpx.verbose = 1
 
 # Algorithms
 algo.current_deposition = direct
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 
 # Interpolation
 interpolation.nox = 1
diff --git a/Examples/Tests/Langmuir/inputs.multi.rz.rt b/Examples/Tests/Langmuir/inputs.multi.rz.rt
index c2d5de756..9e76d4b26 100644
--- a/Examples/Tests/Langmuir/inputs.multi.rz.rt
+++ b/Examples/Tests/Langmuir/inputs.multi.rz.rt
@@ -26,7 +26,7 @@ warpx.serialize_ics = 1
 warpx.verbose = 1
 
 # Algorithms
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 algo.current_deposition = esirkepov
 
 # Interpolation
diff --git a/Examples/Tests/Langmuir/inputs.rt b/Examples/Tests/Langmuir/inputs.rt
index 28602f758..bd1162972 100644
--- a/Examples/Tests/Langmuir/inputs.rt
+++ b/Examples/Tests/Langmuir/inputs.rt
@@ -25,7 +25,7 @@ warpx.serialize_ics = 1
 warpx.verbose = 1
 
 # Algorithms
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 algo.particle_pusher = "higuera"
 
 # Interpolation
diff --git a/Examples/Tests/Langmuir/langmuir_PICMI_rz_multimode_analyze.py b/Examples/Tests/Langmuir/langmuir_PICMI_rz_multimode_analyze.py
index 7f853a1f5..00e54be3e 100644
--- a/Examples/Tests/Langmuir/langmuir_PICMI_rz_multimode_analyze.py
+++ b/Examples/Tests/Langmuir/langmuir_PICMI_rz_multimode_analyze.py
@@ -79,7 +79,7 @@ sim = picmi.Simulation(solver = solver,
                        verbose = 1,
                        warpx_plot_int = 40,
                        warpx_current_deposition_algo = 'esirkepov',
-                       warpx_field_gathering_algo = 'standard',
+                       warpx_field_gathering_algo = 'energy-conserving',
                        warpx_particle_pusher_algo = 'boris')
 
 sim.add_species(electrons, layout=picmi.GriddedLayout(n_macroparticle_per_cell=[2,16,2], grid=grid))
diff --git a/Examples/Tests/SingleParticle/inputs b/Examples/Tests/SingleParticle/inputs
index 548848d79..4db020065 100644
--- a/Examples/Tests/SingleParticle/inputs
+++ b/Examples/Tests/SingleParticle/inputs
@@ -10,7 +10,7 @@ geometry.prob_lo     = -8 -12
 geometry.prob_hi     =  8  12
 warpx.do_pml = 0
 algo.charge_deposition = standard
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 warpx.cfl = 1.0
 
 particles.nspecies = 1
diff --git a/Examples/Tests/gpu_test/inputs b/Examples/Tests/gpu_test/inputs
index e4ae27469..9cb6b819b 100644
--- a/Examples/Tests/gpu_test/inputs
+++ b/Examples/Tests/gpu_test/inputs
@@ -25,7 +25,7 @@ warpx.verbose = 1
 
 # Algorithms
 algo.current_deposition = direct
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 
 interpolation.nox = 1
 interpolation.noy = 1
diff --git a/Examples/Tests/laser_on_fine/inputs b/Examples/Tests/laser_on_fine/inputs
index 83d70e6a1..8a3b6fa7b 100644
--- a/Examples/Tests/laser_on_fine/inputs
+++ b/Examples/Tests/laser_on_fine/inputs
@@ -40,7 +40,7 @@ warpx.verbose = 1
 # Algorithms
 algo.current_deposition = esirkepov
 algo.charge_deposition = standard
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 
 # CFL
 warpx.cfl = 1.0
diff --git a/Examples/Tests/laser_on_fine/inputs.2d b/Examples/Tests/laser_on_fine/inputs.2d
index 6919bac64..93b1cd9f2 100644
--- a/Examples/Tests/laser_on_fine/inputs.2d
+++ b/Examples/Tests/laser_on_fine/inputs.2d
@@ -40,7 +40,7 @@ warpx.verbose = 1
 # Algorithms
 algo.current_deposition = esirkepov
 algo.charge_deposition = standard
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 
 # CFL
 warpx.cfl = 1.0
diff --git a/Examples/Tests/particle_pusher/inputs b/Examples/Tests/particle_pusher/inputs
index 45c075f51..a0ef3db75 100755
--- a/Examples/Tests/particle_pusher/inputs
+++ b/Examples/Tests/particle_pusher/inputs
@@ -21,7 +21,7 @@ warpx.do_pml = 0
 
 # Algorithms
 algo.charge_deposition = standard
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 algo.particle_pusher = "higuera"
 
 # CFL
diff --git a/Examples/Tests/photon_pusher/check.py b/Examples/Tests/photon_pusher/check.py
index 3e6873842..d0986de48 100755
--- a/Examples/Tests/photon_pusher/check.py
+++ b/Examples/Tests/photon_pusher/check.py
@@ -112,7 +112,7 @@ def generate():
         f.write("geometry.prob_hi = 0.5e-6 0.5e-6 0.5e-6\n")
         f.write("warpx.do_pml = 0\n")
         f.write("algo.charge_deposition = standard\n")
-        f.write("algo.field_gathering = standard\n")
+        f.write("algo.field_gathering = energy-conserving\n")
         f.write("warpx.cfl = 1.0\n")
 
         f.write("\nparticles.nspecies = {}\n".format(len(spec_names)))
diff --git a/Examples/Tests/photon_pusher/inputs b/Examples/Tests/photon_pusher/inputs
index 751eb2a6e..1d61d76b4 100644
--- a/Examples/Tests/photon_pusher/inputs
+++ b/Examples/Tests/photon_pusher/inputs
@@ -14,7 +14,7 @@ geometry.prob_lo = -0.5e-6 -0.5e-6 -0.5e-6
 geometry.prob_hi = 0.5e-6 0.5e-6 0.5e-6
 warpx.do_pml = 0
 algo.charge_deposition = standard
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 warpx.cfl = 1.0
 
 particles.nspecies = 16
diff --git a/Examples/Tests/radiation_reaction/test_const_B_analytical/check.py b/Examples/Tests/radiation_reaction/test_const_B_analytical/check.py
index 6d0ca4502..d9e3e28d9 100755
--- a/Examples/Tests/radiation_reaction/test_const_B_analytical/check.py
+++ b/Examples/Tests/radiation_reaction/test_const_B_analytical/check.py
@@ -149,7 +149,7 @@ def generate():
         f.write("geometry.prob_hi = {} {} {}\n".format(sim_size, sim_size, sim_size))
         f.write("warpx.do_pml = 0\n")
         f.write("algo.charge_deposition = standard\n")
-        f.write("algo.field_gathering = standard\n")
+        f.write("algo.field_gathering = energy-conserving\n")
         f.write("warpx.cfl = 1.0\n")
         f.write("warpx.serialize_ics = 1\n")
 
diff --git a/Examples/Tests/radiation_reaction/test_const_B_analytical/inputs b/Examples/Tests/radiation_reaction/test_const_B_analytical/inputs
index 51d89d740..f0bcc55b4 100644
--- a/Examples/Tests/radiation_reaction/test_const_B_analytical/inputs
+++ b/Examples/Tests/radiation_reaction/test_const_B_analytical/inputs
@@ -13,7 +13,7 @@ geometry.prob_lo = -8e-07 -8e-07 -8e-07
 geometry.prob_hi = 8e-07 8e-07 8e-07
 warpx.do_pml = 0
 algo.charge_deposition = standard
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 warpx.cfl = 1.0
 warpx.serialize_ics = 1
 
diff --git a/Examples/Tests/self_force_test/inputs b/Examples/Tests/self_force_test/inputs
index 5e7bcc4f8..ff825c7ed 100644
--- a/Examples/Tests/self_force_test/inputs
+++ b/Examples/Tests/self_force_test/inputs
@@ -44,7 +44,7 @@ warpx.verbose = 1
 # Algorithms
 algo.current_deposition = esirkepov
 algo.charge_deposition = standard
-algo.field_gathering = standard
+algo.field_gathering = energy-conserving
 
 # CFL
 warpx.cfl = 1.0