AMReX/PICSAR: Weekly Update (#2666)

ax3l · web-flow · commit d435d0dd5a73 · 2021-12-14T05:39:10.000Z
* AMReX: Weekly Update

* Reset: PEC_particle, RepellingParticles, subcyclingMR

New AMReX grid layout routines split grids until they truly reach
number of MPI ranks, if blocking factor allows. This changes some of
our particle orders slightly.
diff --git a/Regression/Checksum/benchmarks_json/PEC_particle.json b/Regression/Checksum/benchmarks_json/PEC_particle.json
@@ -2,34 +2,34 @@
   "electron": {
     "particle_cpu": 0.0,
     "particle_id": 1.0,
-    "particle_momentum_x": 4.561563069992995e-31,
-    "particle_momentum_y": 4.735240262495866e-34,
-    "particle_momentum_z": 1.1663276912624509e-48,
+    "particle_momentum_x": 4.561563069992461e-31,
+    "particle_momentum_y": 4.735240262497721e-34,
+    "particle_momentum_z": 2.071049171405733e-48,
     "particle_position_x": 3.199800000000243e-05,
-    "particle_position_y": 6.591777047777489e-21,
-    "particle_position_z": 9.312874618739578e-36,
+    "particle_position_y": 6.5917770477795185e-21,
+    "particle_position_z": 8.226638814151006e-36,
     "particle_weight": 1.0
   },
   "lev=0": {
-    "Bx": 5.661370479374975e-05,
-    "By": 1.3668681064411596e-16,
-    "Bz": 0.00011100031731970013,
-    "Ex": 26731.847337630617,
-    "Ey": 29057.333990451483,
-    "Ez": 16060.200852127742,
-    "jx": 4.476492463177985e-05,
-    "jy": 43090052.26648687,
+    "Bx": 5.6613704793749595e-05,
+    "By": 1.3914875815016033e-16,
+    "Bz": 0.00011100031731969847,
+    "Ex": 26731.84733762923,
+    "Ey": 29057.3339904507,
+    "Ez": 16060.200852126594,
+    "jx": 4.476492463221237e-05,
+    "jy": 43090052.26648572,
     "jz": 0.0
   },
   "proton": {
     "particle_cpu": 0.0,
     "particle_id": 2.0,
-    "particle_momentum_x": 5.254805380844202e-32,
+    "particle_momentum_x": 5.254805380842948e-32,
     "particle_momentum_y": 1.002878875615426e-18,
-    "particle_momentum_z": 1.4307076091364584e-48,
+    "particle_momentum_z": 4.1182431708325955e-49,
     "particle_position_x": 3.199799999999955e-05,
     "particle_position_y": 6.5726706900619935e-06,
-    "particle_position_z": 2.9858862553558572e-36,
+    "particle_position_z": 8.144837844277877e-37,
     "particle_weight": 1.0
   }
 }
diff --git a/Regression/Checksum/benchmarks_json/RepellingParticles.json b/Regression/Checksum/benchmarks_json/RepellingParticles.json
@@ -4,9 +4,9 @@
     "particle_id": 1.0,
     "particle_momentum_x": 7.291372825198814e-23,
     "particle_momentum_y": 0.0,
-    "particle_momentum_z": 1.546448492277708e-36,
-    "particle_position_x": 1.297993341485761e-05,
-    "particle_position_y": 1.779311800015497e-19,
+    "particle_momentum_z": 1.5464484922777076e-36,
+    "particle_position_x": 1.2979933414857606e-05,
+    "particle_position_y": 1.7793118000154973e-19,
     "particle_weight": 5000000000000.0
   },
   "electron2": {
@@ -15,22 +15,22 @@
     "particle_momentum_x": 7.291372825198502e-23,
     "particle_momentum_y": 0.0,
     "particle_momentum_z": 1.566783697283594e-36,
-    "particle_position_x": 1.297993341485725e-05,
+    "particle_position_x": 1.2979933414857252e-05,
     "particle_position_y": 1.79978846968537e-19,
     "particle_weight": 5000000000000.0
   },
   "lev=0": {
     "Bx": 0.0,
-    "By": 10242.82951116687,
+    "By": 10242.829286325377,
     "Bz": 0.0,
-    "Ex": 11290112090935.82,
+    "Ex": 11290112090935.816,
     "Ey": 0.0,
-    "Ez": 15386357337389.65,
+    "Ez": 15386357337389.652,
     "F": 8585.384852879466,
-    "divE": 1.234698921124232e+18,
-    "jx": 495277180757311.8,
+    "divE": 1.2346989211242322e+18,
+    "jx": 495277180757311.75,
     "jy": 0.0,
-    "jz": 10.64185986759511,
+    "jz": 10.641859867595105,
     "rho": 6408706.535999998
   }
 }
