diff options
24 files changed, 256 insertions, 257 deletions
diff --git a/Examples/Tests/PML/analysis_pml_psatd.py b/Examples/Tests/PML/analysis_pml_psatd.py index 14a581106..ea0cb018e 100755 --- a/Examples/Tests/PML/analysis_pml_psatd.py +++ b/Examples/Tests/PML/analysis_pml_psatd.py @@ -19,7 +19,7 @@ filename = sys.argv[1] ############################ ### INITIAL LASER ENERGY ### ############################ -energy_start = 7.297324456269243e-08 # electromagnetic energy at iteration 50 +energy_start = 7.282940107273505e-08 # electromagnetic energy at iteration 50 # Check consistency of field energy diagnostics with initial energy above ds = yt.load('pml_x_psatd_plt00050') diff --git a/Regression/Checksum/benchmarks_json/LaserAcceleration.json b/Regression/Checksum/benchmarks_json/LaserAcceleration.json index f717917b3..401dc1a96 100644 --- a/Regression/Checksum/benchmarks_json/LaserAcceleration.json +++ b/Regression/Checksum/benchmarks_json/LaserAcceleration.json @@ -2,24 +2,24 @@ "electrons": { "particle_cpu": 69212.0, "particle_id": 2655287162.0, - "particle_momentum_x": 1.792735580790931e-20, - "particle_momentum_y": 7.226325265028272e-20, - "particle_momentum_z": 4.232366166615331e-20, - "particle_position_x": 0.7139122548608258, - "particle_position_y": 0.7150340442762911, + "particle_momentum_x": 1.79212316501518e-20, + "particle_momentum_y": 7.225819832716737e-20, + "particle_momentum_z": 4.231725460519779e-20, + "particle_position_x": 0.7139122621161638, + "particle_position_y": 0.7150340887578206, "particle_position_z": 1.317577060864619, "particle_weight": 12926557617.187498 }, "lev=0": { - "Bx": 5863857.810242274, - "By": 2411.5707428261294, - "Bz": 116028.94525718097, - "Ex": 6268732518322.813, - "Ey": 1670757913492923.0, - "Ez": 104345842781112.31, - "jx": 555905302485608.94, - "jy": 1596092839924503.8, - "jz": 1045523884130288.4, - "rho": 2211743042.5513821 + "Bx": 5863879.027613791, + "By": 2411.49823974812, + "Bz": 116025.4367923822, + "Ex": 6267728226590.701, + "Ey": 1670763224821434.0, + "Ez": 104345981838458.8, + "jx": 555687757148559.1, + "jy": 1595895515963762.0, + "jz": 1045266123023548.0, + "rho": 2211742630.95043 } -} +}
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/LaserAccelerationBoost.json b/Regression/Checksum/benchmarks_json/LaserAccelerationBoost.json index d1523cec5..2bb04355a 100644 --- a/Regression/Checksum/benchmarks_json/LaserAccelerationBoost.json +++ b/Regression/Checksum/benchmarks_json/LaserAccelerationBoost.json @@ -12,8 +12,8 @@ "electrons": { "particle_cpu": 1140.0, "particle_id": 1254690.0, - "particle_momentum_x": 4.85133026759765e-27, - "particle_momentum_y": 2.198179850407281e-22, + "particle_momentum_x": 4.851331230863139e-27, + "particle_momentum_y": 2.198180048358965e-22, "particle_momentum_z": 3.0976485630303324e-18, "particle_position_x": 0.06840000000361958, "particle_position_y": 0.03930011372955363, @@ -22,23 +22,23 @@ "ions": { "particle_cpu": 1140.0, "particle_id": 1390110.0, - "particle_momentum_x": 3.360052255593508e-30, - "particle_momentum_y": 2.198179921323777e-22, + "particle_momentum_x": 3.360052546384035e-30, + "particle_momentum_y": 2.198180119275469e-22, "particle_momentum_z": 5.687755728408193e-15, "particle_position_x": 0.0684, "particle_position_y": 0.03930011366678667, "particle_weight": 6.286568807682775e+16 }, "lev=0": { - "Bx": 7187.9737789692945, + "Bx": 7187.979848926262, "By": 16.403644314084197, - "Bz": 426.1032500047571, + "Bz": 426.1038182095041, "Ex": 4521887740.546031, - "Ey": 1984360500005.4958, + "Ey": 1984362395569.876, "Ez": 6310696182.771291, - "jx": 5122916237.313671, - "jy": 551784296059286.56, + "jx": 5122916244.366513, + "jy": 551784512404872.8, "jz": 448986163636.4643, "rho": 1568.420379535507 } -} +}
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/LaserAccelerationRZ.json b/Regression/Checksum/benchmarks_json/LaserAccelerationRZ.json index c0deb7a74..7a92ab990 100644 --- a/Regression/Checksum/benchmarks_json/LaserAccelerationRZ.json +++ b/Regression/Checksum/benchmarks_json/LaserAccelerationRZ.json @@ -13,7 +13,7 @@ "electrons": { "particle_cpu": 4128.0, "particle_id": 10445216.0, - "particle_momentum_x": 2.1143843471854137e-24, + "particle_momentum_x": 2.114384362557539e-24, "particle_momentum_y": 3.9172628978456397e-22, "particle_momentum_z": 1.2567935092687156e-23, "particle_position_x": 0.04160250004822599, @@ -22,45 +22,45 @@ "particle_weight": 813672305.532158 }, "lev=0": { - "Bx": 101777.04469954837, + "Bx": 101777.0445915242, "By": 1246.471855929747, - "Bz": 4515.216486942658, + "Bz": 4515.216614357879, "Ex": 207743642694.52914, - "Ey": 37797702339829.05, + "Ey": 37797702292430.39, "Ez": 557241122055.2582, "jx": 1521160899070.9502, - "jy": 2.1477215558312566e+17, + "jy": 2.147721546347863e+17, "jz": 1801600163260722.8, "rho": 38675634.14778979, "Br_0_real": 0.3817062255812469, "Br_1_imag": 155.33494564590396, - "Br_1_real": 101777.25029641364, + "Br_1_real": 101777.2501883895, "Btheta_0_real": 1246.3204414544591, - "Btheta_1_imag": 103433.11809249174, + "Btheta_1_imag": 103433.1184065129, "Btheta_1_real": 169.24039862049415, "Bz_0_real": 0.38796993291270876, "Bz_1_imag": 0.828060337987101, - "Bz_1_real": 4515.086723258989, + "Bz_1_real": 4515.086850674211, "Er_0_real": 206594937041.90228, - "Er_1_imag": 38547072210478.31, + "Er_1_imag": 38547072374208.73, "Er_1_real": 42353719361.00897, "Etheta_0_real": 128268591.99894254, "Etheta_1_imag": 35752761372.73228, - "Etheta_1_real": 37797765694997.164, + "Etheta_1_real": 37797765647598.52, "Ez_0_real": 523227661392.01624, - "Ez_1_imag": 1421942831028.3716, + "Ez_1_imag": 1421942846934.045, "Ez_1_real": 46224077114.8001, "Jr_0_real": 1483876082511.2114, - "Jr_1_imag": 2.2670932799301846e+17, + "Jr_1_imag": 2.26709329429097e+17, "Jr_1_real": 1631543983671.9358, "Jtheta_0_real": 500862570830.0607, "Jtheta_1_imag": 886105306242.169, - "Jtheta_1_real": 2.1477198257660832e+17, + "Jtheta_1_real": 2.14771981628269e+17, "Jz_0_real": 1650635472156679.2, "Jz_1_imag": 365106436892618.2, "Jz_1_real": 350897609824031.44, "rho_0_real": 38186956.98106836, - "rho_1_imag": 20418297.54662601, + "rho_1_imag": 20418292.01599641, "rho_1_real": 1026560.8408702643 } -} +}
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/LaserAcceleration_single_precision_comms.json b/Regression/Checksum/benchmarks_json/LaserAcceleration_single_precision_comms.json index 87e9f0c08..c674f5899 100644 --- a/Regression/Checksum/benchmarks_json/LaserAcceleration_single_precision_comms.json +++ b/Regression/Checksum/benchmarks_json/LaserAcceleration_single_precision_comms.json @@ -2,24 +2,24 @@ "electrons": { "particle_cpu": 69212.0, "particle_id": 2655287162.0, - "particle_momentum_x": 1.7927389016680068e-20, - "particle_momentum_y": 7.226328445224444e-20, - "particle_momentum_z": 4.2323696789980776e-20, + "particle_momentum_x": 1.792122923640761e-20, + "particle_momentum_y": 7.225825184653885e-20, + "particle_momentum_z": 4.231731488281653e-20, "particle_position_x": 0.7139122548077861, "particle_position_y": 0.7150340437975914, "particle_position_z": 1.3175770609645199, "particle_weight": 12926557617.187498 }, "lev=0": { - "Bx": 5863857.817897017, - "By": 2411.6004969074365, - "Bz": 116028.92381573828, - "Ex": 6268723833912.179, - "Ey": 1670757908382730.2, + "Bx": 5863879.02030842, + "By": 2411.495350685753, + "Bz": 116025.42462999, + "Ex": 6267728094111.663, + "Ey": 1670763233105822.0, "Ez": 104345840182128.1, - "jx": 555906521750828.2, - "jy": 1596094484782223.5, - "jz": 1045525028952434.1, + "jx": 555687912108453.8, + "jy": 1595896363359136.0, + "jz": 1045267552192496.0, "rho": 2211743043.5912476 } }
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/LaserInjection.json b/Regression/Checksum/benchmarks_json/LaserInjection.json index 8cd99d783..359e1d782 100644 --- a/Regression/Checksum/benchmarks_json/LaserInjection.json +++ b/Regression/Checksum/benchmarks_json/LaserInjection.json @@ -1,12 +1,12 @@ { "lev=0": { "Bx": 1063691.2596777605, - "Bz": 28800.5707639312, - "Ex": 644507863395.5303, + "Bz": 28800.57072658718, + "Ex": 644507862125.0421, "Ey": 318419078738839.2, "Ez": 9793313204958.16, "jx": 0.0, - "jy": 9.025649773595698e+17, + "jy": 9.025649743704675e+17, "jz": 0.0 } }
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/LaserInjection_2d.json b/Regression/Checksum/benchmarks_json/LaserInjection_2d.json index 8cb788d67..5639aea23 100644 --- a/Regression/Checksum/benchmarks_json/LaserInjection_2d.json +++ b/Regression/Checksum/benchmarks_json/LaserInjection_2d.json @@ -1,13 +1,13 @@ { "lev=0": { - "Bx": 1.969978237442240e+07, - "By": 1.012283529722393e+08, - "Bz": 3.979655963688197e+07, - "Ex": 1.386450237811739e+16, - "Ey": 1.322095211476477e+16, - "Ez": 2.682470215548235e+16, - "jx": 4.144287847857446e+16, - "jy": 4.144287809641780e+16, - "jz": 8.288576005435654e+16 + "Bx": 19699663.44037336, + "By": 101299939.0791143, + "Bz": 39796240.63982911, + "Ex": 1.388065758946779e+16, + "Ey": 1.322086684955721e+16, + "Ez": 2.68335317689213e+16, + "jx": 4.144286985968038e+16, + "jy": 4.144286947644162e+16, + "jz": 8.288574281440642e+16 } }
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/LaserIonAcc2d.json b/Regression/Checksum/benchmarks_json/LaserIonAcc2d.json index 745da1956..092457b19 100644 --- a/Regression/Checksum/benchmarks_json/LaserIonAcc2d.json +++ b/Regression/Checksum/benchmarks_json/LaserIonAcc2d.json @@ -2,34 +2,34 @@ "electrons": { "particle_cpu": 0.0, "particle_id": 2101654260.0, - "particle_momentum_x": 3.819006669880345e-19, + "particle_momentum_x": 3.819007601037451e-19, "particle_momentum_y": 0.0, - "particle_momentum_z": 1.6442919544438796e-18, - "particle_position_x": 0.008132686129387588, - "particle_position_y": 0.030529759891592873, + "particle_momentum_z": 1.644291919825705e-18, + "particle_position_x": 0.008132686110435036, + "particle_position_y": 0.03052975995172882, "particle_weight": 2.641331189632942e+17 }, "hydrogen": { "particle_cpu": 0.0, "particle_id": 8663540542.0, - "particle_momentum_x": 2.2442931423587623e-18, + "particle_momentum_x": 2.244293053419129e-18, "particle_momentum_y": 0.0, - "particle_momentum_z": 1.0841108905602765e-18, + "particle_momentum_z": 1.084110863159823e-18, "particle_position_x": 0.008258183385250792, "particle_position_y": 0.03668783554832863, "particle_weight": 2.701906737218416e+17 }, "lev=0": { "Bx": 0.0, - "By": 11393535.83414041, + "By": 11393535.73084639, "Bz": 0.0, - "Ex": 2033400456620381.5, + "Ex": 2033400430027298.0, "Ey": 0.0, - "Ez": 316047264778828.4, - "jx": 1.6346708216210751e+19, + "Ez": 316047261967858.8, + "jx": 1.6346708093212e+19, "jy": 0.0, - "jz": 8.884557953651988e+18, - "rho": 61729754758.60603, + "jz": 8.884557829033169e+18, + "rho": 61729754469.05864, "rho_electrons": 17451988255188.39, "rho_hydrogen": 17441820007046.848 } diff --git a/Regression/Checksum/benchmarks_json/PlasmaMirror.json b/Regression/Checksum/benchmarks_json/PlasmaMirror.json index 217a7c51c..94cc65b0a 100644 --- a/Regression/Checksum/benchmarks_json/PlasmaMirror.json +++ b/Regression/Checksum/benchmarks_json/PlasmaMirror.json @@ -21,12 +21,12 @@ }, "lev=0": { "Bx": 0.0, - "By": 75294856.69492045, + "By": 75294856.83091721, "Bz": 0.0, - "Ex": 2.081697232828593e+16, + "Ex": 2.081697252453305e+16, "Ey": 0.0, - "Ez": 2.350511377870651e+16, - "jx": 5.49677938771531e+19, + "Ez": 2.350511387513211e+16, + "jx": 5.496779405360711e+19, "jy": 0.0, "jz": 7.159348923050661e+19 } diff --git a/Regression/Checksum/benchmarks_json/comoving_2d_psatd_hybrid.json b/Regression/Checksum/benchmarks_json/comoving_2d_psatd_hybrid.json index 7a8806476..d7f2245a9 100644 --- a/Regression/Checksum/benchmarks_json/comoving_2d_psatd_hybrid.json +++ b/Regression/Checksum/benchmarks_json/comoving_2d_psatd_hybrid.json @@ -2,43 +2,43 @@ "beam": { "particle_cpu": 0.0, "particle_id": 500500.0, - "particle_momentum_x": 7.669759108861468e-19, - "particle_momentum_y": 4.515790444343171e-19, - "particle_momentum_z": 9.219229554676293e-18, - "particle_position_x": 5.445041966361118e-03, - "particle_position_y": 1.684630856935410e-01, + "particle_momentum_x": 7.664796367490246e-19, + "particle_momentum_y": 4.515789974571725e-19, + "particle_momentum_z": 9.219642022953058e-18, + "particle_position_x": 0.00544486975465588, + "particle_position_y": 0.1684617934850459, "particle_weight": 3120754537230.3823 }, "electrons": { "particle_cpu": 155246.0, "particle_id": 26701298988.0, - "particle_momentum_x": 9.135952262251187e-19, - "particle_momentum_y": 8.101493264523045e-19, - "particle_momentum_z": 5.717044508550590e-16, - "particle_position_x": 6.634363959599270e+00, - "particle_position_y": 5.808983230909047e+01, + "particle_momentum_x": 9.136383211404986e-19, + "particle_momentum_y": 8.101601399976596e-19, + "particle_momentum_z": 5.717059776538689e-16, + "particle_position_x": 6.634364766505349, + "particle_position_y": 58.08983230909047, "particle_weight": 3.212794520240557e+18 }, "ions": { "particle_cpu": 155246.0, "particle_id": 26830093836.0, - "particle_momentum_x": 1.995930325404687e-18, - "particle_momentum_y": 8.201095553290320e-19, - "particle_momentum_z": 1.008982180697422e-12, - "particle_position_x": 6.622297069965442e+00, + "particle_momentum_x": 1.996033716831053e-18, + "particle_momentum_y": 8.201232317358422e-19, + "particle_momentum_z": 1.008982179039123e-12, + "particle_position_x": 6.622297069965442, "particle_position_y": 58.08877602017003, "particle_weight": 3.212794492131793e+18 }, "lev=0": { - "Bx": 1.304503610434902e+06, - "By": 4.000855494548894e+06, - "Bz": 2.038590450884660e+05, - "Ex": 1.201433342910536e+15, - "Ey": 4.083364320293471e+14, - "Ez": 2.172708166452597e+14, - "jx": 3.510846458609173e+16, - "jy": 2.309903352881767e+16, - "jz": 4.090085617016862e+17, - "rho": 1.337939566692242e+09 + "Bx": 1304526.851838164, + "By": 4001075.844980609, + "Bz": 203861.1536195573, + "Ex": 1201499532225996.0, + "Ey": 408343920385792.8, + "Ez": 217279159850185.0, + "jx": 3.511015401204926e+16, + "jy": 2.309927280600993e+16, + "jz": 4.090299985201231e+17, + "rho": 1338012413.738342 } }
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/galilean_2d_psatd_hybrid.json b/Regression/Checksum/benchmarks_json/galilean_2d_psatd_hybrid.json index 63e502e38..3bc3ee91a 100644 --- a/Regression/Checksum/benchmarks_json/galilean_2d_psatd_hybrid.json +++ b/Regression/Checksum/benchmarks_json/galilean_2d_psatd_hybrid.json @@ -2,43 +2,43 @@ "beam": { "particle_cpu": 0.0, "particle_id": 500500.0, - "particle_momentum_x": 7.737025344902175e-19, - "particle_momentum_y": 4.515676227016060e-19, - "particle_momentum_z": 8.377255654618884e-18, - "particle_position_x": 6.725411308434082e-03, - "particle_position_y": 1.715879377590362e-01, + "particle_momentum_x": 7.737565035974364e-19, + "particle_momentum_y": 4.515676144239069e-19, + "particle_momentum_z": 8.377536688859444e-18, + "particle_position_x": 0.006727723523064862, + "particle_position_y": 0.1715852623161534, "particle_weight": 3120754537230.3823 }, "electrons": { "particle_cpu": 155383.0, "particle_id": 26721507984.0, - "particle_momentum_x": 7.340210638523018e-19, - "particle_momentum_y": 5.668014237003914e-19, - "particle_momentum_z": 5.697763186006453e-16, - "particle_position_x": 6.639853461297923e+00, - "particle_position_y": 5.821052045369096e+01, + "particle_momentum_x": 7.340594651344889e-19, + "particle_momentum_y": 5.668149904949897e-19, + "particle_momentum_z": 5.697776631833102e-16, + "particle_position_x": 6.639854165809502, + "particle_position_y": 58.21052045369096, "particle_weight": 3.215903513895884e+18 }, "ions": { "particle_cpu": 155428.0, "particle_id": 26814790002.0, - "particle_momentum_x": 1.670107438126840e-18, - "particle_momentum_y": 5.734436683937429e-19, - "particle_momentum_z": 1.010167758438842e-12, - "particle_position_x": 6.630049987530896e+00, + "particle_momentum_x": 1.670197843000786e-18, + "particle_momentum_y": 5.734579164517326e-19, + "particle_momentum_z": 1.01016775699214e-12, + "particle_position_x": 6.630049987530896, "particle_position_y": 58.2491476194403, "particle_weight": 3.21662600232034e+18 }, "lev=0": { - "Bx": 1.224480819647664e+06, - "By": 3.460549848562733e+06, - "Bz": 1.944632140191863e+05, - "Ex": 1.038904381038040e+15, - "Ey": 3.842128197450388e+14, - "Ez": 2.002020146570339e+14, - "jx": 3.099007044196592e+16, - "jy": 2.220777052770534e+16, - "jz": 2.916830760167659e+17, - "rho": 9.925701008475471e+08 + "Bx": 1224504.260832691, + "By": 3460742.238999791, + "Bz": 194465.3038202806, + "Ex": 1038962178920274.0, + "Ey": 384220032752765.2, + "Ez": 200209748298923.3, + "jx": 3.099162303698446e+16, + "jy": 2.220829486118812e+16, + "jz": 2.917014550012008e+17, + "rho": 992631410.7042742 } }
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/ionization_boost.json b/Regression/Checksum/benchmarks_json/ionization_boost.json index 510f85aa6..95ef8d3fd 100644 --- a/Regression/Checksum/benchmarks_json/ionization_boost.json +++ b/Regression/Checksum/benchmarks_json/ionization_boost.json @@ -1,34 +1,34 @@ { "electrons": { - "particle_cpu": 184.0, - "particle_id": 1300726794.0, - "particle_momentum_x": 2.109788481458691e-17, + "particle_cpu": 183.0, + "particle_id": 1300779302.0, + "particle_momentum_x": 2.132853326478867e-17, "particle_momentum_y": 0.0, - "particle_momentum_z": 1.706122240621572e-17, - "particle_position_x": 0.11060117510075951, - "particle_position_y": 1.7038797728732886, + "particle_momentum_z": 1.724368007934272e-17, + "particle_position_x": 0.10979742025407, + "particle_position_y": 1.702823749392731, "particle_weight": 3.0702532354579605e-09 }, "ions": { "particle_cpu": 0.0, "particle_id": 89142848.0, "particle_ionization_level": 52651.0, - "particle_momentum_x": 3.586073239449067e-18, + "particle_momentum_x": 3.586426312745375e-18, "particle_momentum_y": 0.0, "particle_momentum_z": 1.0432995298791797e-13, - "particle_position_x": 0.021439915608916116, + "particle_position_x": 0.02143991655095356, "particle_position_y": 0.4726767056871516, "particle_weight": 5.000948082142308e-10 }, "lev=0": { "Bx": 0.0, - "By": 18263186.89822245, + "By": 18263123.342891, "Bz": 0.0, - "Ex": 5473010981530852.0, + "Ex": 5472992180428804.0, "Ey": 0.0, - "Ez": 924.2093948096151, - "jx": 12440856390978.352, + "Ez": 922.6036749671028, + "jx": 12440856508004.96, "jy": 0.0, - "jz": 156080.00000114003 + "jz": 78616.00000110656 } }
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/ionization_lab.json b/Regression/Checksum/benchmarks_json/ionization_lab.json index ae8bc95f3..556d72a2d 100644 --- a/Regression/Checksum/benchmarks_json/ionization_lab.json +++ b/Regression/Checksum/benchmarks_json/ionization_lab.json @@ -1,13 +1,13 @@ { "electrons": { - "particle_cpu": 21625.0, - "particle_id": 804501788.0, - "particle_momentum_x": 4.395776262151595e-18, + "particle_cpu": 21628.0, + "particle_id": 804944566.0, + "particle_momentum_x": 4.407898469197755e-18, "particle_momentum_y": 0.0, - "particle_momentum_z": 2.647975597173496e-18, - "particle_position_x": 0.10949403929812224, - "particle_position_y": 0.6411712856802138, - "particle_weight": 3.441640625e-10 + "particle_momentum_z": 2.642991174223682e-18, + "particle_position_x": 0.1095015206652257, + "particle_position_y": 0.6413864600981052, + "particle_weight": 3.443203125e-10 }, "ions": { "particle_cpu": 5888.0, @@ -15,7 +15,7 @@ "particle_ionization_level": 72897.0, "particle_momentum_x": 1.761324005206226e-18, "particle_momentum_y": 0.0, - "particle_momentum_z": 3.618696656380377e-23, + "particle_momentum_z": 3.618696690270335e-23, "particle_position_x": 0.03199998819289686, "particle_position_y": 0.12800000462171646, "particle_weight": 9.999999999999999e-11 @@ -26,9 +26,9 @@ "Bz": 0.0, "Ex": 7878103122973058.0, "Ey": 0.0, - "Ez": 4193.202306476831, + "Ez": 3027.995293554496, "jx": 1.2111358333819302e+16, "jy": 0.0, - "jz": 1.3447249886563635e-07 + "jz": 1.346772722412443e-07 } }
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/pml_psatd_dive_divb_cleaning.json b/Regression/Checksum/benchmarks_json/pml_psatd_dive_divb_cleaning.json index 6a8d9959a..6d9700081 100644 --- a/Regression/Checksum/benchmarks_json/pml_psatd_dive_divb_cleaning.json +++ b/Regression/Checksum/benchmarks_json/pml_psatd_dive_divb_cleaning.json @@ -1,11 +1,11 @@ { "lev=0": { - "Bx": 1.3610898787980585e-08, - "By": 1.3611920100222044e-08, - "Bz": 1.3614462378408363e-08, - "Ex": 18.74052436795991, - "Ey": 18.739131874557195, - "Ez": 18.73917596625471, - "rho": 0.00017713857500552797 + "Bx": 1.358272339640314e-08, + "By": 1.358374136656383e-08, + "Bz": 1.35862691106522e-08, + "Ex": 18.7558530407117, + "Ey": 18.75445901719022, + "Ez": 18.754503444585, + "rho": 0.000174084825550345 } }
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/pml_x_ckc.json b/Regression/Checksum/benchmarks_json/pml_x_ckc.json index 17266c64c..894266acc 100644 --- a/Regression/Checksum/benchmarks_json/pml_x_ckc.json +++ b/Regression/Checksum/benchmarks_json/pml_x_ckc.json @@ -1,11 +1,11 @@ { "lev=0": { - "Bx": 4.001711120559782e-09, - "By": 1.4066910238919108e-08, - "Bz": 3.4475362435255117e-09, - "Ex": 13.671400943108354, - "Ey": 2.221451187418119, - "Ez": 14.114305918658266, + "Bx": 4.00150689382335e-09, + "By": 1.406668425991829e-08, + "Bz": 3.447740214210282e-09, + "Ex": 13.67178782345087, + "Ey": 2.230553776212748, + "Ez": 14.11472401822265, "jx": 0.0, "jy": 0.0, "jz": 0.0 diff --git a/Regression/Checksum/benchmarks_json/pml_x_psatd.json b/Regression/Checksum/benchmarks_json/pml_x_psatd.json index 042e9f2cf..15356580f 100644 --- a/Regression/Checksum/benchmarks_json/pml_x_psatd.json +++ b/Regression/Checksum/benchmarks_json/pml_x_psatd.json @@ -1,12 +1,12 @@ { "lev=0": { - "Bx": 1.159349225951124e-08, - "By": 1.5110587450944313e-08, - "Bz": 8.985531772997968e-09, - "Ex": 3.93868514084609, - "Ey": 4.13492225197527, - "Ez": 3.3085920402662996, - "divE": 188916.91920600203, - "rho": 1.6719346125882405e-06 + "Bx": 1.1599384673077106e-08, + "By": 1.515799977053999e-08, + "Bz": 8.995717690678642e-09, + "Ex": 3.9363123107318456, + "Ey": 4.134487508968383, + "Ez": 3.3070809317529846, + "divE": 189105.63427643626, + "rho": 1.6734952000013346e-06 } }
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/pml_x_yee.json b/Regression/Checksum/benchmarks_json/pml_x_yee.json index cc0966f1c..d4890773e 100644 --- a/Regression/Checksum/benchmarks_json/pml_x_yee.json +++ b/Regression/Checksum/benchmarks_json/pml_x_yee.json @@ -1,11 +1,11 @@ { "lev=0": { - "Bx": 6.536815391908755e-09, - "By": 1.3254697230842855e-08, - "Bz": 4.0479985737748934e-09, - "Ex": 4.275452348736324, - "Ey": 2.4988288417646696, - "Ez": 3.6186055289607837, + "Bx": 6.598168513669639e-09, + "By": 1.325367782856018e-08, + "Bz": 4.124248587258615e-09, + "Ex": 4.275153150272437, + "Ey": 2.500921454160279, + "Ez": 3.618579508348751, "jx": 0.0, "jy": 4.725970147774612e-169, "jz": 0.0 diff --git a/Regression/Checksum/benchmarks_json/restart.json b/Regression/Checksum/benchmarks_json/restart.json index 81ed9dc78..bf392188f 100644 --- a/Regression/Checksum/benchmarks_json/restart.json +++ b/Regression/Checksum/benchmarks_json/restart.json @@ -33,22 +33,22 @@ "particle_weight": 6241509074.460762 }, "lev=0": { - "Bx": 115327.15140818382, - "By": 242416.19187313571, - "Bz": 62096.66973827369, - "Ex": 120130722555567.77, - "Ey": 20867597109617.934, - "Ez": 53551348241648.52, - "jx": 2.1551699509760676e+16, - "jy": 332122730528260.0, - "jz": 4524888666510641.0, - "rho": 2.215823510934440e+07 + "Bx": 115327.1537350797, + "By": 242416.324847696, + "Bz": 62096.73791963262, + "Ex": 120130828820434.1, + "Ey": 20867598123099.62, + "Ez": 53551352085105.13, + "jx": 2.155172271572345e+16, + "jy": 332122911627401.9, + "jz": 4524890111932342.0, + "rho": 22158243.36136304 }, "plasma_e": { "particle_cpu": 9680.0, "particle_id": 117349672.0, - "particle_momentum_x": 2.6417827387235982e-19, - "particle_momentum_y": 1.3246227891556811e-20, + "particle_momentum_x": 2.641784932563162e-19, + "particle_momentum_y": 1.32462397000916e-20, "particle_momentum_z": 2.632691328351647e-17, "particle_position_x": 0.49916178543521594, "particle_position_y": 0.4991848022446371, @@ -58,12 +58,12 @@ "plasma_p": { "particle_cpu": 9680.0, "particle_id": 128125448.0, - "particle_momentum_x": 2.6389034754489564e-19, - "particle_momentum_y": 5.3122104782787265e-21, + "particle_momentum_x": 2.638905864190974e-19, + "particle_momentum_y": 5.312231531602842e-21, "particle_momentum_z": 4.8296005971893094e-14, "particle_position_x": 0.4991250026192299, "particle_position_y": 0.4991249980376633, "particle_position_z": 0.4563845472659988, "particle_weight": 33067341227104.594 } -} +}
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/restart_psatd.json b/Regression/Checksum/benchmarks_json/restart_psatd.json index eb285744d..cb88e07be 100644 --- a/Regression/Checksum/benchmarks_json/restart_psatd.json +++ b/Regression/Checksum/benchmarks_json/restart_psatd.json @@ -33,22 +33,22 @@ "particle_weight": 6241509074.460762 }, "lev=0": { - "Bx": 114349.71019313535, - "By": 237246.30659111793, - "Bz": 61241.57839321267, - "Ex": 113310667309569.25, - "Ey": 18419343979199.57, - "Ez": 50966992135551.99, - "jx": 2.343755417758882e+16, - "jy": 264692970881696.72, - "jz": 4106459950194407.0, - "rho": 2.083197171273293e+07 + "Bx": 114349.7136863132, + "By": 237246.4505566202, + "Bz": 61241.65304787143, + "Ex": 113310775378373.7, + "Ey": 18419345522461.79, + "Ez": 50966995988143.75, + "jx": 2.343757835716762e+16, + "jy": 264693118058691.5, + "jz": 4106460962001447.0, + "rho": 20831979.8447518 }, "plasma_e": { "particle_cpu": 9680.0, "particle_id": 117349672.0, - "particle_momentum_x": 1.473920377077317e-19, - "particle_momentum_y": 1.0295357463154818e-20, + "particle_momentum_x": 1.47392140617758e-19, + "particle_momentum_y": 1.029536412438356e-20, "particle_momentum_z": 2.631936992393973e-17, "particle_position_x": 0.4991563943788139, "particle_position_y": 0.49917524942325764, @@ -58,12 +58,12 @@ "plasma_p": { "particle_cpu": 9680.0, "particle_id": 128125448.0, - "particle_momentum_x": 1.4773149979258644e-19, - "particle_momentum_y": 3.3342009095840554e-21, + "particle_momentum_x": 1.477316212213828e-19, + "particle_momentum_y": 3.334213119544454e-21, "particle_momentum_z": 4.8296010015063954e-14, "particle_position_x": 0.4991250009706611, "particle_position_y": 0.49912499871191435, "particle_position_z": 0.4563845474003356, "particle_weight": 33067341227104.625 } -} +}
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/restart_psatd_time_avg.json b/Regression/Checksum/benchmarks_json/restart_psatd_time_avg.json index 72a317f69..3f76decb0 100644 --- a/Regression/Checksum/benchmarks_json/restart_psatd_time_avg.json +++ b/Regression/Checksum/benchmarks_json/restart_psatd_time_avg.json @@ -33,22 +33,22 @@ "particle_weight": 6241509074.460762 }, "lev=0": { - "Bx": 113572.32066454006, - "By": 233769.68176084137, - "Bz": 58935.90471405687, - "Ex": 111077830627827.34, - "Ey": 18104292500486.71, - "Ez": 49957933531975.0, - "jx": 2.3032421193292172e+16, - "jy": 252044670800869.56, - "jz": 4052661521670030.0, - "rho": 2.059636421853461e+07 + "Bx": 113572.3239223123, + "By": 233769.8242879395, + "Bz": 58935.98363962277, + "Ex": 111077937889086.8, + "Ey": 18104293959089.8, + "Ez": 49957937094952.45, + "jx": 2.303244526071982e+16, + "jy": 252044805284445.3, + "jz": 4052662504124792.0, + "rho": 20596372.2122716 }, "plasma_e": { "particle_cpu": 9680.0, "particle_id": 117349672.0, - "particle_momentum_x": 1.3889342284437047e-19, - "particle_momentum_y": 9.709966613374186e-21, + "particle_momentum_x": 1.388935278083215e-19, + "particle_momentum_y": 9.70997286808454e-21, "particle_momentum_z": 2.6318578216093305e-17, "particle_position_x": 0.4991547138014627, "particle_position_y": 0.49917221491130515, @@ -58,12 +58,12 @@ "plasma_p": { "particle_cpu": 9680.0, "particle_id": 128125448.0, - "particle_momentum_x": 1.3957368399934083e-19, - "particle_momentum_y": 3.3829656839017584e-21, + "particle_momentum_x": 1.395737954842001e-19, + "particle_momentum_y": 3.382976343745492e-21, "particle_momentum_z": 4.829601122286012e-14, "particle_position_x": 0.4991250008410111, "particle_position_y": 0.4991249984371928, "particle_position_z": 0.4563845474251499, "particle_weight": 33067341227104.625 } -} +}
\ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/silver_mueller_2d_x.json b/Regression/Checksum/benchmarks_json/silver_mueller_2d_x.json index 83c6576a6..3a2b20c03 100644 --- a/Regression/Checksum/benchmarks_json/silver_mueller_2d_x.json +++ b/Regression/Checksum/benchmarks_json/silver_mueller_2d_x.json @@ -1,11 +1,11 @@ { "lev=0": { - "Bx": 5.3173130498255016e-09, - "By": 2.7171916142338513e-08, - "Bz": 2.795222039240815e-08, - "Ex": 4.152944711886871, - "Ey": 7.867836700647592, - "Ez": 7.8177914065231064, + "Bx": 5.317312609305897e-09, + "By": 2.717191496720115e-08, + "Bz": 2.795221621874797e-08, + "Ex": 4.152946121094125, + "Ey": 7.867835967181568, + "Ez": 7.817791336283674, "jx": 0.0, "jy": 2.9697038995489428e-46, "jz": 0.0 diff --git a/Regression/Checksum/benchmarks_json/silver_mueller_2d_z.json b/Regression/Checksum/benchmarks_json/silver_mueller_2d_z.json index 762c5399a..dc56f7159 100644 --- a/Regression/Checksum/benchmarks_json/silver_mueller_2d_z.json +++ b/Regression/Checksum/benchmarks_json/silver_mueller_2d_z.json @@ -1,11 +1,11 @@ { "lev=0": { - "Bx": 2.690806271178625e-08, - "By": 2.679014566496276e-08, - "Bz": 6.13124241846022e-09, - "Ex": 7.670630187960505, - "Ey": 7.171046771146453, - "Ez": 4.470308884626526, + "Bx": 2.690805904263046e-08, + "By": 2.67901440544351e-08, + "Bz": 6.131245514836944e-09, + "Ex": 7.670630107132959, + "Ey": 7.171047170462589, + "Ez": 4.470310276166253, "jx": 0.0, "jy": 2.96970387975164e-46, "jz": 0.0 diff --git a/Regression/Checksum/benchmarks_json/silver_mueller_rz_z.json b/Regression/Checksum/benchmarks_json/silver_mueller_rz_z.json index 1d4dcd008..10105cc14 100644 --- a/Regression/Checksum/benchmarks_json/silver_mueller_rz_z.json +++ b/Regression/Checksum/benchmarks_json/silver_mueller_rz_z.json @@ -1,11 +1,11 @@ { "lev=0": { - "Bx": 1.4781462317936469e-08, - "By": 1.512917442958286e-08, - "Bz": 5.915429077408832e-09, - "Ex": 4.1350322135643385, - "Ey": 4.001762235229215, - "Ez": 1.5351893138260357, + "Bx": 1.477460729891479e-08, + "By": 1.510559316787155e-08, + "Bz": 5.811173045189853e-09, + "Ex": 4.115800746189268, + "Ey": 3.996703230466946, + "Ez": 1.535198100311953, "jx": 0.0, "jy": 3.872879366838377e-62, "jz": 0.0 diff --git a/Source/Particles/LaserParticleContainer.cpp b/Source/Particles/LaserParticleContainer.cpp index 1790f3019..559489f34 100644 --- a/Source/Particles/LaserParticleContainer.cpp +++ b/Source/Particles/LaserParticleContainer.cpp @@ -650,27 +650,26 @@ LaserParticleContainer::ComputeSpacing (int lev, Real& Sx, Real& Sy) const void LaserParticleContainer::ComputeWeightMobility (Real Sx, Real Sy) { - constexpr Real eps = 0.01_rt; - constexpr Real fac = 1.0_rt / (2.0_rt * MathConst::pi * PhysConst::mu0 * PhysConst::c * PhysConst::c * eps); - m_weight = fac * m_wavelength * Sx * Sy / std::min(Sx,Sy) * m_e_max; - // The mobility is the constant of proportionality between the field to // be emitted, and the corresponding velocity that the particles need to have. - m_mobility = (Sx * Sy)/(m_weight * PhysConst::mu0 * PhysConst::c * PhysConst::c); + // We set the mobility so that the particles do not exceed a fraction + // `eps` of the speed of light, at the peak of the laser field. + constexpr Real eps = 0.05_rt; + m_mobility = eps/m_e_max; + m_weight = PhysConst::ep0 / m_mobility; + // Multiply by particle spacing +#if (AMREX_SPACEDIM == 3) + m_weight *= Sx * Sy; +#elif (AMREX_SPACEDIM == 2) + m_weight *= Sx; + amrex::ignore_unused(Sy); +#else + amrex::ignore_unused(Sx,Sy); +#endif // When running in the boosted-frame, the input parameters (and in particular // the amplitude of the field) are given in the lab-frame. // Therefore, the mobility needs to be modified by a factor WarpX::gamma_boost. m_mobility = m_mobility/WarpX::gamma_boost; - - // If mobility is too high (caused by a small wavelength compared to the grid size), - // calculated antenna particle velocities may exceed c, which can cause a segfault. - constexpr Real warning_tol = 0.1_rt; - if (m_wavelength < std::min(Sx,Sy)*warning_tol){ - WarpX::GetInstance().RecordWarning("Laser", - "Laser wavelength seems to be much smaller than the grid size." - " This may cause a segmentation fault", - WarnPriority::high); - } } void |