Fix merge

Examples/Tests/pec/inputs_test_3d_pec_particle

@@ -54,4 +54,4 @@ algo.particle_shape = 3
 diagnostics.diags_names = diag1
 diag1.intervals = 20
 diag1.diag_type = Full
-diag1.fields_to_plot = Ex Ey Ez Bx Bz jx jy jz
+diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz

Examples/Tests/repelling_particles/inputs_test_2d_repelling_particles

@@ -50,6 +50,4 @@ algo.particle_shape = 3
 diagnostics.diags_names = diag1
 diag1.intervals = 20
 diag1.diag_type = Full
-diag1.fields_to_plot = Bx By Bz Ex Ey Ez jx jy divE rho F
-diag1.electron1.variables = w ux uy
-diag1.electron2.variables = w ux uy
+diag1.fields_to_plot = Bx By Bz Ex Ey Ez jx jy jz divE rho F

Regression/Checksum/benchmarks_json/test_2d_averaged_galilean_psatd_hybrid.json

@@ -1,29 +1,29 @@
 {
   "electrons": {
-    "particle_momentum_x": 2.699537402367086e-21,
-    "particle_momentum_y": 2.360019270692638e-21,
-    "particle_momentum_z": 1.780767510883242e-16,
+    "particle_momentum_x": 2.698796676582727e-21,
+    "particle_momentum_y": 2.358317699793830e-21,
+    "particle_momentum_z": 1.7807675042654014e-16,
     "particle_position_x": 405588.6263336367,
     "particle_position_y": 20127109.123049334,
     "particle_weight": 6.917460794691972e+17
   },
   "ions": {
     "particle_momentum_x": 2.6368707637661792e-18,
-    "particle_momentum_y": 2.625538343907723e-18,
+    "particle_momentum_y": 2.6255383353049537e-18,
     "particle_momentum_z": 3.2697610879044984e-13,
     "particle_position_x": 405588.6872874654,
     "particle_position_y": 20127109.122936208,
     "particle_weight": 6.917460794691972e+17
   },
   "lev=0": {
-    "Bx": 2.234765767599257e-03,
-    "By": 4.462001842258744e-03,
-    "Bz": 6.381690961970809e-03,
-    "Ex": 1.416992773122968e+06,
-    "Ey": 2.099798645881705e+06,
-    "Ez": 3.228119949045398e+05,
-    "jx": 4.349734911337562e+02,
-    "jy": 8.458001863765897e+02,
-    "jz": 5.019025457043359e+03
+    "Bx": 2.232325678078911e-03,
+    "By": 4.459932871524489e-03,
+    "Bz": 6.374578981274600e-03,
+    "Ex": 1.416337670753960e+06,
+    "Ey": 2097441.857526919,
+    "Ez": 3.226592528925644e+05,
+    "jx": 434.8052109005167,
+    "jy": 844.9945365202007,
+    "jz": 5016.6719265439715
   }
 }

Regression/Checksum/benchmarks_json/test_2d_nci_corrector.json

@@ -1,14 +1,14 @@
 {
   "electrons": {
-    "particle_momentum_x": 3.991979555303416e-23,
+    "particle_momentum_x": 3.991979611698487e-23,
     "particle_momentum_y": 1.6772791844850194e-23,
     "particle_momentum_z": 2.2371733897589452e-15,
     "particle_position_x": 0.04096000000160954,
     "particle_position_y": 0.08192000000000049,
     "particle_weight": 8e+19
   },
   "ions": {
-    "particle_momentum_x": 3.51737892787546e-23,
+    "particle_momentum_x": 3.517378693438017e-23,
     "particle_momentum_y": 1.3188981537832866e-23,
     "particle_momentum_z": 4.107791874506787e-12,
     "particle_position_x": 0.04095999999995128,
@@ -17,13 +17,13 @@
   },
   "lev=0": {
     "Bx": 132.90120298854487,
-    "By": 29951.24606431362,
+    "By": 29951.25413382292,
     "Bz": 55.86286229804523,
-    "Ex": 7446675890221.682,
+    "Ex": 7446677814368.766,
     "Ey": 40733254651.08371,
-    "Ez": 2495598570657.942,
-    "jx": 224508018645840.2,
+    "Ez": 2495598568000.827,
+    "jx": 224508034417764.3,
     "jy": 58977923517200.664,
-    "jz": 3.439850395563269e+16
+    "jz": 3.4398515666715744e+16
   }
 }

