diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR.json b/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR.json index 1fbf0e29f36..095d64004fd 100644 --- a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR.json +++ b/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR.json @@ -1,40 +1,40 @@ { "electrons": { - "particle_momentum_x": 4.244331469283422e-20, + "particle_momentum_x": 4.2444161670627625e-20, "particle_momentum_y": 0.0, - "particle_momentum_z": 4.244331469283411e-20, - "particle_position_x": 0.655360445407094, - "particle_position_y": 0.6553604454070939, + "particle_momentum_z": 4.2444161670627534e-20, + "particle_position_x": 0.6553600939548604, + "particle_position_y": 0.6553600939548603, "particle_weight": 3200000000000000.5 }, "lev=0": { "Bx": 0.0, - "By": 34.880237093101385, + "By": 29.737451538726013, "Bz": 0.0, - "Ex": 7573738411730.345, + "Ex": 7573333612867.881, "Ey": 0.0, - "Ez": 7573738411730.373, - "jx": 7301940679621768.0, + "Ez": 7573333612867.912, + "jx": 7302034873723846.0, "jy": 0.0, - "jz": 7301940679621819.0 + "jz": 7302034873723940.0 }, "lev=1": { "Bx": 0.0, - "By": 663.9253192035617, + "By": 446.4305912221662, "Bz": 0.0, - "Ex": 7599937806859.2, + "Ex": 7598120399546.991, "Ey": 0.0, - "Ez": 7599937806859.211, - "jx": 7111706209199148.0, + "Ez": 7598120399547.014, + "jx": 7112353090930550.0, "jy": 0.0, - "jz": 7111706209199176.0 + "jz": 7112353090930540.0 }, "positrons": { - "particle_momentum_x": 4.24387817954511e-20, + "particle_momentum_x": 4.2442478859032927e-20, "particle_momentum_y": 0.0, - "particle_momentum_z": 4.243878179545099e-20, - "particle_position_x": 0.6553597738022557, - "particle_position_y": 0.6553597738022557, + "particle_momentum_z": 4.2442478859032854e-20, + "particle_position_x": 0.6553594719127074, + "particle_position_y": 0.6553594719127074, "particle_weight": 3200000000000000.5 } } \ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_anisotropic.json b/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_anisotropic.json index 445f514723c..73dd910574e 100644 --- a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_anisotropic.json +++ b/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_anisotropic.json @@ -1,40 +1,40 @@ { "electrons": { - "particle_momentum_x": 4.2405417073382216e-20, + "particle_momentum_x": 4.2405874432036894e-20, "particle_momentum_y": 0.0, - "particle_momentum_z": 4.24319208902951e-20, - "particle_position_x": 0.6553602236954971, - "particle_position_y": 0.6553603460513587, + "particle_momentum_z": 4.244580453138521e-20, + "particle_position_x": 0.6553598605721321, + "particle_position_y": 0.6553603207806843, "particle_weight": 3200000000000000.5 }, "lev=0": { "Bx": 0.0, - "By": 29.016398075047086, + "By": 23.062372881797263, "Bz": 0.0, - "Ex": 7578443960945.405, + "Ex": 7577963733795.349, "Ey": 0.0, - "Ez": 7572873581953.129, - "jx": 7295166572198360.0, + "Ez": 7570635848192.088, + "jx": 7295313940906670.0, "jy": 0.0, - "jz": 7303381904136724.0 + "jz": 7305416311341798.0 }, "lev=1": { "Bx": 0.0, - "By": 72.99870260220474, + "By": 56.70499647861526, "Bz": 0.0, - "Ex": 4606426110840.904, + "Ex": 4604568214719.308, "Ey": 0.0, - "Ez": 7017198453908.449, - "jx": 4489353143132240.0, + "Ez": 7016601565205.127, + "jx": 4490296323381386.5, "jy": 0.0, - "jz": 6838171379723720.0 + "jz": 6836265054152690.0 }, "positrons": { - "particle_momentum_x": 4.2397727290339454e-20, + "particle_momentum_x": 4.240270916979087e-20, "particle_momentum_y": 0.0, - "particle_momentum_z": 4.2431934836877495e-20, - "particle_position_x": 0.6553599859378852, - "particle_position_y": 0.655359657073043, + "particle_momentum_z": 4.244576791252681e-20, + "particle_position_x": 0.6553596773141027, + "particle_position_y": 0.6553596834187275, "particle_weight": 3200000000000000.5 } } \ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_psatd.json b/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_psatd.json index 499a02625f1..c8efb55f63d 100644 --- a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_psatd.json +++ b/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_psatd.json @@ -1,40 +1,40 @@ { "electrons": { - "particle_momentum_x": 4.237978127636407e-20, + "particle_momentum_x": 4.238116934276727e-20, "particle_momentum_y": 0.0, - "particle_momentum_z": 4.2379781109485186e-20, - "particle_position_x": 0.655360346626376, - "particle_position_y": 0.655360346625584, + "particle_momentum_z": 4.238116918188906e-20, + "particle_position_x": 0.6553600150461454, + "particle_position_y": 0.6553600150453582, "particle_weight": 3200000000000000.5 }, "lev=0": { "Bx": 0.0, - "By": 49.13289051610905, + "By": 48.481624783762086, "Bz": 0.0, - "Ex": 7589572073848.546, + "Ex": 7589841440058.995, "Ey": 0.0, - "Ez": 7589572085733.721, - "jx": 7282449902618536.0, + "Ez": 7589841451955.45, + "jx": 7282092285786011.0, "jy": 0.0, - "jz": 7282449869844108.0 + "jz": 7282092252988784.0 }, "lev=1": { "Bx": 0.0, - "By": 623.630930990979, + "By": 376.07845874193026, "Bz": 0.0, - "Ex": 7590754010944.117, + "Ex": 7595314624325.873, "Ey": 0.0, - "Ez": 7590753791450.942, - "jx": 6596452748155826.0, + "Ez": 7595314408918.084, + "jx": 6594445628310054.0, "jy": 0.0, - "jz": 6596452562357128.0 + "jz": 6594445442498818.0 }, "positrons": { - "particle_momentum_x": 4.2381117997129824e-20, + "particle_momentum_x": 4.2380886359427404e-20, "particle_momentum_y": 0.0, - "particle_momentum_z": 4.23811177887596e-20, - "particle_position_x": 0.6553599570597749, - "particle_position_y": 0.6553599570604656, + "particle_momentum_z": 4.2380886149634417e-20, + "particle_position_x": 0.6553596427220252, + "particle_position_y": 0.6553596427227213, "particle_weight": 3200000000000000.5 } } \ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/Larmor.json b/Regression/Checksum/benchmarks_json/Larmor.json index b4433d3bb99..c2034034517 100644 --- a/Regression/Checksum/benchmarks_json/Larmor.json +++ b/Regression/Checksum/benchmarks_json/Larmor.json @@ -13,23 +13,23 @@ "Bz": 0.0, "Ex": 940940.2906508234, "Ey": 0.0, - "Ez": 675442.3304865544, + "Ez": 675442.3304865547, "divB": 0.0, "divE": 9010500.601059087, "jx": 9956.26936533879, "jy": 0.0, - "jz": 850.7063264964474, + "jz": 850.7063264963904, "part_per_cell": 2.0 }, "lev=1": { "Bx": 0.0, - "By": 0.00016656315627260794, + "By": 0.00022915573780371822, "Bz": 0.0, "Ex": 65748.08304808202, "Ey": 0.0, - "Ez": 13444.392741806332, + "Ez": 20968.793596496947, "divB": 0.0, - "divE": 271268.5535815401, + "divE": 3.318742179700654e-08, "jx": 0.0, "jy": 0.0, "jz": 0.0, diff --git a/Regression/Checksum/benchmarks_json/LaserAccelerationMR.json b/Regression/Checksum/benchmarks_json/LaserAccelerationMR.json index f7e977dba97..9b1abaf32dd 100644 --- a/Regression/Checksum/benchmarks_json/LaserAccelerationMR.json +++ b/Regression/Checksum/benchmarks_json/LaserAccelerationMR.json @@ -1,42 +1,42 @@ { "beam": { - "particle_momentum_x": 4.561019131383119e-20, - "particle_momentum_y": 4.149842919134552e-20, - "particle_momentum_z": 1.364708476750903e-17, - "particle_position_x": 4.652770082118157e-05, + "particle_momentum_x": 4.5610191313831193e-20, + "particle_momentum_y": 4.1498429191345516e-20, + "particle_momentum_z": 1.3647084767509034e-17, + "particle_position_x": 4.6527700821181575e-05, "particle_position_y": 0.001484501913502292, "particle_weight": 12483018148921.525 }, "electrons": { - "particle_momentum_x": 4.2751178407573573e-20, - "particle_momentum_y": 1.9580305087551049e-19, - "particle_momentum_z": 8.913655221012198e-20, - "particle_position_x": 0.04741929968294934, - "particle_position_y": 0.08483137297620588, - "particle_weight": 119232421874999.98 + "particle_momentum_x": 4.275117840757316e-20, + "particle_momentum_y": 1.9580305087552577e-19, + "particle_momentum_z": 8.913655221012749e-20, + "particle_position_x": 0.04741929968294935, + "particle_position_y": 0.08483137297620594, + "particle_weight": 119232421875000.25 }, "lev=0": { - "Bx": 24121595.02471585, + "Bx": 24121595.024715852, "By": 78232.13397859206, "Bz": 601058.5314543134, - "Ex": 22865766698494.82, + "Ex": 22865766698494.816, "Ey": 6508549201873332.0, - "Ez": 32072534017950.55, - "jx": 1130516319665756.0, + "Ez": 32072534017950.547, + "jx": 1130516319665756.2, "jy": 2.325136305137274e+18, "jz": 6769519391624705.0, "rho": 152898720.2638083 }, "lev=1": { - "Bx": 53303280.78531405, - "By": 213820.3084522391, - "Bz": 1321618.978929098, - "Ex": 47846019388623.05, - "Ey": 1.455101409934242e+16, - "Ez": 65304502775874.59, + "Bx": 53303280.77277007, + "By": 213836.7648067578, + "Bz": 1321618.9792460166, + "Ex": 47846162009894.625, + "Ey": 1.4551014101478356e+16, + "Ez": 65304501716354.97, "jx": 46169274324016.0, "jy": 9.274837523569297e+18, - "jz": 1.926277235505425e+16, - "rho": 67304284.98422323 + "jz": 1.9262772355054252e+16, + "rho": 67304284.98422328 } -} +} \ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/LaserOnFine.json b/Regression/Checksum/benchmarks_json/LaserOnFine.json index fbaac2ae66a..b29614c3d66 100644 --- a/Regression/Checksum/benchmarks_json/LaserOnFine.json +++ b/Regression/Checksum/benchmarks_json/LaserOnFine.json @@ -1,28 +1,28 @@ { "lev=0": { "Bx": 0.0, - "By": 427936.33415736846, + "By": 427936.3341615332, "Bz": 0.0, - "Ex": 127078291133419.6, + "Ex": 127078291135506.95, "Ey": 0.0, - "Ez": 5664108687174.143, + "Ez": 5664108686871.884, "divB": 0.0, - "jx": 6.137404954265724e+17, + "jx": 6.137404955467743e+17, "jy": 0.0, "jz": 0.0, "part_per_cell": 0.0 }, "lev=1": { "Bx": 0.0, - "By": 1234425.838348821, + "By": 1234533.4970403123, "Bz": 0.0, - "Ex": 369306119506292.0, + "Ex": 369306810438894.4, "Ey": 0.0, - "Ez": 17592228452124.82, + "Ez": 17592200791219.773, "divB": 0.0, - "jx": 2.4549619817062897e+18, + "jx": 2.454961982187098e+18, "jy": 0.0, "jz": 0.0, "part_per_cell": 102.0 } -} +} \ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/PEC_field_mr.json b/Regression/Checksum/benchmarks_json/PEC_field_mr.json index 99966cbd257..98c021bd93e 100644 --- a/Regression/Checksum/benchmarks_json/PEC_field_mr.json +++ b/Regression/Checksum/benchmarks_json/PEC_field_mr.json @@ -1,10 +1,10 @@ { "lev=0": { - "Bx": 1.3137691514773655, - "Ey": 1052208601.7204809 + "Bx": 1.3137691514770886, + "Ey": 1052208601.720587 }, "lev=1": { - "Bx": 0.3714838555919295, + "Bx": 0.3187370090421958, "Ey": 98224588.87142882 } -} +} \ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/PlasmaAccelerationMR.json b/Regression/Checksum/benchmarks_json/PlasmaAccelerationMR.json index 6914f8e7d89..fe89e574b32 100644 --- a/Regression/Checksum/benchmarks_json/PlasmaAccelerationMR.json +++ b/Regression/Checksum/benchmarks_json/PlasmaAccelerationMR.json @@ -1,10 +1,10 @@ { "beam": { - "particle_momentum_x": 4.404311388516167e-19, - "particle_momentum_y": 4.375126262047493e-19, - "particle_momentum_z": 5.469376271778846e-16, - "particle_position_x": 0.0004075412207630731, - "particle_position_y": 0.04696574192915028, + "particle_momentum_x": 4.4048565073304965e-19, + "particle_momentum_y": 4.375126262046929e-19, + "particle_momentum_z": 5.469376279001583e-16, + "particle_position_x": 0.00040755779584035885, + "particle_position_y": 0.04696574193015579, "particle_weight": 12483018148921.53 }, "driver": { @@ -16,33 +16,33 @@ "particle_weight": 93622636116911.45 }, "lev=0": { - "Bx": 11.07473836201651, - "By": 129344.8692944785, - "Bz": 3.390850561317131, - "Ex": 36239739943859.74, - "Ey": 3402737308.773589, - "Ez": 41205015631437.36, - "jx": 2250406126582474.0, - "jy": 265599977575.8648, - "jz": 4235811839330752.0 + "Bx": 11.074738349609067, + "By": 129344.86907067802, + "Bz": 3.3908505304411856, + "Ex": 36239739851948.6, + "Ey": 3402737313.4041243, + "Ez": 41205015682562.31, + "jx": 2250406166745934.8, + "jy": 265599978778.614, + "jz": 4235811839297305.0 }, "lev=1": { - "Bx": 4.150715838073591, - "By": 142753.1342940014, - "Bz": 2.536506757005651, - "Ex": 49292890789333.12, - "Ey": 1422005008.958596, - "Ez": 52701928262289.76, - "jx": 3029834005553842.0, - "jy": 92336633890.84117, - "jz": 4286789664067064.0 + "Bx": 4.151262829933845, + "By": 142717.89942647063, + "Bz": 2.5355324397388976, + "Ex": 49269965518089.47, + "Ey": 1422005013.428047, + "Ez": 52702006133407.96, + "jx": 3029834073056217.0, + "jy": 92336643744.90013, + "jz": 4286789604963785.5 }, "plasma_e": { "particle_momentum_x": 1.604694564847229e-19, "particle_momentum_y": 4.35828725994675e-24, - "particle_momentum_z": 1.65287992326933e-19, + "particle_momentum_z": 1.6528799232693297e-19, "particle_position_x": 0.1340722964651594, - "particle_position_y": 0.1035059304082606, - "particle_weight": 823974609374999.9 + "particle_position_y": 0.10350593040826062, + "particle_weight": 823974609375002.8 } -} +} \ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/Python_LaserAccelerationMR.json b/Regression/Checksum/benchmarks_json/Python_LaserAccelerationMR.json index f7e977dba97..9b1abaf32dd 100644 --- a/Regression/Checksum/benchmarks_json/Python_LaserAccelerationMR.json +++ b/Regression/Checksum/benchmarks_json/Python_LaserAccelerationMR.json @@ -1,42 +1,42 @@ { "beam": { - "particle_momentum_x": 4.561019131383119e-20, - "particle_momentum_y": 4.149842919134552e-20, - "particle_momentum_z": 1.364708476750903e-17, - "particle_position_x": 4.652770082118157e-05, + "particle_momentum_x": 4.5610191313831193e-20, + "particle_momentum_y": 4.1498429191345516e-20, + "particle_momentum_z": 1.3647084767509034e-17, + "particle_position_x": 4.6527700821181575e-05, "particle_position_y": 0.001484501913502292, "particle_weight": 12483018148921.525 }, "electrons": { - "particle_momentum_x": 4.2751178407573573e-20, - "particle_momentum_y": 1.9580305087551049e-19, - "particle_momentum_z": 8.913655221012198e-20, - "particle_position_x": 0.04741929968294934, - "particle_position_y": 0.08483137297620588, - "particle_weight": 119232421874999.98 + "particle_momentum_x": 4.275117840757316e-20, + "particle_momentum_y": 1.9580305087552577e-19, + "particle_momentum_z": 8.913655221012749e-20, + "particle_position_x": 0.04741929968294935, + "particle_position_y": 0.08483137297620594, + "particle_weight": 119232421875000.25 }, "lev=0": { - "Bx": 24121595.02471585, + "Bx": 24121595.024715852, "By": 78232.13397859206, "Bz": 601058.5314543134, - "Ex": 22865766698494.82, + "Ex": 22865766698494.816, "Ey": 6508549201873332.0, - "Ez": 32072534017950.55, - "jx": 1130516319665756.0, + "Ez": 32072534017950.547, + "jx": 1130516319665756.2, "jy": 2.325136305137274e+18, "jz": 6769519391624705.0, "rho": 152898720.2638083 }, "lev=1": { - "Bx": 53303280.78531405, - "By": 213820.3084522391, - "Bz": 1321618.978929098, - "Ex": 47846019388623.05, - "Ey": 1.455101409934242e+16, - "Ez": 65304502775874.59, + "Bx": 53303280.77277007, + "By": 213836.7648067578, + "Bz": 1321618.9792460166, + "Ex": 47846162009894.625, + "Ey": 1.4551014101478356e+16, + "Ez": 65304501716354.97, "jx": 46169274324016.0, "jy": 9.274837523569297e+18, - "jz": 1.926277235505425e+16, - "rho": 67304284.98422323 + "jz": 1.9262772355054252e+16, + "rho": 67304284.98422328 } -} +} \ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/RefinedInjection.json b/Regression/Checksum/benchmarks_json/RefinedInjection.json index 7e2bf1cbca7..8be545f3887 100644 --- a/Regression/Checksum/benchmarks_json/RefinedInjection.json +++ b/Regression/Checksum/benchmarks_json/RefinedInjection.json @@ -1,10 +1,10 @@ { "beam": { - "particle_momentum_x": 4.5603891309748695e-20, - "particle_momentum_y": 4.191542084127545e-20, - "particle_momentum_z": 1.3639473020680873e-17, - "particle_position_x": 4.672031083580292e-05, - "particle_position_y": 0.00024387147640563223, + "particle_momentum_x": 4.5603842543853726e-20, + "particle_momentum_y": 4.191542263916011e-20, + "particle_momentum_z": 1.363947302075425e-17, + "particle_position_x": 4.672031050423284e-05, + "particle_position_y": 0.00024387147640533396, "particle_weight": 12483018148921.525 }, "electrons": { @@ -16,27 +16,27 @@ "particle_weight": 216500976562500.75 }, "lev=0": { - "Bx": 26338374.373111926, - "By": 160257.72166249255, - "Bz": 694868.2285977077, - "Ex": 56513906231023.23, - "Ey": 7806074074131350.0, - "Ez": 65816739650510.41, - "jx": 6873283806747787.0, - "jy": 4287548168385626.0, - "jz": 7506499988309156.0, + "Bx": 26338374.3731115, + "By": 160257.72168459874, + "Bz": 694868.2285976049, + "Ex": 56513906233209.63, + "Ey": 7806074074131210.0, + "Ez": 65816739650512.98, + "jx": 6873283793354275.0, + "jy": 4287548168426209.0, + "jz": 7506499988368183.0, "rho": 278060758.9118884 }, "lev=1": { - "Bx": 41971136.54331098, - "By": 347834.7278019931, - "Bz": 1093489.2683702512, - "Ex": 136247072735332.94, - "Ey": 1.2435931966910904e+16, - "Ez": 92449079327852.47, - "jx": 1.6499002410844978e+16, - "jy": 1571736982192226.2, - "jz": 2.219065825058093e+16, + "Bx": 41971136.54330983, + "By": 347834.7278931723, + "Bz": 1093489.2683699469, + "Ex": 136247072743280.97, + "Ey": 1.2435931966910504e+16, + "Ez": 92449079327862.72, + "jx": 1.6499002357270928e+16, + "jy": 1571736982354559.0, + "jz": 2.219065825081704e+16, "rho": 298322648.1883917 } } \ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/particles_in_pml_2d_MR.json b/Regression/Checksum/benchmarks_json/particles_in_pml_2d_MR.json index 8f05b63e7f2..11c0a2a6108 100644 --- a/Regression/Checksum/benchmarks_json/particles_in_pml_2d_MR.json +++ b/Regression/Checksum/benchmarks_json/particles_in_pml_2d_MR.json @@ -1,22 +1,22 @@ { "lev=0": { "Bx": 0.0, - "By": 3.5780515886298844e-09, + "By": 3.578051588629885e-09, "Bz": 0.0, "Ex": 1.9699822913484977, "Ey": 0.0, - "Ez": 0.5356004212513481, + "Ez": 0.5356004212513483, "jx": 0.0, "jy": 0.0, "jz": 0.0 }, "lev=1": { "Bx": 0.0, - "By": 3.2059888629493914e-09, + "By": 2.7629151306453947e-09, "Bz": 0.0, - "Ex": 2.459734923669491, + "Ex": 2.4597363065789337, "Ey": 0.0, - "Ez": 0.4991257213214868, + "Ez": 0.45901250290130735, "jx": 0.0, "jy": 0.0, "jz": 0.0 diff --git a/Regression/Checksum/benchmarks_json/particles_in_pml_3d_MR.json b/Regression/Checksum/benchmarks_json/particles_in_pml_3d_MR.json index d665b04110f..9c650dfbf9b 100644 --- a/Regression/Checksum/benchmarks_json/particles_in_pml_3d_MR.json +++ b/Regression/Checksum/benchmarks_json/particles_in_pml_3d_MR.json @@ -1,22 +1,22 @@ { "lev=0": { - "Bx": 8.432558629750022e-05, - "By": 0.02689260933254305, - "Bz": 0.026892609332543057, - "Ex": 9112221.407998262, - "Ey": 4342060.778180814, - "Ez": 4342060.778180817, + "Bx": 8.432558628859037e-05, + "By": 0.026892609333797828, + "Bz": 0.02689260933379782, + "Ex": 9112221.408377409, + "Ey": 4342060.778351774, + "Ez": 4342060.7783517735, "jx": 0.0, "jy": 0.0, "jz": 0.0 }, "lev=1": { - "Bx": 0.00013616513675437372, - "By": 0.040381141101323965, - "Bz": 0.040381141101323924, - "Ex": 13672597.083734166, - "Ey": 6988489.814361327, - "Ez": 6988489.814361326, + "Bx": 0.00011953434461756967, + "By": 0.03435787417429792, + "Bz": 0.03435787417429792, + "Ex": 12412968.176894076, + "Ey": 6537546.007186841, + "Ez": 6537546.0071868375, "jx": 0.0, "jy": 0.0, "jz": 0.0 diff --git a/Regression/Checksum/benchmarks_json/subcyclingMR.json b/Regression/Checksum/benchmarks_json/subcyclingMR.json index c2977227577..2325079323e 100644 --- a/Regression/Checksum/benchmarks_json/subcyclingMR.json +++ b/Regression/Checksum/benchmarks_json/subcyclingMR.json @@ -1,10 +1,10 @@ { "beam": { - "particle_momentum_x": 4.341970536840507e-19, + "particle_momentum_x": 4.387311767094113e-19, "particle_momentum_y": 0.0, - "particle_momentum_z": 4.854125969816336e-17, - "particle_position_x": 0.000631595029496105, - "particle_position_y": 0.08491248490855219, + "particle_momentum_z": 4.8517704675491335e-17, + "particle_position_x": 0.0006657033783750815, + "particle_position_y": 0.0849140891423501, "particle_weight": 62415090744607.65 }, "driver": { @@ -17,40 +17,40 @@ }, "lev=0": { "Bx": 0.0, - "By": 999414.3581034234, + "By": 1003061.0884665609, "Bz": 0.0, - "Ex": 388778725968159.1, + "Ex": 392507850324287.3, "Ey": 0.0, - "Ez": 475738753763627.9, - "jx": 3.8453235309975706e+17, + "Ez": 474756663379922.6, + "jx": 3.88537943199684e+17, "jy": 0.0, - "jz": 6.358921323286822e+17 + "jz": 6.354163086053307e+17 }, "lev=1": { "Bx": 0.0, - "By": 1869003.9426403372, + "By": 1852424.496345662, "Bz": 0.0, - "Ex": 876798193970146.4, + "Ex": 869799620435717.6, "Ey": 0.0, - "Ez": 918415238562273.8, - "jx": 1.536648937833682e+17, + "Ez": 917784231212460.1, + "jx": 1.5425231891252467e+17, "jy": 0.0, - "jz": 4.129783535034742e+17 + "jz": 4.132752674206236e+17 }, "plasma_e": { - "particle_momentum_x": 1.1023996684852916e-18, + "particle_momentum_x": 1.1104588339830376e-18, "particle_momentum_y": 0.0, - "particle_momentum_z": 1.430708750836071e-18, - "particle_position_x": 0.23607832427125558, - "particle_position_y": 0.29029734645671285, + "particle_momentum_z": 1.430771356992691e-18, + "particle_position_x": 0.2360890298892107, + "particle_position_y": 0.29029221403997085, "particle_weight": 5532897949218750.0 }, "plasma_p": { - "particle_momentum_x": 1.856467736176977e-18, + "particle_momentum_x": 1.8415768930713125e-18, "particle_momentum_y": 0.0, - "particle_momentum_z": 2.416775960843685e-18, - "particle_position_x": 0.2390466856387225, - "particle_position_y": 0.31004658573281996, + "particle_momentum_z": 2.4177122400240747e-18, + "particle_position_x": 0.23904653079854968, + "particle_position_y": 0.31004660311791954, "particle_weight": 5835937500000001.0 } } \ No newline at end of file diff --git a/Source/Parallelization/WarpXComm_K.H b/Source/Parallelization/WarpXComm_K.H index 6dc51183a38..afe0617a8e4 100644 --- a/Source/Parallelization/WarpXComm_K.H +++ b/Source/Parallelization/WarpXComm_K.H @@ -39,30 +39,32 @@ void warpx_interp (int j, int k, int l, const int sl = (AMREX_SPACEDIM <= 2) ? 0 : arr_stag[2]; // Number of points used for interpolation from coarse grid to fine grid - const int nj = (sj == 0) ? 1 : 2; - const int nk = (sk == 0) ? 1 : 2; - const int nl = (sl == 0) ? 1 : 2; + const int nj = 2; + const int nk = 2; + const int nl = 2; - const int jc = amrex::coarsen(j, rj); - const int kc = amrex::coarsen(k, rk); - const int lc = amrex::coarsen(l, rl); + const int jc = (sj == 0) ? amrex::coarsen(j - rj/2, rj) : amrex::coarsen(j, rj); + const int kc = (sk == 0) ? amrex::coarsen(k - rk/2, rk) : amrex::coarsen(k, rk); + const int lc = (sl == 0) ? amrex::coarsen(l - rl/2, rl) : amrex::coarsen(l, rl); amrex::Real wj; amrex::Real wk; amrex::Real wl; - // Interpolate from coarse grid to fine grid using either 1 point with weight 1, if both grids - // are cell-centered, or 2 points with weights depending on the distance, if both grids are nodal + // Interpolate from coarse grid to fine grid using 2 points + // with weights depending on the distance, for both nodal and cell-centered grids + amrex::Real hj = (sj == 0) ? 0.5_rt : 0._rt; + amrex::Real hk = (sk == 0) ? 0.5_rt : 0._rt; + amrex::Real hl = (sl == 0) ? 0.5_rt : 0._rt; + amrex::Real res = 0.0_rt; + for (int jj = 0; jj < nj; jj++) { for (int kk = 0; kk < nk; kk++) { for (int ll = 0; ll < nl; ll++) { - wj = (sj == 0) ? 1.0_rt : (rj - amrex::Math::abs(j - (jc + jj) * rj)) - / static_cast(rj); - wk = (sk == 0) ? 1.0_rt : (rk - amrex::Math::abs(k - (kc + kk) * rk)) - / static_cast(rk); - wl = (sl == 0) ? 1.0_rt : (rl - amrex::Math::abs(l - (lc + ll) * rl)) - / static_cast(rl); + wj = (rj - amrex::Math::abs(j + hj - (jc + jj + hj) * rj)) / static_cast(rj); + wk = (rk - amrex::Math::abs(k + hk - (kc + kk + hk) * rk)) / static_cast(rk); + wl = (rl - amrex::Math::abs(l + hl - (lc + ll + hl) * rl)) / static_cast(rl); res += wj * wk * wl * arr_coarse_zeropad(jc+jj,kc+kk,lc+ll); } }