Introduce AMReX change of stencil for Poisson solver (#2496)

* AMReX/PICSAR: Weekly Update (#2478) Weekly update to latest AMReX. Weekly update to latest PICSAR (no changes). ``` ./Tools/Release/updatePICSAR.py ./Tools/Release/updateAMReX.py ``` * Update benchmarks * Update benchmarks for 3D tests * Update benchmarks * Update benchmark * Update benchmark Co-authored-by: Axel Huebl <[email protected]>
ECP-WarpX · Nov 2, 2021 · e459e3a · e459e3a
1 parent eddee17
commit e459e3a
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 67 deletions.
diff --git a/Examples/Modules/relativistic_space_charge_initialization/analysis.py b/Examples/Modules/relativistic_space_charge_initialization/analysis.py
@@ -80,7 +80,7 @@ def make_2d(arr):
 def check(E, E_th, label):
     print( 'Relative error in %s: %.3f'%(
             label, abs(E-E_th).max()/E_th.max()))
-    assert np.allclose( E, E_th, atol=0.1*E_th.max() )
+    assert np.allclose( E, E_th, atol=0.16*E_th.max() )
 
 check( Ex_array, Ex_th, 'Ex' )
 

diff --git a/Examples/Modules/space_charge_initialization/analysis.py b/Examples/Modules/space_charge_initialization/analysis.py
@@ -97,7 +97,7 @@ def make_2d(arr):
 def check(E, E_th, label):
     print( 'Relative error in %s: %.3f'%(
             label, abs(E-E_th).max()/E_th.max()))
-    tolerance_rel = 0.1
+    tolerance_rel = 0.14
     print("tolerance_rel: " + str(tolerance_rel))
     assert np.allclose( E, E_th, atol=tolerance_rel*E_th.max() )
 

diff --git a/Regression/Checksum/benchmarks_json/Plasma_lens.json b/Regression/Checksum/benchmarks_json/Plasma_lens.json
@@ -2,22 +2,22 @@
   "electrons": {
     "particle_cpu": 1.0,
     "particle_id": 2.0,
-    "particle_momentum_x": 1.8497357687843446e-27,
-    "particle_momentum_y": 1.4797852897079812e-27,
+    "particle_momentum_x": 1.849737046410834e-27,
+    "particle_momentum_y": 1.479786888284898e-27,
     "particle_momentum_z": 3.6436751241117655e-25,
-    "particle_position_x": 0.03778437270526418,
-    "particle_position_y": 0.030227636257933975,
-    "particle_position_z": 3.9799632585096267
+    "particle_position_x": 0.03778426480073094,
+    "particle_position_y": 0.03022751873760118,
+    "particle_position_z": 3.979963280939717
   },
   "lev=0": {
     "Bx": 0.0,
     "By": 0.0,
     "Bz": 0.0,
-    "Ex": 9.938634536083956e-07,
-    "Ey": 9.994968813016262e-07,
-    "Ez": 1.3536427852197406e-06,
+    "Ex": 9.565413283316e-07,
+    "Ey": 9.615010766093065e-07,
+    "Ez": 1.279755767954616e-06,
     "jx": 0.0,
     "jy": 0.0,
     "jz": 0.0
   }
-}
+}
diff --git a/Regression/Checksum/benchmarks_json/Python_prev_positions.json b/Regression/Checksum/benchmarks_json/Python_prev_positions.json
@@ -2,22 +2,22 @@
   "electrons": {
     "particle_cpu": 20.0,
     "particle_id": 41333.0,
-    "particle_momentum_x": 8.834357438906734e-23,
+    "particle_momentum_x": 8.787640826001997e-23,
     "particle_momentum_y": 3.78128494181519e-24,
-    "particle_momentum_z": 5.4612344281874635e-24,
-    "particle_position_x": 0.624097570025668,
-    "particle_position_y": 0.5545672342722028,
-    "particle_prev_x": 0.6164172918258127,
-    "particle_prev_z": 0.555458008255442,
+    "particle_momentum_z": 5.39690755047567e-24,
+    "particle_position_x": 0.6227948811898453,
+    "particle_position_y": 0.5553787034074177,
+    "particle_prev_x": 0.615254796149112,
+    "particle_prev_z": 0.5559363018627721,
     "particle_weight": 8569335937.5
   },
   "lev=0": {
     "Bx": 0.0,
     "By": 0.0,
     "Bz": 0.0,
-    "Ex": 3668015.5048085107,
+    "Ex": 3710588.849990039,
     "Ey": 0.0,
-    "Ez": 637523.6068882011,
+    "Ez": 646727.8074440232,
     "jx": 0.0,
     "jy": 0.0,
     "jz": 0.0

diff --git a/Regression/Checksum/benchmarks_json/RepellingParticles.json b/Regression/Checksum/benchmarks_json/RepellingParticles.json
@@ -2,35 +2,35 @@
   "electron1": {
     "particle_cpu": 0.0,
     "particle_id": 1.0,
-    "particle_momentum_x": 7.290949775645051e-23,
+    "particle_momentum_x": 7.291372825198814e-23,
     "particle_momentum_y": 0.0,
-    "particle_momentum_z": 1.513278897057852e-34,
-    "particle_position_x": 1.2979353623843636e-05,
-    "particle_position_y": 2.5918801452693848e-17,
+    "particle_momentum_z": 1.546448492277708e-36,
+    "particle_position_x": 1.297993341485761e-05,
+    "particle_position_y": 1.779311800015497e-19,
     "particle_weight": 5000000000000.0
   },
   "electron2": {
     "particle_cpu": 0.0,
     "particle_id": 2.0,
-    "particle_momentum_x": 7.290949775607332e-23,
+    "particle_momentum_x": 7.291372825198502e-23,
     "particle_momentum_y": 0.0,
-    "particle_momentum_z": 5.946822451302689e-36,
-    "particle_position_x": 1.2979353623849498e-05,
-    "particle_position_y": 1.965966968442628e-17,
+    "particle_momentum_z": 1.566783697283594e-36,
+    "particle_position_x": 1.297993341485725e-05,
+    "particle_position_y": 1.79978846968537e-19,
     "particle_weight": 5000000000000.0
   },
   "lev=0": {
     "Bx": 0.0,
-    "By": 10242.068161511446,
+    "By": 10242.82951116687,
     "Bz": 0.0,
-    "Ex": 11293464466157.39,
+    "Ex": 11290112090935.82,
     "Ey": 0.0,
-    "Ez": 15385290305753.018,
-    "F": 8593.555096981512,
-    "divE": 1.709174685907196e+18,
-    "jx": 495250727461219.1,
+    "Ez": 15386357337389.65,
+    "F": 8585.384852879466,
+    "divE": 1.234698921124232e+18,
+    "jx": 495277180757311.8,
     "jy": 0.0,
-    "jz": 564.3956467573765,
+    "jz": 10.64185986759511,
     "rho": 6408706.535999998
   }
 }
