From d41b6fbf767c36bf9e733d5af708deff7061975c Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Tue, 28 Apr 2026 09:10:22 -0700 Subject: [PATCH 1/5] Update to C++20 --- .../workflows/dependencies/dependencies.sh | 15 +++--- .../dependencies/dependencies_clang6.sh | 19 -------- .../dependencies/dependencies_dpcpp.sh | 39 +++++++++++++--- .../dependencies/dependencies_gcc10.sh | 22 --------- .../dependencies/dependencies_nofortran.sh | 25 ---------- .../dependencies/dependencies_nvcc.sh | 2 +- .../workflows/id_most_recent_comment_on_PR.sh | 46 ------------------- .github/workflows/linux.yml | 45 +++++++----------- .../workflows/pr-comment-trigger-gitlab.yml | 33 ------------- .github/workflows/windows.yml | 4 +- ExampleCodes/Amr/Wave_AmrLevel/GNUmakefile | 2 - ExampleCodes/CMakeLists.txt | 2 +- 12 files changed, 61 insertions(+), 193 deletions(-) delete mode 100755 .github/workflows/dependencies/dependencies_clang6.sh delete mode 100755 .github/workflows/dependencies/dependencies_gcc10.sh delete mode 100755 .github/workflows/dependencies/dependencies_nofortran.sh delete mode 100755 .github/workflows/id_most_recent_comment_on_PR.sh delete mode 100644 .github/workflows/pr-comment-trigger-gitlab.yml diff --git a/.github/workflows/dependencies/dependencies.sh b/.github/workflows/dependencies/dependencies.sh index 35825b96..c7cde496 100755 --- a/.github/workflows/dependencies/dependencies.sh +++ b/.github/workflows/dependencies/dependencies.sh @@ -1,21 +1,22 @@ #!/usr/bin/env bash # -# Copyright 2020 The AMReX Community +# Copyright 2020-2022 The AMReX Community # # License: BSD-3-Clause-LBNL # Authors: Axel Huebl set -eu -o pipefail +# `man apt.conf`: +# Number of retries to perform. If this is non-zero APT will retry +# failed files the given number of times. +echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries + sudo apt-get update sudo apt-get install -y --no-install-recommends\ build-essential \ + libfftw3-dev \ g++ gfortran \ libopenmpi-dev \ - openmpi-bin \ - python3 \ - python3-pip - -python3 -m pip install -U pip -python3 -m pip install -U build packaging setuptools wheel + openmpi-bin diff --git a/.github/workflows/dependencies/dependencies_clang6.sh b/.github/workflows/dependencies/dependencies_clang6.sh deleted file mode 100755 index ad18689d..00000000 --- a/.github/workflows/dependencies/dependencies_clang6.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2020 The AMReX Community -# -# License: BSD-3-Clause-LBNL -# Authors: Axel Huebl - -set -eu -o pipefail - -sudo apt-get update - -sudo apt-get install -y \ - build-essential \ - clang gfortran \ - python3 \ - python3-pip - -python3 -m pip install -U pip -python3 -m pip install -U build packaging setuptools wheel diff --git a/.github/workflows/dependencies/dependencies_dpcpp.sh b/.github/workflows/dependencies/dependencies_dpcpp.sh index 5ce9f469..aad5ebb0 100755 --- a/.github/workflows/dependencies/dependencies_dpcpp.sh +++ b/.github/workflows/dependencies/dependencies_dpcpp.sh @@ -7,6 +7,11 @@ set -eu -o pipefail +# `man apt.conf`: +# Number of retries to perform. If this is non-zero APT will retry +# failed files the given number of times. +echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries + # Ref.: https://github.com/rscohn2/oneapi-ci # intel-basekit intel-hpckit are too large in size @@ -19,9 +24,31 @@ echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt sudo apt-get update -sudo apt-get install -y --no-install-recommends \ - build-essential \ - intel-oneapi-compiler-dpcpp-cpp intel-oneapi-mkl-devel \ - g++ gfortran \ - libopenmpi-dev \ - openmpi-bin +# try apt install up to five times, to avoid connection splits +status=1 +for itry in {1..5} +do + sudo apt-get install -y --no-install-recommends \ + build-essential \ + intel-oneapi-compiler-dpcpp-cpp \ + intel-oneapi-compiler-fortran \ + intel-oneapi-mkl-devel \ + intel-oneapi-mpi-devel \ + && { sudo apt-get clean; status=0; break; } \ + || { sleep 10; } +done +if [[ ${status} -ne 0 ]]; then exit 1; fi + +source /etc/os-release +ver="${VERSION_ID//\"/}" +if [ "$ver" == "22.04" ]; then exit 0; fi + +status=1 +for itry in {1..5} +do + sudo apt-get install -y --no-install-recommends \ + intel-ocloc \ + libigc-dev \ + && { sudo apt-get clean; status=0; break; } \ + || { sleep 10; } +done diff --git a/.github/workflows/dependencies/dependencies_gcc10.sh b/.github/workflows/dependencies/dependencies_gcc10.sh deleted file mode 100755 index 3ea17c85..00000000 --- a/.github/workflows/dependencies/dependencies_gcc10.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2020 The AMReX Community -# -# License: BSD-3-Clause-LBNL -# Authors: Axel Huebl - -set -eu -o pipefail - -sudo add-apt-repository ppa:ubuntu-toolchain-r/test -sudo apt-get update - -sudo apt-get install -y --no-install-recommends \ - build-essential \ - g++-10 gfortran-10 \ - libopenmpi-dev \ - openmpi-bin \ - python3 \ - python3-pip - -python3 -m pip install -U pip -python3 -m pip install -U build packaging setuptools wheel diff --git a/.github/workflows/dependencies/dependencies_nofortran.sh b/.github/workflows/dependencies/dependencies_nofortran.sh deleted file mode 100755 index 65eb13f9..00000000 --- a/.github/workflows/dependencies/dependencies_nofortran.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2020 Axel Huebl -# -# License: BSD-3-Clause-LBNL - -# search recursive inside a folder if a file contains tabs -# -# @result 0 if no files are found, else 1 -# - -set -eu -o pipefail - -sudo apt-get update - -sudo apt-get install -y --no-install-recommends\ - build-essential \ - g++ \ - libopenmpi-dev \ - openmpi-bin \ - python3 \ - python3-pip - -python3 -m pip install -U pip -python3 -m pip install -U build packaging setuptools wheel diff --git a/.github/workflows/dependencies/dependencies_nvcc.sh b/.github/workflows/dependencies/dependencies_nvcc.sh index 7c7d75f2..bdad2e91 100755 --- a/.github/workflows/dependencies/dependencies_nvcc.sh +++ b/.github/workflows/dependencies/dependencies_nvcc.sh @@ -25,7 +25,7 @@ sudo apt-get install -y \ wget VERSION_DOTTED=${1-12.0} && VERSION_DASHED=$(sed 's/\./-/' <<< $VERSION_DOTTED) -curl -O https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-keyring_1.0-1_all.deb +curl -O https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.0-1_all.deb sudo dpkg -i cuda-keyring_1.0-1_all.deb sudo apt-get update sudo apt-get install -y \ diff --git a/.github/workflows/id_most_recent_comment_on_PR.sh b/.github/workflows/id_most_recent_comment_on_PR.sh deleted file mode 100755 index 464d2029..00000000 --- a/.github/workflows/id_most_recent_comment_on_PR.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -GITHUB_EVENT_API_URL="https://api.github.com/repos/AMReX-Codes/amrex-tutorials/events" -GITHUB_PR_API="https://api.github.com/repos/AMReX-Codes/amrex-tutorials/pulls" -MIRROR_TRIGGER_URL="https://software.nersc.gov/api/v4/projects/307/trigger/pipeline" - - -set -eu -o pipefail - -sudo apt-get update - -sudo apt-get install -y --no-install-recommends\ - jq \ - curl - - -# indetify the PR associated with second most recent comment - -PR_ID=$(curl -H "Accept: application/vnd.github.v3+json" ${GITHUB_EVENT_API_URL} | jq .[1].payload.issue.number) - - -# identify forked branch from PR - -CONTENT=$(curl -H "Accept: application/vnd.github.v3+json" ${GITHUB_PR_API}/${PR_ID}) - - -PR_BRANCH=$(jq -r '.head.ref' <<< "${CONTENT}") - -echo PR ID Number: $PR_ID -echo PR Branchname: $PR_BRANCH - -#Trigger GitLab CI, pass variables -# succeeds at command line - -curl -s -X POST\ - -F "token=$1" \ - -F "ref=main" \ - -F "variables[PR_ID]=${PR_ID}" \ - -F "variables[PR_BRANCH]=${PR_BRANCH}" \ - ${MIRROR_TRIGGER_URL} - - - - - - diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 0e31ebcf..3d2109c6 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -6,7 +6,7 @@ jobs: # Build all tutorials tutorials_build: - name: GNU@7.5 C++14 [tutorials] + name: GNU [tutorials] runs-on: ubuntu-24.04 env: {CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wunreachable-code -fno-operator-names"} steps: @@ -35,14 +35,14 @@ jobs: python main.py # Build all tutorials - tutorials_cxx20: - name: GNU@10.3 C++20 OMP [tutorials] + tutorials_omp: + name: GNU OMP [tutorials] runs-on: ubuntu-24.04 env: {CXXFLAGS: "-Werror -Wno-error=deprecated-declarations -Wshadow -Woverloaded-virtual -Wunreachable-code -fno-operator-names"} steps: - uses: actions/checkout@v4 - name: Dependencies - run: .github/workflows/dependencies/dependencies_gcc10.sh + run: .github/workflows/dependencies/dependencies.sh - name: Build & Install run: | cd ExampleCodes @@ -55,11 +55,7 @@ jobs: -DAMReX_FORTRAN=ON \ -DAMReX_FORTRAN_INTERFACES=ON \ -DAMReX_EB=ON \ - -DTUTORIAL_PYTHON=ON \ - -DCMAKE_CXX_STANDARD=20 \ - -DCMAKE_C_COMPILER=$(which gcc-10) \ - -DCMAKE_CXX_COMPILER=$(which g++-10) \ - -DCMAKE_Fortran_COMPILER=$(which mpif90) + -DTUTORIAL_PYTHON=ON cmake --build build -j 2 cmake --build build -j 2 --target pyamrex_pip_install - name: Run Python @@ -70,13 +66,13 @@ jobs: python main.py tutorials_clang: - name: Clang@6.0 C++14 SP Particles DP Mesh Debug [tutorials] + name: Clang SP Particles DP Mesh Debug [tutorials] runs-on: ubuntu-24.04 env: {CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -fno-operator-names"} steps: - uses: actions/checkout@v4 - name: Dependencies - run: .github/workflows/dependencies/dependencies_clang6.sh + run: .github/workflows/dependencies/dependencies_clang.sh - name: Build & Install run: | cd ExampleCodes @@ -92,7 +88,6 @@ jobs: -DAMReX_PRECISION=DOUBLE \ -DAMReX_PARTICLES_PRECISION=SINGLE \ -DTUTORIAL_PYTHON=ON \ - -DCMAKE_CXX_STANDARD=14 \ -DCMAKE_C_COMPILER=$(which clang) \ -DCMAKE_CXX_COMPILER=$(which clang++) \ -DCMAKE_Fortran_COMPILER=$(which gfortran) @@ -107,7 +102,7 @@ jobs: # Build all tutorials w/o MPI tutorials-nonmpi: - name: GNU@7.5 C++14 NOMPI [tutorials] + name: GNU NOMPI [tutorials] runs-on: ubuntu-24.04 env: {CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wunreachable-code -fno-operator-names"} steps: @@ -138,13 +133,13 @@ jobs: # Build all tutorials tutorials-nofortran: - name: GNU@7.5 C++14 w/o Fortran [tutorials] + name: GNU w/o Fortran [tutorials] runs-on: ubuntu-24.04 env: {CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wunreachable-code -fno-operator-names"} steps: - uses: actions/checkout@v4 - name: Dependencies - run: .github/workflows/dependencies/dependencies_nofortran.sh + run: .github/workflows/dependencies/dependencies.sh - name: Build & Install run: | cd ExampleCodes @@ -165,9 +160,9 @@ jobs: cd ../HeatEquation/Source/ python main.py - # Build all tutorials with CUDA 11.0.2 (recent supported) - tutorials-cuda11: - name: CUDA@11.2 GNU@9.3.0 C++17 Release [tutorials] + # Build all tutorials with CUDA + tutorials-cuda: + name: CUDA Release [tutorials] runs-on: ubuntu-24.04 env: {CXXFLAGS: "-fno-operator-names"} steps: @@ -192,8 +187,6 @@ jobs: -DCMAKE_CXX_COMPILER=$(which g++) \ -DCMAKE_CUDA_HOST_COMPILER=$(which g++) \ -DCMAKE_Fortran_COMPILER=$(which gfortran) \ - -DCMAKE_CUDA_STANDARD=17 \ - -DCMAKE_CXX_STANDARD=17 \ -DAMReX_CUDA_ARCH=8.0 \ -DAMReX_CUDA_ERROR_CROSS_EXECUTION_SPACE_CALL=ON \ -DAMReX_CUDA_ERROR_CAPTURE_THIS=ON @@ -201,7 +194,7 @@ jobs: cmake --build build -j 2 tutorials-dpcpp: - name: DPCPP GFortran@7.5 C++17 [tutorials] + name: DPCPP GFortran [tutorials] runs-on: ubuntu-24.04 env: {CXXFLAGS: "-fno-operator-names"} steps: @@ -216,8 +209,6 @@ jobs: cd ExampleCodes cmake -S . -B build \ -DCMAKE_CXX_COMPILER_ID="Clang" \ - -DCMAKE_CXX_COMPILER_VERSION=12.0 \ - -DCMAKE_CXX_STANDARD_COMPUTED_DEFAULT="17" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DAMReX_LINEAR_SOLVERS=ON \ -DAMReX_FORTRAN=ON \ @@ -229,12 +220,9 @@ jobs: -DCMAKE_CXX_COMPILER=$(which icpx) \ -DCMAKE_Fortran_COMPILER=$(which gfortran) cmake --build build --parallel 2 - # note: setting the CXX compiler ID is a work-around for - # the 2021.1 DPC++ release / CMake 3.19.0-3.19.1 - # https://gitlab.kitware.com/cmake/cmake/-/issues/21551#note_869580 tutorials-hip: - name: HIP ROCm GFortran@9.3 C++17 [tutorials] + name: HIP ROCm GFortran [tutorials] runs-on: ubuntu-24.04 # Have to have -Wno-deprecated-declarations due to deprecated atomicAddNoRet # Have to have -Wno-gnu-zero-variadic-macro-arguments to avoid @@ -275,7 +263,6 @@ jobs: -DAMReX_GPU_BACKEND=HIP \ -DAMReX_AMD_ARCH=gfx908 \ -DCMAKE_C_COMPILER=$(which clang) \ - -DCMAKE_CXX_COMPILER=$(which clang++) \ - -DCMAKE_CXX_STANDARD=17 + -DCMAKE_CXX_COMPILER=$(which clang++) cmake --build build_nofortran -j 2 diff --git a/.github/workflows/pr-comment-trigger-gitlab.yml b/.github/workflows/pr-comment-trigger-gitlab.yml deleted file mode 100644 index 5ce29911..00000000 --- a/.github/workflows/pr-comment-trigger-gitlab.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -name: PR Comment Trigger - -on: - issue_comment: - types: - - created - -jobs: - comment-trigger: - runs-on: ubuntu-latest - env: - USER_LIST: ${{ secrets.AUTH_LIST }} - TRIGGER_STRING: 'Do.Tests' - steps: - - name: Initialization Notice - if: ${{ (github.event.comment.body == env.TRIGGER_STRING) && contains( env.USER_LIST, github.event.comment.user.login) }} - uses: actions/github-script@v4 - with: - script: | - github.issues.createComment({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body: 'Tests Initiated.', - }); - - name: Checkout - if: ${{ (github.event.comment.body == env.TRIGGER_STRING) && contains( env.USER_LIST, github.event.comment.user.login) }} - uses: actions/checkout@v3 - - name: Trigger GitHub Mirror - if: ${{ (github.event.comment.body == env.TRIGGER_STRING) && contains( env.USER_LIST, github.event.comment.user.login) }} - run: .github/workflows/id_most_recent_comment_on_PR.sh ${{secrets.GITLAB_TRIGGER_TOKEN}} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a9e6e104..3df1ca86 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: # Build all tutorials tests_msvc: - name: MSVC C++17 w/o Fortran w/o MPI + name: MSVC w/o Fortran w/o MPI runs-on: windows-latest steps: - uses: actions/checkout@v4 @@ -25,7 +25,7 @@ jobs: # Build all tutorials tutorials_clang: - name: Clang C++17 w/o Fortran w/o MPI + name: Clang w/o Fortran w/o MPI runs-on: windows-latest steps: - uses: actions/checkout@v4 diff --git a/ExampleCodes/Amr/Wave_AmrLevel/GNUmakefile b/ExampleCodes/Amr/Wave_AmrLevel/GNUmakefile index 7246bc3d..06c0ca43 100644 --- a/ExampleCodes/Amr/Wave_AmrLevel/GNUmakefile +++ b/ExampleCodes/Amr/Wave_AmrLevel/GNUmakefile @@ -16,8 +16,6 @@ BL_NO_FORT = TRUE # No Fortran probin file AMREX_NO_PROBINIT = TRUE -CXXSTD=c++17 - include $(AMREX_HOME)/Tools/GNUMake/Make.defs include ./Make.package diff --git a/ExampleCodes/CMakeLists.txt b/ExampleCodes/CMakeLists.txt index be729404..fe393265 100644 --- a/ExampleCodes/CMakeLists.txt +++ b/ExampleCodes/CMakeLists.txt @@ -111,7 +111,7 @@ if( NOT DEFINED SUNDIALS_DIR ) endif () if (AMReX_GPU_BACKEND STREQUAL SYCL) set(ENABLE_SYCL ON CACHE INTERNAL "" ) - set(CMAKE_CXX_STANDARD 17 CACHE INTERNAL "" ) + set(CMAKE_CXX_STANDARD 20 CACHE INTERNAL "" ) endif () endif () set(BUILD_ARKODE ON CACHE INTERNAL "" ) From 27fa751292f1ffaedc9324aeb29e64ff14af3da1 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Tue, 28 Apr 2026 09:28:23 -0700 Subject: [PATCH 2/5] update clang and intel --- .../dependencies/dependencies_clang.sh | 21 +++++++++++++++++++ .github/workflows/linux.yml | 5 ++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100755 .github/workflows/dependencies/dependencies_clang.sh diff --git a/.github/workflows/dependencies/dependencies_clang.sh b/.github/workflows/dependencies/dependencies_clang.sh new file mode 100755 index 00000000..4c329321 --- /dev/null +++ b/.github/workflows/dependencies/dependencies_clang.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# +# Copyright 2020-2022 The AMReX Community +# +# License: BSD-3-Clause-LBNL +# Authors: Axel Huebl + +set -eu -o pipefail + +# `man apt.conf`: +# Number of retries to perform. If this is non-zero APT will retry +# failed files the given number of times. +echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries + +sudo apt-get update + +sudo apt-get install -y --no-install-recommends \ + build-essential \ + libfftw3-dev \ + gfortran \ + clang-$1 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 3d2109c6..e6fc3017 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -194,7 +194,7 @@ jobs: cmake --build build -j 2 tutorials-dpcpp: - name: DPCPP GFortran [tutorials] + name: DPCPP [tutorials] runs-on: ubuntu-24.04 env: {CXXFLAGS: "-fno-operator-names"} steps: @@ -208,7 +208,6 @@ jobs: set -e cd ExampleCodes cmake -S . -B build \ - -DCMAKE_CXX_COMPILER_ID="Clang" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DAMReX_LINEAR_SOLVERS=ON \ -DAMReX_FORTRAN=ON \ @@ -218,7 +217,7 @@ jobs: -DAMReX_GPU_BACKEND=SYCL \ -DCMAKE_C_COMPILER=$(which icx) \ -DCMAKE_CXX_COMPILER=$(which icpx) \ - -DCMAKE_Fortran_COMPILER=$(which gfortran) + -DCMAKE_Fortran_COMPILER=$(which ifx) cmake --build build --parallel 2 tutorials-hip: From 493d4381a78f214d4b85d94f42e0780396489c4a Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Tue, 28 Apr 2026 09:29:40 -0700 Subject: [PATCH 3/5] fix clang --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e6fc3017..944132be 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -72,7 +72,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Dependencies - run: .github/workflows/dependencies/dependencies_clang.sh + run: .github/workflows/dependencies/dependencies_clang.sh 18 - name: Build & Install run: | cd ExampleCodes From 18582816f1daf275e0d0b09ac11fa678f85b8fb3 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Tue, 28 Apr 2026 11:32:25 -0700 Subject: [PATCH 4/5] no fortran --- .github/workflows/linux.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 944132be..21015604 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -210,8 +210,6 @@ jobs: cmake -S . -B build \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DAMReX_LINEAR_SOLVERS=ON \ - -DAMReX_FORTRAN=ON \ - -DAMReX_FORTRAN_INTERFACES=ON \ -DAMReX_EB=ON \ -DAMReX_PARTICLES=ON \ -DAMReX_GPU_BACKEND=SYCL \ From f51c8601eb2d59213cedb511be509d68bb0d868e Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Tue, 28 Apr 2026 12:01:50 -0700 Subject: [PATCH 5/5] Fix --- .../Advection_F/Exec/SingleVortex/face_velocity_3d.F90 | 2 +- ExampleCodes/Particles/NeighborList/MDParticleContainer.H | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ExampleCodes/FortranInterface/Advection_F/Exec/SingleVortex/face_velocity_3d.F90 b/ExampleCodes/FortranInterface/Advection_F/Exec/SingleVortex/face_velocity_3d.F90 index 1c5c6e1b..4a633ccb 100644 --- a/ExampleCodes/FortranInterface/Advection_F/Exec/SingleVortex/face_velocity_3d.F90 +++ b/ExampleCodes/FortranInterface/Advection_F/Exec/SingleVortex/face_velocity_3d.F90 @@ -28,7 +28,7 @@ subroutine get_face_velocity(time, & double precision, intent(in) :: dx(3), prob_lo(3) integer :: i, j, k, plo(2), phi(2) - double precision :: x, y, z + double precision :: x, y double precision, pointer, contiguous :: psi(:,:) double precision, parameter :: M_PI = 3.141592653589793238462643383279502884197d0 integer :: vx_l1,vx_l2,vx_l3,vy_l1,vy_l2,vy_l3,vz_l1,vz_l2,vz_l3 diff --git a/ExampleCodes/Particles/NeighborList/MDParticleContainer.H b/ExampleCodes/Particles/NeighborList/MDParticleContainer.H index dfef2cbe..c4ea3508 100644 --- a/ExampleCodes/Particles/NeighborList/MDParticleContainer.H +++ b/ExampleCodes/Particles/NeighborList/MDParticleContainer.H @@ -23,7 +23,7 @@ public: const amrex::DistributionMapping & a_dmap, const amrex::BoxArray & a_ba, int a_numcells) - : NeighborParticleContainer(a_geom, a_dmap, a_ba, a_numcells) + : amrex::NeighborParticleContainer(a_geom, a_dmap, a_ba, a_numcells) {} void InitParticles (const amrex::IntVect& a_num_particles_per_cell,