diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index aa0daa2a718..93a4b0d8505 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -127,7 +127,7 @@ jobs: which nvcc || echo "nvcc not in PATH!" git clone https://github.com/AMReX-Codes/amrex.git ../amrex - cd ../amrex && git checkout --detach 25.01 && cd - + cd ../amrex && git checkout --detach 041f225dc5c97a5e3baf2559046ceabffd75f002 && cd - make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_FFT=TRUE USE_CCACHE=TRUE -j 4 ccache -s diff --git a/Examples/Tests/flux_injection/analysis_flux_injection_from_eb.py b/Examples/Tests/flux_injection/analysis_flux_injection_from_eb.py index d87da85ddfc..96488fd7e71 100755 --- a/Examples/Tests/flux_injection/analysis_flux_injection_from_eb.py +++ b/Examples/Tests/flux_injection/analysis_flux_injection_from_eb.py @@ -79,7 +79,7 @@ def compare_gaussian(u, w, u_th, label=""): w_th = Ntot * gaussian_dist(u_hist, u_th) plt.plot(u_hist, w_hist, label=label + ": simulation") plt.plot(u_hist, w_th, "--", label=label + ": theory") - assert np.allclose(w_hist, w_th, atol=0.08 * w_th.max()) + assert np.allclose(w_hist, w_th, atol=0.07 * w_th.max()) def compare_gaussian_flux(u, w, u_th, u_m, label=""): diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 88df1f82fe8..5f0423a5cde 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -271,7 +271,7 @@ macro(find_amrex) endif() set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PARTICLE_PRECISION}) - find_package(AMReX 25.01 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_CATALYST} ${COMPONENT_DIMS} ${COMPONENT_EB} ${COMPONENT_FFT} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} LSOLVERS) + find_package(AMReX 041f225dc5c97a5e3baf2559046ceabffd75f002 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_CATALYST} ${COMPONENT_DIMS} ${COMPONENT_EB} ${COMPONENT_FFT} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} LSOLVERS) # note: TINYP skipped because user-configured and optional # AMReX CMake helper scripts @@ -294,7 +294,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 "25.01" +set(WarpX_amrex_branch "041f225dc5c97a5e3baf2559046ceabffd75f002" CACHE STRING "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")