diff --git a/Regression/Checksum/benchmarks_json/background_mcc.json b/Regression/Checksum/benchmarks_json/background_mcc.json
@@ -1,26 +1,26 @@
 {
   "electrons": {
-    "particle_cpu": 190700.0,
-    "particle_id": 58608906771.0,
-    "particle_momentum_x": 1.0093895330694597e-18,
-    "particle_momentum_y": 2.7956958989857143e-19,
-    "particle_momentum_z": 2.7969015548182506e-19,
-    "particle_position_x": 17152.56985654575,
-    "particle_position_y": 940.4994608652297,
-    "particle_weight": 61519629821.77735
+    "particle_cpu": 190617.0,
+    "particle_id": 58601432186.0,
+    "particle_momentum_x": 1.008747465656768e-18,
+    "particle_momentum_y": 2.799754668819323e-19,
+    "particle_momentum_z": 2.792680383829936e-19,
+    "particle_position_x": 17149.64926526631,
+    "particle_position_y": 940.0852322133724,
+    "particle_weight": 61513602111.81641
   },
   "he_ions": {
-    "particle_cpu": 262717.0,
-    "particle_id": 206662492683.0,
-    "particle_momentum_x": 2.8437571739251242e-18,
-    "particle_momentum_y": 2.207047146518265e-18,
-    "particle_momentum_z": 2.20705737761419e-18,
-    "particle_position_x": 17600.029140077717,
-    "particle_position_y": 1099.7492783317027,
-    "particle_weight": 71953047790.52736
+    "particle_cpu": 262683.0,
+    "particle_id": 206652536825.0,
+    "particle_momentum_x": 2.843447398515225e-18,
+    "particle_momentum_y": 2.206898408374442e-18,
+    "particle_momentum_z": 2.20679498286358e-18,
+    "particle_position_x": 17598.68900871454,
+    "particle_position_y": 1099.660397150414,
+    "particle_weight": 71950444915.7715
   },
   "lev=0": {
-    "rho_electrons": 0.035900234973394604,
-    "rho_he_ions": 0.041911968250211346
+    "rho_electrons": 0.03589657270088979,
+    "rho_he_ions": 0.04191032436797355
   }
 }
