CI: Clean Up Galilean/Comoving Hybrid Tests (#1978)

5 files changed, 124 insertions, 6 deletions

diff --git a/Examples/Tests/comoving/inputs_2d_hybrid b/Examples/Tests/comoving/inputs_2d_hybrid
new file mode 100644
index 000000000..055224892
--- /dev/null
+++ b/Examples/Tests/comoving/inputs_2d_hybrid
@@ -0,0 +1,116 @@
+max_step = 500
+
+amr.max_level = 0
+amr.n_cell = 96 704
+warpx.numprocs = 1 2
+
+geometry.coord_sys = 0
+geometry.is_periodic = 1 0
+geometry.prob_lo = -90.e-6 -70.e-6
+geometry.prob_hi =  90.e-6   0.e-6
+
+algo.maxwell_solver = psatd
+algo.current_deposition = direct
+algo.charge_deposition = standard
+algo.field_gathering = momentum-conserving
+algo.particle_pusher = vay
+
+# Order of particle shape factors
+algo.particle_shape = 3
+
+psatd.v_comoving = 0. 0. -0.9970370305242862
+
+warpx.cfl = 1.
+
+warpx.do_nodal = 0
+warpx.do_pml = 0
+
+warpx.gamma_boost = 13.
+warpx.boost_direction = z
+
+warpx.do_moving_window = 1
+warpx.moving_window_dir = z
+warpx.moving_window_v = 1.0
+
+warpx.use_filter = 1
+
+warpx.serialize_ics = 1
+warpx.verbose = 1
+
+interpolation.field_centering_nox = 8
+interpolation.field_centering_noz = 8
+
+particles.species_names = electrons ions beam
+particles.use_fdtd_nci_corr = 0
+particles.rigid_injected_species = beam
+
+electrons.charge = -q_e
+electrons.mass = m_e
+electrons.injection_style = NUniformPerCell
+electrons.num_particles_per_cell_each_dim = 2 2
+electrons.momentum_distribution_type = "gaussian"
+electrons.ux_th = 0.0001
+electrons.uy_th = 0.0001
+electrons.uz_th = 0.0001
+electrons.xmin = -85.e-6
+electrons.xmax =  85.e-6
+electrons.zmin = 0.
+electrons.zmax = 15000.e-6
+electrons.profile = "predefined"
+electrons.predefined_profile_name = "parabolic_channel"
+electrons.predefined_profile_params = 0. 0.5e-3 14.e-3 0.5e-3 30.e-6 1.e24
+electrons.do_continuous_injection = 1
+
+ions.charge = q_e
+ions.mass = m_p
+ions.injection_style = NUniformPerCell
+ions.num_particles_per_cell_each_dim = 2 2
+ions.momentum_distribution_type = "gaussian"
+ions.xmin = -85.e-6
+ions.xmax =  85.e-6
+ions.zmin = 0.
+ions.zmax = 15000.e-6
+ions.profile = "predefined"
+ions.predefined_profile_name = "parabolic_channel"
+ions.predefined_profile_params = 0. 0.5e-3 14.e-3 0.5e-3 30.e-6 1.e24
+ions.do_continuous_injection = 1
+
+beam.charge = -q_e
+beam.mass = m_e
+beam.injection_style = "gaussian_beam"
+beam.x_rms = 2.e-6
+beam.y_rms = 2.e-6
+beam.z_rms = 1.e-6
+beam.x_m = 0.
+beam.y_m = 0.
+beam.z_m = -42.e-6
+beam.npart = 1000
+beam.q_tot = -1.e-12
+beam.momentum_distribution_type = "gaussian"
+beam.ux_m = 0.0
+beam.uy_m = 0.0
+beam.uz_m = 200.
+beam.ux_th = 2.
+beam.uy_th = 2.
+beam.uz_th = 0.
+beam.zinject_plane = 0.5e-3
+beam.rigid_advance = true
+beam.projected = true
+beam.focused = false
+
+lasers.names = laser1
+laser1.profile = Gaussian
+laser1.position = 0. 0. -0.1e-6
+laser1.direction = 0. 0. 1.
+laser1.polarization = 0. 1. 0.
+laser1.e_max = 6.e12
+laser1.profile_waist = 30.e-6
+laser1.profile_duration = 26.e-15
+laser1.profile_t_peak = 66.e-15
+laser1.profile_focal_distance = 0.5e-3
+laser1.wavelength = 0.81e-6
+
+diagnostics.diags_names = diag1
+diag1.intervals = 500
+diag1.diag_type = Full
+diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz rho
diff --git a/Examples/Tests/spectral_staggered/inputs_hybrid_2d b/Examples/Tests/galilean/inputs_2d_hybrid
index 284a16521..892dfe530 100644
--- a/Examples/Tests/spectral_staggered/inputs_hybrid_2d
+++ b/Examples/Tests/galilean/inputs_2d_hybrid
@@ -18,6 +18,8 @@ algo.particle_pusher = vay
 # Order of particle shape factors
 algo.particle_shape = 3
 
+psatd.use_default_v_galilean = 1
+
 warpx.cfl = 1.
 
 warpx.do_nodal = 0
diff --git a/Regression/Checksum/benchmarks_json/comoving_hybrid_2d.json b/Regression/Checksum/benchmarks_json/comoving_2d_psatd_hybrid.json
index fa936c3c7..fa936c3c7 100644
--- a/Regression/Checksum/benchmarks_json/comoving_hybrid_2d.json
+++ b/Regression/Checksum/benchmarks_json/comoving_2d_psatd_hybrid.json
diff --git a/Regression/Checksum/benchmarks_json/galilean_hybrid_2d.json b/Regression/Checksum/benchmarks_json/galilean_2d_psatd_hybrid.json
index 36159b1cb..36159b1cb 100644
--- a/Regression/Checksum/benchmarks_json/galilean_hybrid_2d.json
+++ b/Regression/Checksum/benchmarks_json/galilean_2d_psatd_hybrid.json
diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini
index 7be3e2210..13aca46a5 100644
--- a/Regression/WarpX-tests.ini
+++ b/Regression/WarpX-tests.ini
@@ -1757,10 +1757,10 @@ particleTypes = electrons ions
 analysisRoutine = Examples/Tests/galilean/analysis_2d.py
 tolerance = 1.e-14
 
-[galilean_hybrid_2d]
+[galilean_2d_psatd_hybrid]
 buildDir = .
-inputFile = Examples/Tests/spectral_staggered/inputs_hybrid_2d
-runtime_params = psatd.use_default_v_galilean=1
+inputFile = Examples/Tests/galilean/inputs_2d_hybrid
+runtime_params =
 dim = 2
 addToCompileString = USE_PSATD=TRUE
 restartTest = 0
@@ -1775,10 +1775,10 @@ particleTypes = electrons ions beam
 analysisRoutine = Examples/analysis_default_regression.py
 tolerance = 1.e-14
 
-[comoving_hybrid_2d]
+[comoving_2d_psatd_hybrid]
 buildDir = .
-inputFile = Examples/Tests/spectral_staggered/inputs_hybrid_2d
-runtime_params = psatd.v_comoving = 0. 0. -0.9970370305242862
+inputFile = Examples/Tests/comoving/inputs_2d_hybrid
+runtime_params =
 dim = 2
 addToCompileString = USE_PSATD=TRUE
 restartTest = 0