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.json24
-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
7 files changed, 44 insertions, 44 deletions
diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml
index e45b7fe0b..a461f93fb 100644
--- a/.github/workflows/cuda.yml
+++ b/.github/workflows/cuda.yml
@@ -106,7 +106,7 @@ jobs:
which nvcc || echo "nvcc not in PATH!"
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
- cd amrex && git checkout --detach 833e61c076a708ae1680eab68713a2d40637085d && cd -
+ cd amrex && git checkout --detach 2d931f63cb4d611d0d23d694726889647f8a482d && 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 178da8773..0634e0e0f 100644
--- a/Regression/Checksum/benchmarks_json/background_mcc_dp_psp.json
+++ b/Regression/Checksum/benchmarks_json/background_mcc_dp_psp.json
@@ -2,25 +2,25 @@
"electrons": {
"particle_cpu": 187364.0,
"particle_id": 58189925041.0,
- "particle_momentum_x": 1.0142073324867775e-18,
- "particle_momentum_y": 2.8074880500457487e-19,
- "particle_momentum_z": 2.8072040351200707e-19,
- "particle_position_x": 17127.57710513193,
- "particle_position_y": 934.15559185522,
+ "particle_momentum_x": 1.0142105603224958e-18,
+ "particle_momentum_y": 2.807472960358126e-19,
+ "particle_momentum_z": 2.8071734178017747e-19,
+ "particle_position_x": 17127.57692345325,
+ "particle_position_y": 934.1972260465152,
"particle_weight": 61104812910.5625
},
"he_ions": {
"particle_cpu": 262773.0,
"particle_id": 206705874175.0,
- "particle_momentum_x": 2.8868457801545578e-18,
- "particle_momentum_y": 2.1945667915866175e-18,
- "particle_momentum_z": 2.198517173661166e-18,
- "particle_position_x": 17603.911389929126,
- "particle_position_y": 1099.8456568409076,
+ "particle_momentum_x": 2.8868457789528703e-18,
+ "particle_momentum_y": 2.194566791589635e-18,
+ "particle_momentum_z": 2.198517163587886e-18,
+ "particle_position_x": 17603.911389754507,
+ "particle_position_y": 1099.849844215455,
"particle_weight": 71963869243.78125
},
"lev=0": {
- "rho_electrons": 0.03565690166086105,
- "rho_he_ions": 0.04191840475861025
+ "rho_electrons": 0.03565690159985689,
+ "rho_he_ions": 0.041918404760325365
}
} \ 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 7db6de078..96f52a173 100644
--- a/Regression/Checksum/benchmarks_json/reduced_diags_single_precision.json
+++ b/Regression/Checksum/benchmarks_json/reduced_diags_single_precision.json
@@ -2,27 +2,27 @@
"electrons": {
"particle_cpu": 16384.0,
"particle_id": 268451840.0,
- "particle_momentum_x": 2.4417125927603126e-19,
- "particle_momentum_y": 2.456468598610582e-19,
- "particle_momentum_z": 2.434153074340732e-19,
- "particle_position_x": 16379.244991465632,
- "particle_position_y": 16382.841014201738,
- "particle_position_z": 16382.837773497944,
+ "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_weight": 800000003014656.0
},
"lev=0": {
- "Bx": 0.08422020691772758,
- "By": 0.08474171379286588,
- "Bz": 0.08796084985731767,
- "Ex": 106868316.96530533,
- "Ey": 107811746.10470963,
- "Ez": 107784295.0916481,
- "jx": 728230.8080589324,
- "jy": 736385.405523628,
- "jz": 734814.8562675565,
- "rho": 0.02775110017056015,
- "rho_electrons": 0.5250012277265341,
- "rho_protons": 0.5250012273154425
+ "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
},
"photons": {
"particle_cpu": 16384.0,
@@ -30,20 +30,20 @@
"particle_momentum_x": 1.428291590249666e-18,
"particle_momentum_y": 1.4222174024686332e-18,
"particle_momentum_z": 1.4246585206989104e-18,
- "particle_position_x": 16376.414870020933,
- "particle_position_y": 16409.713763734646,
- "particle_position_z": 16378.407626760076,
+ "particle_position_x": 16376.414799568243,
+ "particle_position_y": 16409.71378429825,
+ "particle_position_z": 16378.407592666219,
"particle_weight": 800000003014656.0
},
"protons": {
"particle_cpu": 16384.0,
"particle_id": 805322752.0,
- "particle_momentum_x": 1.4104878866079966e-19,
- "particle_momentum_y": 1.4120310230664703e-19,
- "particle_momentum_z": 1.3903061583932131e-19,
- "particle_position_x": 16383.951016088948,
- "particle_position_y": 16383.991241348907,
- "particle_position_z": 16384.03310307674,
+ "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_weight": 800000003014656.0
}
} \ No newline at end of file
diff --git a/Regression/WarpX-GPU-tests.ini b/Regression/WarpX-GPU-tests.ini
index 9af1b2d94..16cd7e46d 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 = 833e61c076a708ae1680eab68713a2d40637085d
+branch = 2d931f63cb4d611d0d23d694726889647f8a482d
[source]
dir = /home/regtester/git/WarpX
diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini
index 457294fc0..cd5c748c5 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 = 833e61c076a708ae1680eab68713a2d40637085d
+branch = 2d931f63cb4d611d0d23d694726889647f8a482d
[source]
dir = /home/regtester/AMReX_RegTesting/warpx
diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
index ca8b3fd97..feb6c8ace 100644
--- a/cmake/dependencies/AMReX.cmake
+++ b/cmake/dependencies/AMReX.cmake
@@ -241,7 +241,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 "833e61c076a708ae1680eab68713a2d40637085d"
+set(WarpX_amrex_branch "2d931f63cb4d611d0d23d694726889647f8a482d"
CACHE STRING
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
diff --git a/run_test.sh b/run_test.sh
index e12abfe20..0a0a05361 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 833e61c076a708ae1680eab68713a2d40637085d && cd -
+cd amrex && git checkout --detach 2d931f63cb4d611d0d23d694726889647f8a482d && 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-13 14:17:37 +0000