aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/cuda.yml2
-rw-r--r--Regression/Checksum/benchmarks_json/background_mcc_dp_psp.json26
-rw-r--r--Regression/Checksum/benchmarks_json/pml_psatd_dive_divb_cleaning.json14
-rw-r--r--Regression/Checksum/benchmarks_json/reduced_diags_single_precision.json54
-rw-r--r--Regression/WarpX-GPU-tests.ini2
-rw-r--r--Regression/WarpX-tests.ini2
-rw-r--r--cmake/dependencies/AMReX.cmake2
-rwxr-xr-xrun_test.sh2
8 files changed, 52 insertions, 52 deletions
diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml
index 9463b30a8..3902034c6 100644
--- 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 9aa23c202a13eee489a06030b9aeda6b89856944 && cd -
+ cd amrex && git checkout --detach b84d7c069cef7470f195b250926ca0e84ec46fb2 && 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
index 6029c1949..3c54db63b 100644
--- 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.011437782317433e-18,
- "particle_momentum_y": 2.818489864433302e-19,
- "particle_momentum_z": 2.810005819942864e-19,
- "particle_position_x": 17134.12344905036,
- "particle_position_y": 935.6698553080840,
+ "particle_momentum_x": 1.0114377818220718e-18,
+ "particle_momentum_y": 2.8184898646509405e-19,
+ "particle_momentum_z": 2.810005821001351e-19,
+ "particle_position_x": 17134.123449403327,
+ "particle_position_y": 935.6698625905589,
"particle_weight": 61112621534.71875
},
"he_ions": {
- "particle_momentum_x": 2.882592880031919e-18,
- "particle_momentum_y": 2.1960207748059422e-18,
- "particle_momentum_z": 2.1982341415215343e-18,
- "particle_position_x": 17605.83295166959,
- "particle_position_y": 1099.9805173814,
+ "particle_momentum_x": 2.8825928799866215e-18,
+ "particle_momentum_y": 2.1960207749440838e-18,
+ "particle_momentum_z": 2.198234141518127e-18,
+ "particle_position_x": 17605.832952557976,
+ "particle_position_y": 1099.9805177808296,
"particle_weight": 71973184795.40625
},
"lev=0": {
- "rho_electrons": 0.03566096818084508,
- "rho_he_ions": 0.04192385953761138
+ "rho_electrons": 0.03566096817628402,
+ "rho_he_ions": 0.04192385953761396
}
-}
+} \ No newline at end of file
diff --git a/Regression/Checksum/benchmarks_json/pml_psatd_dive_divb_cleaning.json b/Regression/Checksum/benchmarks_json/pml_psatd_dive_divb_cleaning.json
index cfae22ad7..12f562180 100644
--- 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.2401714071102193e-06,
- "By": 1.21931343936974e-06,
- "Bz": 1.2293954248570514e-06,
- "Ex": 614.2618449422512,
- "Ey": 622.4788672892859,
- "Ez": 613.5910967525642,
- "rho": 4.90369639123331e-05
+ "Bx": 1.482006352778953e-07,
+ "By": 1.48205157883426e-07,
+ "Bz": 1.4954704195856524e-07,
+ "Ex": 11.789793626679334,
+ "Ey": 11.78688532983594,
+ "Ez": 11.770112090435557,
+ "rho": 4.903696256562049e-05
}
} \ No newline at end of file
diff --git a/Regression/Checksum/benchmarks_json/reduced_diags_single_precision.json b/Regression/Checksum/benchmarks_json/reduced_diags_single_precision.json
index 670fb8b44..b2162221a 100644
--- 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.4417212503278005e-19,
- "particle_momentum_y": 2.4564848534619294e-19,
- "particle_momentum_z": 2.434157491249898e-19,
- "particle_position_x": 16379.247699920481,
- "particle_position_y": 16382.836164549284,
- "particle_position_z": 16382.833915042822,
+ "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_weight": 800000003014656.0
},
"lev=0": {
- "Bx": 0.08424062892077444,
- "By": 0.08475186723996586,
- "Bz": 0.08796440505066272,
- "Ex": 106872540.64410019,
- "Ey": 107805501.93848419,
- "Ez": 107783078.61432838,
- "jx": 728220.4602749646,
- "jy": 736403.7514596283,
- "jz": 734813.9692403525,
- "rho": 0.027750860941553768,
- "rho_electrons": 0.525001227832945,
- "rho_protons": 0.5250012272590538
+ "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
},
"photons": {
"particle_momentum_x": 1.428291590249666e-18,
"particle_momentum_y": 1.4222174024686332e-18,
"particle_momentum_z": 1.4246585206989104e-18,
- "particle_position_x": 16376.414799568243,
- "particle_position_y": 16409.71378429825,
- "particle_position_z": 16378.407592666219,
+ "particle_position_x": 16376.414787647314,
+ "particle_position_y": 16409.71380140478,
+ "particle_position_z": 16378.407592070173,
"particle_weight": 800000003014656.0
},
"protons": {
- "particle_momentum_x": 1.4104802628011656e-19,
- "particle_momentum_y": 1.4120349291716893e-19,
- "particle_momentum_z": 1.3903171427087353e-19,
- "particle_position_x": 16383.951009619981,
- "particle_position_y": 16383.99123002775,
- "particle_position_z": 16384.033095447347,
+ "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_weight": 800000003014656.0
}
} \ No newline at end of file
diff --git a/Regression/WarpX-GPU-tests.ini b/Regression/WarpX-GPU-tests.ini
index d2fff7106..e16e49a78 100644
--- 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 = 9aa23c202a13eee489a06030b9aeda6b89856944
+branch = b84d7c069cef7470f195b250926ca0e84ec46fb2
[source]
dir = /home/regtester/git/WarpX
diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini
index 9d1ae29a3..8b25935a9 100644
--- 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 = 9aa23c202a13eee489a06030b9aeda6b89856944
+branch = b84d7c069cef7470f195b250926ca0e84ec46fb2
[source]
dir = /home/regtester/AMReX_RegTesting/warpx
diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
index 2db3d33e8..8598c48b4 100644
--- a/cmake/dependencies/AMReX.cmake
+++ b/cmake/dependencies/AMReX.cmake
@@ -235,7 +235,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 "9aa23c202a13eee489a06030b9aeda6b89856944"
+set(WarpX_amrex_branch "b84d7c069cef7470f195b250926ca0e84ec46fb2"
CACHE STRING
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
diff --git a/run_test.sh b/run_test.sh
index 5dc4713a8..ae5411469 100755
--- 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 9aa23c202a13eee489a06030b9aeda6b89856944 && cd -
+cd amrex && git checkout --detach b84d7c069cef7470f195b250926ca0e84ec46fb2 && cd -
# warpx-data contains various required data sets
git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-19 02:19:44 +0000