Skip to content

Commit

Permalink
Release: 24.01 (#239)
Browse files Browse the repository at this point in the history
  • Loading branch information
ax3l authored Jan 5, 2024
1 parent 942918a commit 319b8b6
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Preamble ####################################################################
#
cmake_minimum_required(VERSION 3.20.0)
project(pyAMReX VERSION 23.12)
project(pyAMReX VERSION 24.01)

include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake)

Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/AMReX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,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.12 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
find_package(AMReX 24.01 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
endif()
endmacro()
Expand All @@ -85,7 +85,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 "ecaa46d0be4b5c79b8806e48e3469000d8bb7252"
set(pyAMReX_amrex_branch "24.01"
CACHE STRING
"Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)")

Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
# built documents.
#
# The short X.Y version.
version = "23.12"
version = "24.01"
# The full version, including alpha/beta/rc tags.
release = "23.12"
release = "24.01"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ def build_extension(self, ext):
setup(
name="amrex",
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
version="23.12",
version="24.01",
packages=["amrex"],
# Python sources:
package_dir={"": "src"},
Expand Down
4 changes: 2 additions & 2 deletions src/Particle/ParticleContainer_ImpactX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Particle<0, 0>, 5, 0>(m); // ImpactX 22.07 - 23.12
make_ParticleContainer_and_Iterators<SoAParticle<8, 0>, 8, 0>(m); // ImpactX 24.01+
make_ParticleContainer_and_Iterators<Particle<0, 0>, 5, 0>(m); // ImpactX 22.07 - 24.01
make_ParticleContainer_and_Iterators<SoAParticle<8, 0>, 8, 0>(m); // ImpactX 24.02+
}
10 changes: 5 additions & 5 deletions src/Particle/ParticleContainer_WarpX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ 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<Particle<0, 0>, 4, 0>(m); // WarpX 22.07 - 23.12 1D-3D
//make_ParticleContainer_and_Iterators<Particle<0, 0>, 5, 0> (m); // WarpX 22.07 - 23.12 RZ
make_ParticleContainer_and_Iterators<Particle<0, 0>, 4, 0>(m); // WarpX 22.07 - 24.01 1D-3D
//make_ParticleContainer_and_Iterators<Particle<0, 0>, 5, 0> (m); // WarpX 22.07 - 24.01 RZ

#if AMREX_SPACEDIM == 1
make_ParticleContainer_and_Iterators<SoAParticle<5, 0>, 5, 0>(m); // WarpX 24.01+ 1D
make_ParticleContainer_and_Iterators<SoAParticle<5, 0>, 5, 0>(m); // WarpX 24.02+ 1D
#elif AMREX_SPACEDIM == 2
make_ParticleContainer_and_Iterators<SoAParticle<6, 0>, 6, 0>(m); // WarpX 24.01+ 2D
make_ParticleContainer_and_Iterators<SoAParticle<6, 0>, 6, 0>(m); // WarpX 24.02+ 2D
#elif AMREX_SPACEDIM == 3
make_ParticleContainer_and_Iterators<SoAParticle<7, 0>, 7, 0>(m); // WarpX 24.01+ 3D
make_ParticleContainer_and_Iterators<SoAParticle<7, 0>, 7, 0>(m); // WarpX 24.02+ 3D
#endif
}
12 changes: 6 additions & 6 deletions src/Particle/StructOfArrays.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ 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 - 23.12
make_StructOfArrays< 5, 0>(m); // ImpactX 22.07 - 23.12
make_StructOfArrays< 4, 0>(m); // HiPACE++ 22.08 - 24.01
make_StructOfArrays< 5, 0>(m); // ImpactX 22.07 - 24.01
#if AMREX_SPACEDIM == 1
make_StructOfArrays< 5, 0, true>(m); // WarpX 24.01+ 1D
make_StructOfArrays< 5, 0, true>(m); // WarpX 24.02+ 1D
#elif AMREX_SPACEDIM == 2
make_StructOfArrays< 6, 0, true>(m); // WarpX 24.01+ 2D
make_StructOfArrays< 6, 0, true>(m); // WarpX 24.02+ 2D
#elif AMREX_SPACEDIM == 3
make_StructOfArrays< 7, 0, true>(m); // WarpX 24.01+ 3D
make_StructOfArrays< 7, 0, true>(m); // WarpX 24.02+ 3D
#endif
make_StructOfArrays< 8, 0, true>(m); // ImpactX 24.01+
make_StructOfArrays< 8, 0, true>(m); // ImpactX 24.02+
make_StructOfArrays<37, 1>(m); // HiPACE++ 22.09 - 23.12
}

0 comments on commit 319b8b6

Please sign in to comment.