From debef4d4cf6879794776d22693810182345b22a7 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 1 Aug 2023 19:02:52 -0700 Subject: [PATCH] Release: 23.08 The August release :) --- CMakeLists.txt | 2 +- cmake/dependencies/AMReX.cmake | 4 ++-- src/Particle/ParticleContainer_ImpactX.cpp | 4 ++-- src/Particle/ParticleContainer_WarpX.cpp | 4 ++-- src/Particle/StructOfArrays.cpp | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0514b0a4..48927060 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.20.0) -project(pyAMReX VERSION 23.07) +project(pyAMReX VERSION 23.08) include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake) diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 717a19ae..14990aaf 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -67,7 +67,7 @@ macro(find_amrex) elseif(NOT pyAMReX_amrex_internal) message(STATUS "Searching for pre-installed AMReX ...") # https://amrex-codes.github.io/amrex/docs_html/BuildingAMReX.html#importing-amrex-into-your-cmake-project - find_package(AMReX 23.07 CONFIG REQUIRED COMPONENTS PARTICLES PIC) + find_package(AMReX 23.08 CONFIG REQUIRED COMPONENTS PARTICLES PIC) message(STATUS "AMReX: Found version '${AMReX_VERSION}'") endif() endmacro() @@ -82,7 +82,7 @@ option(pyAMReX_amrex_internal "Download & build AMReX" ON) set(pyAMReX_amrex_repo "https://github.com/AMReX-Codes/amrex.git" CACHE STRING "Repository URI to pull and build AMReX from if(pyAMReX_amrex_internal)") -set(pyAMReX_amrex_branch "b75dd9d5279263768c418ce19285f87de37209f9" +set(pyAMReX_amrex_branch "23.08" CACHE STRING "Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)") diff --git a/src/Particle/ParticleContainer_ImpactX.cpp b/src/Particle/ParticleContainer_ImpactX.cpp index 79354deb..bc4e0c0d 100644 --- a/src/Particle/ParticleContainer_ImpactX.cpp +++ b/src/Particle/ParticleContainer_ImpactX.cpp @@ -14,6 +14,6 @@ void init_ParticleContainer_ImpactX(py::module& m) { // TODO: we might need to move all or most of the defines in here into a // test/example submodule, so they do not collide with downstream projects - make_ParticleContainer_and_Iterators, 5, 0>(m); // ImpactX 22.07 - 23.07 - make_ParticleContainer_and_Iterators, 8, 2>(m); // ImpactX 23.08+ + make_ParticleContainer_and_Iterators, 5, 0>(m); // ImpactX 22.07 - 23.08 + make_ParticleContainer_and_Iterators, 8, 2>(m); // ImpactX 23.09+ } diff --git a/src/Particle/ParticleContainer_WarpX.cpp b/src/Particle/ParticleContainer_WarpX.cpp index e1c81d31..ed85f7af 100644 --- a/src/Particle/ParticleContainer_WarpX.cpp +++ b/src/Particle/ParticleContainer_WarpX.cpp @@ -13,6 +13,6 @@ void init_ParticleContainer_WarpX(py::module& m) { // TODO: we might need to move all or most of the defines in here into a // test/example submodule, so they do not collide with downstream projects - make_ParticleContainer_and_Iterators, 4, 0>(m); // WarpX 22.07 - 23.07 1D-3D - //make_ParticleContainer_and_Iterators, 5, 0> (m); // WarpX 22.07 - 23.07 RZ + make_ParticleContainer_and_Iterators, 4, 0>(m); // WarpX 22.07 - 23.08 1D-3D + //make_ParticleContainer_and_Iterators, 5, 0> (m); // WarpX 22.07 - 23.08 RZ } diff --git a/src/Particle/StructOfArrays.cpp b/src/Particle/StructOfArrays.cpp index 51263d6a..14a213c7 100644 --- a/src/Particle/StructOfArrays.cpp +++ b/src/Particle/StructOfArrays.cpp @@ -87,8 +87,8 @@ void make_StructOfArrays(py::module &m) void init_StructOfArrays(py::module& m) { make_StructOfArrays< 2, 1>(m); - make_StructOfArrays< 4, 0>(m); // HiPACE++ 22.08+ + make_StructOfArrays< 4, 0>(m); // HiPACE++ 22.08 - 23.06 make_StructOfArrays< 5, 0>(m); // ImpactX 22.07 - 23.08 - make_StructOfArrays< 8, 2>(m); // ImpactX 23.08+ - make_StructOfArrays<37, 1>(m); // HiPACE++ 22.08+ + make_StructOfArrays< 8, 2>(m); // ImpactX 23.09+ + make_StructOfArrays<37, 1>(m); // HiPACE++ 22.09 - 23.06 }