Fix NUniformPerCell for 1D (#3659)

* Fix NUniformPerCell for 1D

* Fix CI benchmarks

5 files changed, 61 insertions, 61 deletions

diff --git a/Examples/Physics_applications/capacitive_discharge/analysis_1d.py b/Examples/Physics_applications/capacitive_discharge/analysis_1d.py
index 73b1ce6d6..c6529dabd 100755
--- a/Examples/Physics_applications/capacitive_discharge/analysis_1d.py
+++ b/Examples/Physics_applications/capacitive_discharge/analysis_1d.py
@@ -5,39 +5,39 @@
 import numpy as np
 
 ref_density = np.array([
-       1.29556694e+14, 2.24358818e+14, 2.55381745e+14, 2.55655005e+14,
-       2.55796268e+14, 2.55819108e+14, 2.55819686e+14, 2.55751184e+14,
-       2.55920806e+14, 2.56072344e+14, 2.55937266e+14, 2.55849080e+14,
-       2.55918981e+14, 2.55980835e+14, 2.56054153e+14, 2.56074694e+14,
-       2.56036953e+14, 2.56181153e+14, 2.56322618e+14, 2.56253541e+14,
-       2.56196224e+14, 2.56353090e+14, 2.56256022e+14, 2.55928997e+14,
-       2.56110988e+14, 2.56658917e+14, 2.56832584e+14, 2.56551871e+14,
-       2.56491186e+14, 2.56469928e+14, 2.56418625e+14, 2.56541071e+14,
-       2.56513773e+14, 2.56424507e+14, 2.56302757e+14, 2.56242392e+14,
-       2.56270399e+14, 2.56178952e+14, 2.56071407e+14, 2.56141949e+14,
-       2.56419808e+14, 2.56606936e+14, 2.56437774e+14, 2.56252443e+14,
-       2.56309513e+14, 2.56383484e+14, 2.56265140e+14, 2.56167674e+14,
-       2.56466922e+14, 2.56924871e+14, 2.56901781e+14, 2.56631494e+14,
-       2.56643458e+14, 2.56523464e+14, 2.56378273e+14, 2.56571301e+14,
-       2.56794308e+14, 2.56788543e+14, 2.56549712e+14, 2.56303156e+14,
-       2.56210811e+14, 2.56418363e+14, 2.57314552e+14, 2.58471405e+14,
-       2.58169740e+14, 2.56946418e+14, 2.56726550e+14, 2.56853119e+14,
-       2.56613698e+14, 2.56509538e+14, 2.56692976e+14, 2.56705132e+14,
-       2.56372135e+14, 2.56167561e+14, 2.56296953e+14, 2.56498746e+14,
-       2.56523099e+14, 2.56404333e+14, 2.56227098e+14, 2.56399004e+14,
-       2.56614905e+14, 2.56436650e+14, 2.56388608e+14, 2.56553683e+14,
-       2.56637912e+14, 2.56407782e+14, 2.56104130e+14, 2.56082338e+14,
-       2.56095272e+14, 2.56278448e+14, 2.56808134e+14, 2.57127896e+14,
-       2.56858173e+14, 2.56326991e+14, 2.56296032e+14, 2.56563348e+14,
-       2.56482274e+14, 2.56667483e+14, 2.57072448e+14, 2.56767529e+14,
-       2.56433245e+14, 2.56586564e+14, 2.56636403e+14, 2.56765624e+14,
-       2.56868122e+14, 2.56783435e+14, 2.56714527e+14, 2.56651030e+14,
-       2.56528399e+14, 2.56227514e+14, 2.56163300e+14, 2.56408217e+14,
-       2.56433124e+14, 2.56374737e+14, 2.56542023e+14, 2.56748800e+14,
-       2.56715205e+14, 2.56298166e+14, 2.56042658e+14, 2.56292458e+14,
-       2.56352283e+14, 2.56370559e+14, 2.56487462e+14, 2.56483655e+14,
-       2.56741185e+14, 2.56665111e+14, 2.56523794e+14, 2.24741566e+14,
-       1.28486948e+14
+       1.27953969e+14, 2.23553999e+14, 2.55384510e+14, 2.55663110e+14,
+       2.55805760e+14, 2.55812087e+14, 2.55813911e+14, 2.55754104e+14,
+       2.55929601e+14, 2.56085472e+14, 2.55932867e+14, 2.55828121e+14,
+       2.55901711e+14, 2.55985074e+14, 2.56182697e+14, 2.56446847e+14,
+       2.56483696e+14, 2.56301187e+14, 2.56245301e+14, 2.56797584e+14,
+       2.57257907e+14, 2.57023627e+14, 2.56500876e+14, 2.56106851e+14,
+       2.56283546e+14, 2.56723967e+14, 2.56960855e+14, 2.56825486e+14,
+       2.56674669e+14, 2.56567191e+14, 2.56310927e+14, 2.56361171e+14,
+       2.56692197e+14, 2.56743606e+14, 2.56653108e+14, 2.56883854e+14,
+       2.56763228e+14, 2.56343726e+14, 2.56385489e+14, 2.56570110e+14,
+       2.56538112e+14, 2.56472179e+14, 2.56322922e+14, 2.56195384e+14,
+       2.56474576e+14, 2.56764233e+14, 2.56533016e+14, 2.56257170e+14,
+       2.56362463e+14, 2.56363962e+14, 2.56311292e+14, 2.56678788e+14,
+       2.57061138e+14, 2.56785892e+14, 2.56406603e+14, 2.56334908e+14,
+       2.56120051e+14, 2.56003269e+14, 2.56132187e+14, 2.56329572e+14,
+       2.56535713e+14, 2.56708950e+14, 2.56661860e+14, 2.56448986e+14,
+       2.56386823e+14, 2.56233660e+14, 2.56137632e+14, 2.56206263e+14,
+       2.56364996e+14, 2.56483536e+14, 2.56308741e+14, 2.56447231e+14,
+       2.56896301e+14, 2.56691405e+14, 2.56170780e+14, 2.56122216e+14,
+       2.56427399e+14, 2.56897558e+14, 2.56928868e+14, 2.56659033e+14,
+       2.56749993e+14, 2.56952497e+14, 2.56798907e+14, 2.56377081e+14,
+       2.56453057e+14, 2.56796632e+14, 2.56944576e+14, 2.57248469e+14,
+       2.57279426e+14, 2.56849516e+14, 2.56601834e+14, 2.56850545e+14,
+       2.56953072e+14, 2.56442586e+14, 2.56329006e+14, 2.56790661e+14,
+       2.57083582e+14, 2.57075550e+14, 2.56719615e+14, 2.56220486e+14,
+       2.56222323e+14, 2.56547365e+14, 2.56499423e+14, 2.56434041e+14,
+       2.56378587e+14, 2.56249892e+14, 2.56380492e+14, 2.56504513e+14,
+       2.56337631e+14, 2.56204891e+14, 2.56325116e+14, 2.56297798e+14,
+       2.56112782e+14, 2.56054218e+14, 2.56320120e+14, 2.56580938e+14,
+       2.56446800e+14, 2.56267011e+14, 2.56372853e+14, 2.56617592e+14,
+       2.56630745e+14, 2.56615242e+14, 2.56625259e+14, 2.56561320e+14,
+       2.56640072e+14, 2.56693273e+14, 2.56613237e+14, 2.24169847e+14,
+       1.27683197e+14
 ])
 
 density_data = np.load( 'ion_density_case_1.npy' )
diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_1d.json b/Regression/Checksum/benchmarks_json/Langmuir_multi_1d.json
index 7586cca0a..d3d85c68c 100644
--- a/Regression/Checksum/benchmarks_json/Langmuir_multi_1d.json
+++ b/Regression/Checksum/benchmarks_json/Langmuir_multi_1d.json
@@ -2,7 +2,7 @@
   "electrons": {
     "particle_momentum_x": 0.0,
     "particle_momentum_y": 0.0,
-    "particle_momentum_z": 1.183644630083563e-22,
+    "particle_momentum_z": 1.186531831468082e-22,
     "particle_position_x": 2.560000000000000e-03,
     "particle_weight": 8.000000000000000e+19
   },
@@ -12,15 +12,15 @@
     "Bz": 0.0,
     "Ex": 0.0,
     "Ey": 0.0,
-    "Ez": 124191078376.51929,
+    "Ez": 1.241536718934408e+11,
     "jx": 0.0,
     "jy": 0.0,
-    "jz": 47472967251388.14
+    "jz": 4.745867308790159e+13
   },
   "positrons": {
     "particle_momentum_x": 0.0,
     "particle_momentum_y": 0.0,
-    "particle_momentum_z": 1.183644630083563e-22,
+    "particle_momentum_z": 1.186531831468082e-22,
     "particle_position_x": 2.560000000000001e-03,
     "particle_weight": 8.000000000000000e+19
   }
