From a3561eedf9fc0ac58c067b95258fb9b69e5cf07a Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 20 Jan 2022 17:15:55 -0800 Subject: [PATCH] AMReX: Update latest (#2752) --- Regression/WarpX-GPU-tests.ini | 2 +- Regression/WarpX-tests.ini | 2 +- cmake/dependencies/AMReX.cmake | 2 +- run_test.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Regression/WarpX-GPU-tests.ini b/Regression/WarpX-GPU-tests.ini index c238e06a7a7..549898b07ab 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 = 812836f08a758ef6f65caf7eea477bfc6423e72b +branch = e3b1468b8f16d11eebf4b10cca32829c78fb5d35 [source] dir = /home/regtester/git/WarpX diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index c23e48ac3fa..81a74825d0a 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 = 812836f08a758ef6f65caf7eea477bfc6423e72b +branch = e3b1468b8f16d11eebf4b10cca32829c78fb5d35 [source] dir = /home/regtester/AMReX_RegTesting/warpx diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index d28a8718038..0e17ee5d07d 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -237,7 +237,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 "812836f08a758ef6f65caf7eea477bfc6423e72b" +set(WarpX_amrex_branch "e3b1468b8f16d11eebf4b10cca32829c78fb5d35" CACHE STRING "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)") diff --git a/run_test.sh b/run_test.sh index 42719f64ea8..29fd0d2d97f 100755 --- a/run_test.sh +++ b/run_test.sh @@ -70,7 +70,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 812836f08a758ef6f65caf7eea477bfc6423e72b && cd - +cd amrex && git checkout --detach e3b1468b8f16d11eebf4b10cca32829c78fb5d35 && cd - # warpx-data contains various required data sets git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git