Skip to content

Commit

Permalink
AMReX: 21.03 (#1749)
Browse files Browse the repository at this point in the history
Update the internal references & dependencies to AMReX 21.03.

Also update PICSAR (no new commits).
  • Loading branch information
ax3l authored Mar 1, 2021
1 parent faf15f0 commit 0fb3089
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions cmake/dependencies/AMReX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ macro(find_amrex)
endif()
set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PRECISION})

find_package(AMReX 21.02 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} TINYP LSOLVERS)
find_package(AMReX 21.03 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} TINYP LSOLVERS)
message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
endif()
endmacro()
Expand All @@ -185,7 +185,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 "47389357d5de37d84be69d9b06a294e64cb2a96b"
set(WarpX_amrex_branch "21.03"
CACHE STRING
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")

Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies/PICSAR.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function(find_picsar)
#message(STATUS "PICSAR: Using version '${PICSAR_VERSION}'")
else()
# not supported by PICSAR (yet)
#find_package(PICSAR 21.02 CONFIG REQUIRED QED)
#find_package(PICSAR 21.03 CONFIG REQUIRED QED)
#message(STATUS "PICSAR: Found version '${PICSAR_VERSION}'")
message(FATAL_ERROR "PICSAR: Cannot be used as externally installed "
"library yet. "
Expand Down
2 changes: 1 addition & 1 deletion run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ echo "cd $PWD"

# Clone PICSAR and AMReX
git clone https://github.com/AMReX-Codes/amrex.git
cd amrex && git checkout 47389357d5de37d84be69d9b06a294e64cb2a96b && cd -
cd amrex && git checkout 21.03 && cd -
# Use QED brach for QED tests
git clone https://github.com/ECP-WarpX/picsar.git
cd picsar && git checkout b35f07243c51ac35d47857fe36f0aafb6b517955 && cd -
Expand Down

0 comments on commit 0fb3089

Please sign in to comment.