diff --git a/Regression/Checksum/benchmarks_json/LaserAcceleration_1d.json b/Regression/Checksum/benchmarks_json/LaserAcceleration_1d.json
index 6c4787e19..2fdfc8c48 100644
--- a/Regression/Checksum/benchmarks_json/LaserAcceleration_1d.json
+++ b/Regression/Checksum/benchmarks_json/LaserAcceleration_1d.json
@@ -1,23 +1,23 @@
 {
   "electrons": {
     "particle_momentum_x": 0.0,
-    "particle_momentum_y": 1.2426490415609688e-20,
-    "particle_momentum_z": 1.4127884427815013e-21,
-    "particle_orig_z": 0.022432812500000038,
-    "particle_position_x": 0.022432900595257786,
-    "particle_regionofinterest": 40.0,
-    "particle_weight": 5.20625e+18
+    "particle_momentum_y": 1.295766758135391e-20,
+    "particle_momentum_z": 3.314669116074607e-21,
+    "particle_orig_z": 2.238310546875004e-02,
+    "particle_position_x": 2.235662928400318e-02,
+    "particle_regionofinterest": 38.0,
+    "particle_weight": 5.1796875e+18
   },
   "lev=0": {
-    "Bx": 178016.75728377263,
+    "Bx": 1.780168926454668e+05,
     "By": 0.0,
     "Bz": 0.0,
     "Ex": 0.0,
-    "Ey": 40878228443447.7,
-    "Ez": 3426547096.153969,
+    "Ey": 4.087830051790674e+13,
+    "Ez": 1.266251470309245e+10,
     "jx": 0.0,
-    "jy": 30439563140043.055,
-    "jz": 3381784198940.749,
-    "rho": 3127749.1976868743
+    "jy": 3.037044861122445e+13,
+    "jz": 5.611270121187104e+12,
+    "rho": 3.111231757950731e+06
   }
-}
\ No newline at end of file
+}
diff --git a/Regression/Checksum/benchmarks_json/Python_LaserAcceleration_1d.json b/Regression/Checksum/benchmarks_json/Python_LaserAcceleration_1d.json
index 2bd5c63f9..f4c3d41ee 100644
--- a/Regression/Checksum/benchmarks_json/Python_LaserAcceleration_1d.json
+++ b/Regression/Checksum/benchmarks_json/Python_LaserAcceleration_1d.json
@@ -1,21 +1,21 @@
 {
   "electrons": {
     "particle_momentum_x": 0.0,
-      "particle_momentum_y": 1.242649041560969e-20,
-      "particle_momentum_z": 1.412788442781501e-21,
-      "particle_position_x": 2.243290059525779e-02,
-    "particle_weight": 5.20625e+18
+    "particle_momentum_y": 1.295766758135391e-20,
+    "particle_momentum_z": 3.314669116074607e-21,
+    "particle_position_x": 2.235662928400318e-02,
+    "particle_weight": 5.1796875e+18
   },
   "lev=0": {
-    "Bx": 1.780167572837726e+05,
+    "Bx": 1.780168926454668e+05,
     "By": 0.0,
     "Bz": 0.0,
     "Ex": 0.0,
-    "Ey": 4.087822844344770e+13,
-    "Ez": 3.426547096153969e+09,
+    "Ey": 4.087830051790674e+13,
+    "Ez": 1.266251470309245e+10,
     "jx": 0.0,
-    "jy": 3.043956314004305e+13,
-    "jz": 3.381784198940749e+12,
-    "rho": 3127749.1976868743
+    "jy": 3.037044861122445e+13,
+    "jz": 5.611270121187104e+12,
+    "rho": 3.111231757950731e+06
   }
 }
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
index 9dd49017a..680d794c6 100644
--- a/Source/Particles/PhysicalParticleContainer.cpp
+++ b/Source/Particles/PhysicalParticleContainer.cpp
@@ -176,7 +176,7 @@ namespace
 #else
         pos.x = 0.0_rt;
         pos.y = 0.0_rt;
-        pos.z = lo_corner[0] + (iv[0]+r.z)*dx[0];
+        pos.z = lo_corner[0] + (iv[0]+r.x)*dx[0];
 #endif
         return pos;
     }