diff --git a/Regression/Checksum/benchmarks_json/subcyclingMR.json b/Regression/Checksum/benchmarks_json/subcyclingMR.json
@@ -2,10 +2,10 @@
   "beam": {
     "particle_cpu": 0.0,
     "particle_id": 150005000.0,
-    "particle_momentum_x": 4.341975879582419e-19,
+    "particle_momentum_x": 4.341970536840506e-19,
     "particle_momentum_y": 0.0,
-    "particle_momentum_z": 4.854125491397747e-17,
-    "particle_position_x": 0.0006315950294961043,
+    "particle_momentum_z": 4.854125969816336e-17,
+    "particle_position_x": 0.000631595029496105,
     "particle_position_y": 0.08491248490855219,
     "particle_weight": 62415090744607.65
   },
@@ -25,7 +25,7 @@
     "Bz": 0.0,
     "Ex": 388788109636517.25,
     "Ey": 0.0,
-    "Ez": 475734042024292.5,
+    "Ez": 475734042024292.44,
     "jx": 3.8453833238655616e+17,
     "jy": 0.0,
     "jz": 6.358844776737537e+17
@@ -34,29 +34,29 @@
     "Bx": 0.0,
     "By": 1869002.1405830402,
     "Bz": 0.0,
-    "Ex": 876808143853004.9,
+    "Ex": 876808143853005.0,
     "Ey": 0.0,
-    "Ez": 918405586302947.4,
+    "Ez": 918405586302947.2,
     "jx": 1.536628245883072e+17,
     "jy": 0.0,
     "jz": 4.129776951264712e+17
   },
   "plasma_e": {
-    "particle_cpu": 0.0,
-    "particle_id": 1653014286.0,
-    "particle_momentum_x": 1.102408072879855e-18,
+    "particle_cpu": 30217.0,
+    "particle_id": 1048674286.0,
+    "particle_momentum_x": 1.10240793316972e-18,
     "particle_momentum_y": 0.0,
-    "particle_momentum_z": 1.4306919600099368e-18,
-    "particle_position_x": 0.23607785290428884,
+    "particle_momentum_z": 1.430691945336632e-18,
+    "particle_position_x": 0.23607785290428887,
     "particle_position_y": 0.290297172085528,
     "particle_weight": 5532897949218750.0
   },
   "plasma_p": {
-    "particle_cpu": 0.0,
-    "particle_id": 1695657024.0,
+    "particle_cpu": 31872.0,
+    "particle_id": 1058217024.0,
     "particle_momentum_x": 1.8564730642732005e-18,
     "particle_momentum_y": 0.0,
-    "particle_momentum_z": 2.4167645961331673e-18,
+    "particle_momentum_z": 2.416764596133168e-18,
     "particle_position_x": 0.23904668587287342,
     "particle_position_y": 0.31004658592211964,
     "particle_weight": 5835937500000001.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 = 60fe729fe2ba65ebffc88c0af18743c254d3992c
+branch = 9373709e34b23add981551d5446bc4810fd3b688
 
 [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 = 60fe729fe2ba65ebffc88c0af18743c254d3992c
+branch = 9373709e34b23add981551d5446bc4810fd3b688
 
 [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 "60fe729fe2ba65ebffc88c0af18743c254d3992c"
+set(WarpX_amrex_branch "9373709e34b23add981551d5446bc4810fd3b688"
     CACHE STRING
     "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
 
diff --git a/run_test.sh b/run_test.sh
@@ -66,7 +66,7 @@ python3 -m pip install --upgrade -r warpx/Regression/requirements.txt
 
 # Clone PICSAR, AMReX and warpx-data
 git clone https://github.com/AMReX-Codes/amrex.git
-cd amrex && git checkout --detach 60fe729fe2ba65ebffc88c0af18743c254d3992c && cd -
+cd amrex && git checkout --detach 9373709e34b23add981551d5446bc4810fd3b688 && cd -
 # Use QED brach for QED tests
 git clone https://github.com/ECP-WarpX/picsar.git
 cd picsar && git checkout --detach 7b5449f92a4b30a095cc4a67f0a8b1fc69680e15 && cd -