diff --git a/Regression/Checksum/benchmarks_json/relativistic_space_charge_initialization.json b/Regression/Checksum/benchmarks_json/relativistic_space_charge_initialization.json
@@ -1,9 +1,9 @@
 {
   "lev=0": {
-    "By": 3.178515201113084e-05,
-    "Ex": 9529.425434595534,
-    "Ey": 9531.035358841318,
-    "Ez": 91658.41951432818,
+    "By": 3.176295702090909e-05,
+    "Ex": 9522.771061731508,
+    "Ey": 9524.387833670155,
+    "Ez": 82111.48351889937,
     "jx": 0.0,
     "jy": 0.0,
     "jz": 785848.6496458045

diff --git a/Regression/Checksum/benchmarks_json/space_charge_initialization.json b/Regression/Checksum/benchmarks_json/space_charge_initialization.json
@@ -1,10 +1,10 @@
 {
   "lev=0": {
-    "Ex": 7874.567902742338,
-    "Ey": 7876.183218584557,
-    "Ez": 7875.262728446799,
+    "Ex": 7869.638188829999,
+    "Ey": 7871.253214446194,
+    "Ez": 7870.333060894928,
     "jx": 0.0,
     "jy": 0.0,
     "jz": 0.0
   }
-}
+}
diff --git a/Regression/Checksum/benchmarks_json/space_charge_initialization_2d.json b/Regression/Checksum/benchmarks_json/space_charge_initialization_2d.json
@@ -1,10 +1,10 @@
 {
   "lev=0": {
-    "Ex": 7442.398274068142,
+    "Ex": 7439.901947646065,
     "Ey": 0.0,
-    "Ez": 7443.723183299575,
+    "Ez": 7441.226830550871,
     "jx": 0.0,
     "jy": 0.0,
     "jz": 0.0
   }
-}
+}
diff --git a/Regression/WarpX-GPU-tests.ini b/Regression/WarpX-GPU-tests.ini
@@ -48,7 +48,7 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more
 
 [AMReX]
 dir = /home/regtester/git/amrex/
-branch = 09a0ec56378f9f6a5f68f3ac025318af746432d5
+branch = 614b9ebbbf04eb5b4532029ff4a7ae40e6663042
 
 [source]
 dir = /home/regtester/git/WarpX

diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini
@@ -48,7 +48,7 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det
 
 [AMReX]
 dir = /home/regtester/AMReX_RegTesting/amrex/
-branch = 09a0ec56378f9f6a5f68f3ac025318af746432d5
+branch = 614b9ebbbf04eb5b4532029ff4a7ae40e6663042
 
 [source]
 dir = /home/regtester/AMReX_RegTesting/warpx

diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
@@ -239,7 +239,7 @@ set(WarpX_amrex_src ""
 set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
     CACHE STRING
     "Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
-set(WarpX_amrex_branch "09a0ec56378f9f6a5f68f3ac025318af746432d5"
+set(WarpX_amrex_branch "614b9ebbbf04eb5b4532029ff4a7ae40e6663042"
     CACHE STRING
     "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
 

diff --git a/run_test.sh b/run_test.sh
@@ -51,7 +51,7 @@ echo "cd $PWD"
 
 # Clone PICSAR, AMReX and warpx-data
 git clone https://github.com/AMReX-Codes/amrex.git
-cd amrex && git checkout --detach 09a0ec56378f9f6a5f68f3ac025318af746432d5 && cd -
+cd amrex && git checkout --detach 614b9ebbbf04eb5b4532029ff4a7ae40e6663042 && cd -
 # Use QED brach for QED tests
 git clone https://github.com/ECP-WarpX/picsar.git
 cd picsar && git checkout --detach a78be127f66adc1558f527edc8964e37e3a055ff && cd -