AMReX/PICSAR: Weekly Update (#3822)

* AMReX: Weekly Update * AMReX: Include Fix Roundoff Domain 3247 * Reset Benchmarks * AMReX: Include PR 3248 * Update Checksums
ECP-WarpX · Apr 17, 2023 · 742af75 · 742af75
1 parent 8b26728
commit 742af75
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 64 deletions.
diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml
@@ -110,7 +110,7 @@ jobs:
         which nvcc || echo "nvcc not in PATH!"
 
         git clone https://github.com/AMReX-Codes/amrex.git ../amrex
-        cd ../amrex && git checkout --detach 23.04 && cd -
+        cd ../amrex && git checkout --detach 15038d466c05fc607a0dd6ad0c192f8ed025281a && cd -
         make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 2
 
   build_nvhpc21-11-nvcc:

diff --git a/Regression/Checksum/benchmarks_json/background_mcc_dp_psp.json b/Regression/Checksum/benchmarks_json/background_mcc_dp_psp.json
@@ -1,22 +1,22 @@
 {
   "electrons": {
-    "particle_momentum_x": 1.011437781822072e-18,
-    "particle_momentum_y": 2.818489864650941e-19,
-    "particle_momentum_z": 2.810005821001351e-19,
-    "particle_position_x": 17134.12344940333,
-    "particle_position_y": 935.6698625905589,
+    "particle_momentum_x": 1.0114377816709915e-18,
+    "particle_momentum_y": 2.818489864690527e-19,
+    "particle_momentum_z": 2.8100058425346876e-19,
+    "particle_position_x": 17134.123449898325,
+    "particle_position_y": 935.6698666088197,
     "particle_weight": 61112621534.71875
   },
   "he_ions": {
-    "particle_momentum_x": 2.882592879986621e-18,
-    "particle_momentum_y": 2.196020774944084e-18,
-    "particle_momentum_z": 2.198234141518127e-18,
-    "particle_position_x": 17605.83295255798,
-    "particle_position_y": 1099.98051778083,
+    "particle_momentum_x": 2.8825928801339863e-18,
+    "particle_momentum_y": 2.1960207749405925e-18,
+    "particle_momentum_z": 2.1982341417154103e-18,
+    "particle_position_x": 17605.832952560857,
+    "particle_position_y": 1099.9805176648345,
     "particle_weight": 71973184795.40625
   },
   "lev=0": {
-    "rho_electrons": 0.03558546796458158,
-    "rho_he_ions": 0.04176038296312015
+    "rho_electrons": 0.03558546795888026,
+    "rho_he_ions": 0.04176038296311556
   }
-}
+}
diff --git a/Regression/Checksum/benchmarks_json/hard_edged_quadrupoles.json b/Regression/Checksum/benchmarks_json/hard_edged_quadrupoles.json
@@ -1,22 +1,22 @@
 {
   "electron": {
-    "particle_momentum_x": 2.0819392991319207e-25,
-    "particle_momentum_y": 6.188354365791133e-34,
-    "particle_momentum_z": 2.7309245307290386e-23,
-    "particle_position_x": 0.03492328774658799,
-    "particle_position_y": 2.336103222222039e-11,
-    "particle_position_z": 1.4915217664612073,
+    "particle_momentum_x": 2.081939298256737e-25,
+    "particle_momentum_y": 6.1883543638832e-34,
+    "particle_momentum_z": 2.730924530728755e-23,
+    "particle_position_x": 0.03492328774453408,
+    "particle_position_y": 2.336103219889021e-11,
+    "particle_position_z": 1.4915217664609877,
     "particle_weight": 1.0
   },
   "lev=0": {
     "Bx": 0.0,
     "By": 0.0,
     "Bz": 0.0,
-    "Ex": 9.882421125782868e-06,
-    "Ey": 1.044026102498192e-05,
-    "Ez": 1.00373969855644e-05,
+    "Ex": 9.882421146541765e-06,
+    "Ey": 1.044026104671521e-05,
+    "Ez": 1.003739697325251e-05,
     "jx": 0.0,
     "jy": 0.0,
     "jz": 0.0
   }
-}
+}
diff --git a/Regression/Checksum/benchmarks_json/pml_psatd_dive_divb_cleaning.json b/Regression/Checksum/benchmarks_json/pml_psatd_dive_divb_cleaning.json
@@ -1,11 +1,11 @@
 {
   "lev=0": {
-    "Bx": 1.4820063339458393e-07,
-    "By": 1.4820515850615877e-07,
-    "Bz": 1.495470407235984e-07,
-    "Ex": 11.789793389856982,
-    "Ey": 11.786884764477099,
-    "Ez": 11.770110814468563,
-    "rho": 4.903696256562049e-05
+    "Bx": 1.240175732139287e-06,
+    "By": 1.2193087760500872e-06,
+    "Bz": 1.2294021258059171e-06,
+    "Ex": 614.260964622694,
+    "Ey": 622.4773198394323,
+    "Ez": 613.5902829786862,
+    "rho": 4.903696525896805e-05
   }
-}
+}
diff --git a/Regression/Checksum/benchmarks_json/reduced_diags_single_precision.json b/Regression/Checksum/benchmarks_json/reduced_diags_single_precision.json
@@ -1,43 +1,43 @@
 {
   "electrons": {
-    "particle_momentum_x": 2.441720869016668e-19,
-    "particle_momentum_y": 2.456481313629533e-19,
-    "particle_momentum_z": 2.434157770814882e-19,
-    "particle_position_x": 16379.247624470314,
-    "particle_position_y": 16382.836430045034,
-    "particle_position_z": 16382.83386090216,
+    "particle_momentum_x": 2.4417210113801336e-19,
+    "particle_momentum_y": 2.4564851493412593e-19,
+    "particle_momentum_z": 2.4341594564719795e-19,
+    "particle_position_x": 16379.247754118871,
+    "particle_position_y": 16382.836191849463,
+    "particle_position_z": 16382.833818260406,
     "particle_weight": 800000003014656.0
   },
   "lev=0": {
-    "Bx": 0.08424077006868202,
-    "By": 0.08475162318143958,
-    "Bz": 0.0879638695257583,
-    "Ex": 106872406.23206902,
-    "Ey": 107805796.05268478,
-    "Ez": 107783300.6896553,
-    "jx": 728221.4094335437,
-    "jy": 736401.7841227949,
-    "jz": 734813.4235675633,
-    "rho": 0.02775090560003779,
-    "rho_electrons": 0.5250012280648662,
-    "rho_protons": 0.5250012270062143
+    "Bx": 0.084241235376183,
+    "By": 0.084751961809296,
+    "Bz": 0.08796431812220362,
+    "Ex": 106872513.1172905,
+    "Ey": 107805221.85876846,
+    "Ez": 107782819.9927826,
+    "jx": 728219.9166720062,
+    "jy": 736402.6373479366,
+    "jz": 734813.3440347463,
+    "rho": 0.0277508111536644,
+    "rho_electrons": 0.52500122784204,
+    "rho_protons": 0.5250012273481843
   },
   "photons": {
     "particle_momentum_x": 1.428291590249666e-18,
     "particle_momentum_y": 1.4222174024686332e-18,
     "particle_momentum_z": 1.4246585206989104e-18,
-    "particle_position_x": 16376.414787647314,
-    "particle_position_y": 16409.71380140478,
-    "particle_position_z": 16378.407592070173,
+    "particle_position_x": 16376.414786216803,
+    "particle_position_y": 16409.713810583897,
+    "particle_position_z": 16378.407601130079,
     "particle_weight": 800000003014656.0
   },
   "protons": {
-    "particle_momentum_x": 1.4104804792534928e-19,
-    "particle_momentum_y": 1.4120362404591128e-19,
-    "particle_momentum_z": 1.3903172753601875e-19,
-    "particle_position_x": 16383.951009282842,
-    "particle_position_y": 16383.991230854765,
-    "particle_position_z": 16384.03309576772,
+    "particle_momentum_x": 1.4104799077996007e-19,
+    "particle_momentum_y": 1.4120357666424943e-19,
+    "particle_momentum_z": 1.3903168923764969e-19,
+    "particle_position_x": 16383.951009266078,
+    "particle_position_y": 16383.991230053827,
+    "particle_position_z": 16384.033095981926,
     "particle_weight": 800000003014656.0
   }
-}
+}
diff --git a/Regression/WarpX-GPU-tests.ini b/Regression/WarpX-GPU-tests.ini
@@ -60,7 +60,7 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more
 
 [AMReX]
 dir = /home/regtester/git/amrex/
-branch = 23.04
+branch = 15038d466c05fc607a0dd6ad0c192f8ed025281a
 
 [source]
 dir = /home/regtester/git/WarpX

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

diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
@@ -240,7 +240,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 "23.04"
+set(WarpX_amrex_branch "15038d466c05fc607a0dd6ad0c192f8ed025281a"
     CACHE STRING
     "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
 

diff --git a/run_test.sh b/run_test.sh
@@ -71,7 +71,7 @@ python3 -m pip install --upgrade -r warpx/Regression/requirements.txt
 
 # Clone AMReX and warpx-data
 git clone https://github.com/AMReX-Codes/amrex.git
-cd amrex && git checkout --detach 23.04 && cd -
+cd amrex && git checkout --detach 15038d466c05fc607a0dd6ad0c192f8ed025281a && cd -
 # warpx-data contains various required data sets
 git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git