Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AMReX/PICSAR: Weekly Update #3192

Merged
merged 3 commits into from
Jun 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
24 changes: 12 additions & 12 deletions Regression/Checksum/benchmarks_json/background_mcc_dp_psp.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,48 @@
"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,
"particle_id": 1342193664.0,
"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
}
}
2 changes: 1 addition & 1 deletion Regression/WarpX-GPU-tests.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Regression/WarpX-tests.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies/AMReX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)")

Expand Down
2 changes: 1 addition & 1 deletion run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down