diff --git a/Examples/Tests/collision/inputs_test_2d_collision_xz b/Examples/Tests/collision/inputs_test_2d_collision_xz index 69d23dfb0c0..d02421bc731 100644 --- a/Examples/Tests/collision/inputs_test_2d_collision_xz +++ b/Examples/Tests/collision/inputs_test_2d_collision_xz @@ -47,7 +47,7 @@ electron.uz_th = 0.044237441120300 electron.ux_m = 0.044237441120300 ion.charge = q_e -ion.mass = 4.554691780000000e-30 +ion.mass = 5*m_e ion.injection_style = "NRandomPerCell" ion.num_particles_per_cell = 200 ion.profile = constant diff --git a/Examples/Tests/implicit/analysis_2d_psatd.py b/Examples/Tests/implicit/analysis_2d_psatd.py index 507fc6f2c4a..57d1926661f 100755 --- a/Examples/Tests/implicit/analysis_2d_psatd.py +++ b/Examples/Tests/implicit/analysis_2d_psatd.py @@ -22,7 +22,7 @@ max_delta_E = np.abs(delta_E).max() # This case should have near machine precision conservation of energy -tolerance_rel_energy = 2.1e-14 +tolerance_rel_energy = 2.4e-14 print(f"max change in energy: {max_delta_E}") print(f"tolerance: {tolerance_rel_energy}") diff --git a/Examples/Tests/implicit/analysis_vandb_jfnk_2d.py b/Examples/Tests/implicit/analysis_vandb_jfnk_2d.py index dcbacdfde1f..fb19632021c 100755 --- a/Examples/Tests/implicit/analysis_vandb_jfnk_2d.py +++ b/Examples/Tests/implicit/analysis_vandb_jfnk_2d.py @@ -26,7 +26,7 @@ # This case should have near machine precision conservation of energy tolerance_rel_energy = 2.0e-14 -tolerance_rel_charge = 2.0e-15 +tolerance_rel_charge = 5.0e-15 print(f"max change in energy: {max_delta_E}") print(f"tolerance: {tolerance_rel_energy}") diff --git a/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py b/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py index 917cd86f258..6ab73599368 100755 --- a/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py +++ b/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py @@ -80,7 +80,7 @@ ## Checks whether this is the 2D or the 3D test with open("./warpx_used_inputs") as warpx_used_inputs: - is_2D = re.search("geometry.dims\s*=\s*2", warpx_used_inputs.read()) + is_2D = re.search(r"geometry.dims\s*=\s*2", warpx_used_inputs.read()) warpx_used_inputs.close() ## Some numerical parameters for this test @@ -697,6 +697,9 @@ def check_initial_energy2(data): ## Tolerance is quite high because we don't have a lot of alphas to produce good ## statistics and an event like alpha1 emitted exactly in direction of proton & alpha2 ## emitted exactly in direction opposite to Beryllium is somewhat rare. + print( + f"Check energy max: {np.amax(energy_alpha2_simulation)} {max_energy_alpha23} {(np.amax(energy_alpha2_simulation) - max_energy_alpha23) / max_energy_alpha23}" + ) assert is_close( np.amax(energy_alpha2_simulation), max_energy_alpha23, rtol=5e-2 ) diff --git a/Regression/Checksum/benchmarks_json/test_2d_collision_xz.json b/Regression/Checksum/benchmarks_json/test_2d_collision_xz.json index f1a701b0b90..7dd6a27c330 100644 --- a/Regression/Checksum/benchmarks_json/test_2d_collision_xz.json +++ b/Regression/Checksum/benchmarks_json/test_2d_collision_xz.json @@ -7,20 +7,20 @@ "Ey": 0.0, "Ez": 0.0 }, - "electron": { - "particle_momentum_x": 1.051331621347773e-19, - "particle_momentum_y": 1.0204364141577879e-19, - "particle_momentum_z": 1.0222531737361235e-19, - "particle_position_x": 2650543.814469911, - "particle_position_y": 2652390.61355008, + "ion": { + "particle_momentum_x": 2.512406771889122e-19, + "particle_momentum_y": 2.2810137606215245e-19, + "particle_momentum_z": 2.301368316732242e-19, + "particle_position_x": 2653778.511375534, + "particle_position_y": 2656865.2934060013, "particle_weight": 1.7256099431746894e+26 }, - "ion": { - "particle_momentum_x": 2.505385441350302e-19, - "particle_momentum_y": 2.2761179687239243e-19, - "particle_momentum_z": 2.2490068532364385e-19, - "particle_position_x": 2656492.0473778076, - "particle_position_y": 2643060.6521636276, + "electron": { + "particle_momentum_x": 1.0292562730323051e-19, + "particle_momentum_y": 1.0139315575041319e-19, + "particle_momentum_z": 1.0167161887065607e-19, + "particle_position_x": 2653246.6087186793, + "particle_position_y": 2636915.7576143807, "particle_weight": 1.7256099431746894e+26 } -} \ No newline at end of file +} diff --git a/Regression/Checksum/benchmarks_json/test_2d_collision_xz_picmi.json b/Regression/Checksum/benchmarks_json/test_2d_collision_xz_picmi.json index 87269b0cd6a..b7485032e2d 100644 --- a/Regression/Checksum/benchmarks_json/test_2d_collision_xz_picmi.json +++ b/Regression/Checksum/benchmarks_json/test_2d_collision_xz_picmi.json @@ -11,19 +11,19 @@ "jz": 0.0 }, "ion": { - "particle_momentum_x": 2.539598750066969e-19, - "particle_momentum_y": 2.262256113060241e-19, - "particle_momentum_z": 2.276160224152753e-19, - "particle_position_x": 2665280.024328322, - "particle_position_y": 2666941.3419517274, + "particle_momentum_x": 2.4971997868497085e-19, + "particle_momentum_y": 2.289227973516018e-19, + "particle_momentum_z": 2.278642678097319e-19, + "particle_position_x": 2667472.2031060155, + "particle_position_y": 2666763.5104194554, "particle_weight": 1.7256099431746894e+26 }, "electron": { - "particle_momentum_x": 1.041502004264377e-19, - "particle_momentum_y": 1.0174665226520985e-19, - "particle_momentum_z": 1.0073419012150505e-19, - "particle_position_x": 2649392.364558163, - "particle_position_y": 2671296.4437026316, + "particle_momentum_x": 1.0469633429189896e-19, + "particle_momentum_y": 1.0085084564373315e-19, + "particle_momentum_z": 1.0130642491545657e-19, + "particle_position_x": 2669159.3352885935, + "particle_position_y": 2672148.0642826688, "particle_weight": 1.7256099431746894e+26 } -} \ No newline at end of file +}