Regression/Checksum/benchmarks_json/test_2d_vay_deposition.json

@@ -16,12 +16,12 @@
     "particle_weight": 1.0
   },
   "lev=0": {
-    "By": 4.885006871760807e-15,
-    "Ex": 1.574809855540070e-06,
-    "Ez": 1.574543299081378e-06,
-    "divE": 7.364328594717978e-08,
-    "jx": 7.964213055335040e-11,
-    "jz": 7.969656127556990e-11,
+    "By": 4.8850423335524976e-15,
+    "Ex": 1.5748554237210878e-06,
+    "Ez": 1.5745640654762762e-06,
+    "divE": 7.364434433257197e-08,
+    "jx": 7.96477185276095e-11,
+    "jz": 7.971109000864354e-11,
     "rho": 6.481496783075554e-19
   }
 }

Regression/Checksum/benchmarks_json/test_3d_averaged_galilean_psatd_hybrid.json

@@ -1,31 +1,31 @@
 {
   "electrons": {
-    "particle_momentum_x": 7.541286177708906e-22,
-    "particle_momentum_y": 7.659210933457820e-22,
-    "particle_momentum_z": 8.903837743806713e-17,
-    "particle_position_x": 8.192020005688485e+04,
+    "particle_momentum_x": 7.541293474047602e-22,
+    "particle_momentum_y": 7.659237311038949e-22,
+    "particle_momentum_z": 8.903837825813545e-17,
+    "particle_position_x": 81920.19983311385,
     "particle_position_y": 81919.57574159632,
     "particle_position_z": 4859842.25173892,
     "particle_weight": 8.465938144469544e+17
   },
   "ions": {
-    "particle_momentum_x": 1.315066152528604e-18,
-    "particle_momentum_y": 1.304308609680759e-18,
+    "particle_momentum_x": 1.3150661471416006e-18,
+    "particle_momentum_y": 1.3043086023289102e-18,
     "particle_momentum_z": 1.6348805688929498e-13,
     "particle_position_x": 81920.24864627604,
     "particle_position_y": 81919.60417848203,
     "particle_position_z": 4859842.251720389,
     "particle_weight": 8.465938144469544e+17
   },
   "lev=0": {
-    "Bx": 1.309435551744617e-03,
-    "By": 1.301878970561325e-03,
-    "Bz": 1.136586234785266e-03,
-    "Ex": 4.840457155429390e+05,
-    "Ey": 4.776331306372285e+05,
-    "Ez": 5.917578918138787e+04,
-    "jx": 5.183750981708264e+02,
-    "jy": 5.182362689679306e+02,
-    "jz": 1.251031485266083e+04
+    "Bx": 0.0013098871638097358,
+    "By": 0.0013022560350337753,
+    "Bz": 0.0011362439560486531,
+    "Ex": 484163.6732625635,
+    "Ey": 477718.00481193175,
+    "Ez": 59111.02620595385,
+    "jx": 518.3761051018562,
+    "jy": 518.2049269419615,
+    "jz": 12510.503007892248
   }
 }

Regression/Checksum/benchmarks_json/test_3d_vay_deposition.json

@@ -18,16 +18,16 @@
     "particle_weight": 1.0
   },
   "lev=0": {
-    "Bx": 8.481755535957680e-16,
-    "By": 8.481755535957682e-16,
-    "Bz": 8.481755535957680e-16,
-    "Ex": 3.082481458547271e-07,
-    "Ey": 3.082481458547270e-07,
-    "Ez": 3.082481458547271e-07,
-    "divE": 1.317648272080536e-08,
-    "jx": 1.310605948445629e-11,
-    "jy": 1.310605948445632e-11,
-    "jz": 1.310605948445638e-11,
+    "Bx": 8.481813081143231e-16,
+    "By": 8.481813081143229e-16,
+    "Bz": 8.481813081143229e-16,
+    "Ex": 3.0819459288113856e-07,
+    "Ey": 3.0819459288113856e-07,
+    "Ez": 3.0819459288113856e-07,
+    "divE": 1.317737929174611e-08,
+    "jx": 1.3111027684847054e-11,
+    "jy": 1.311102768484716e-11,
+    "jz": 1.3111027684847218e-11,
     "rho": 1.1522660947689872e-19
   }
 }