diff --git a/CMakeLists.txt b/CMakeLists.txt index 807b5cfa..14ce3e25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.20.0) -project(pyAMReX VERSION 23.10) +project(pyAMReX VERSION 23.11) include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake) diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index a71856b8..e28a3cae 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -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.10 CONFIG REQUIRED COMPONENTS PARTICLES PIC) + find_package(AMReX 23.11 CONFIG REQUIRED COMPONENTS PARTICLES PIC) message(STATUS "AMReX: Found version '${AMReX_VERSION}'") endif() endmacro() @@ -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 "be6c6415467d09da6109d27cfa218868abc1f9db" +set(pyAMReX_amrex_branch "23.11" CACHE STRING "Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)") diff --git a/docs/source/conf.py b/docs/source/conf.py index 606ff3df..58c498f6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -71,9 +71,9 @@ # built documents. # # The short X.Y version. -version = "23.10" +version = "23.11" # The full version, including alpha/beta/rc tags. -release = "23.10" +release = "23.11" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index b41451ed..c491d447 100644 --- a/setup.py +++ b/setup.py @@ -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.10", + version="23.11", packages=["amrex"], # Python sources: package_dir={"": "src"}, diff --git a/src/Particle/Particle.cpp b/src/Particle/Particle.cpp index 9ff52092..da8ca0d2 100644 --- a/src/Particle/Particle.cpp +++ b/src/Particle/Particle.cpp @@ -327,6 +327,6 @@ void init_Particle(py::module& m) { make_Particle< 3, 2 > (m); make_Particle< 4, 0 > (m); // HiPACE++ 22.07 make_Particle< 5, 0 > (m); // ImpactX 22.07 - make_Particle< 8, 2 > (m); // ImpactX 23.11+ + make_Particle< 8, 2 > (m); // ImpactX 23.12+ make_Particle< 37, 1> (m); // HiPACE++ 22.07 } diff --git a/src/Particle/ParticleContainer_ImpactX.cpp b/src/Particle/ParticleContainer_ImpactX.cpp index 36fd5cbc..b9586481 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.10 - make_ParticleContainer_and_Iterators, 8, 2>(m); // ImpactX 23.11+ + make_ParticleContainer_and_Iterators, 5, 0>(m); // ImpactX 22.07 - 23.11 + make_ParticleContainer_and_Iterators, 8, 2>(m); // ImpactX 23.12+ } diff --git a/src/Particle/ParticleContainer_WarpX.cpp b/src/Particle/ParticleContainer_WarpX.cpp index 36b4ac37..ac4f1338 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.10 1D-3D - //make_ParticleContainer_and_Iterators, 5, 0> (m); // WarpX 22.07 - 23.10 RZ + make_ParticleContainer_and_Iterators, 4, 0>(m); // WarpX 22.07 - 23.11 1D-3D + //make_ParticleContainer_and_Iterators, 5, 0> (m); // WarpX 22.07 - 23.11 RZ } diff --git a/src/Particle/ParticleTile.cpp b/src/Particle/ParticleTile.cpp index 7324b36e..8d8cf969 100644 --- a/src/Particle/ParticleTile.cpp +++ b/src/Particle/ParticleTile.cpp @@ -191,6 +191,6 @@ void init_ParticleTile(py::module& m) { make_ParticleTile (m); make_ParticleTile (m); // HiPACE++ 22.07 make_ParticleTile (m); // ImpactX 22.07 - make_ParticleTile (m); // ImpactX 23.11+ + make_ParticleTile (m); // ImpactX 23.12+ make_ParticleTile (m); // HiPACE++ 22.07 } diff --git a/src/Particle/StructOfArrays.cpp b/src/Particle/StructOfArrays.cpp index 12dbc7f2..f133d252 100644 --- a/src/Particle/StructOfArrays.cpp +++ b/src/Particle/StructOfArrays.cpp @@ -89,8 +89,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 - 23.10 - make_StructOfArrays< 5, 0>(m); // ImpactX 22.07 - 23.10 - make_StructOfArrays< 8, 2>(m); // ImpactX 23.11+ - make_StructOfArrays<37, 1>(m); // HiPACE++ 22.09 - 23.10 + make_StructOfArrays< 4, 0>(m); // HiPACE++ 22.08 - 23.11 + make_StructOfArrays< 5, 0>(m); // ImpactX 22.07 - 23.11 + make_StructOfArrays< 8, 2>(m); // ImpactX 23.12+ + make_StructOfArrays<37, 1>(m); // HiPACE++ 22.09 - 23.11 } diff --git a/src/amrex/space1d/__init__.pyi b/src/amrex/space1d/__init__.pyi index 4cb241ef..ae08abb9 100644 --- a/src/amrex/space1d/__init__.pyi +++ b/src/amrex/space1d/__init__.pyi @@ -492,4 +492,4 @@ def d_decl(x, y, z): __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang" __license__: str = "BSD-3-Clause-LBNL" -__version__: str = "23.10-22-gbe6c6415467d" +__version__: str = "23.11" diff --git a/src/amrex/space1d/amrex_1d_pybind/__init__.pyi b/src/amrex/space1d/amrex_1d_pybind/__init__.pyi index d7dc2a51..05d0337b 100644 --- a/src/amrex/space1d/amrex_1d_pybind/__init__.pyi +++ b/src/amrex/space1d/amrex_1d_pybind/__init__.pyi @@ -3575,7 +3575,7 @@ class BoxArray: def size(self) -> int: ... class Config: - amrex_version: typing.ClassVar[str] = "23.10-22-gbe6c6415467d" + amrex_version: typing.ClassVar[str] = "23.11" gpu_backend = None have_gpu: typing.ClassVar[bool] = False have_mpi: typing.ClassVar[bool] = True @@ -10855,4 +10855,4 @@ def write_single_level_plotfile( __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang" __license__: str = "BSD-3-Clause-LBNL" -__version__: str = "23.10-22-gbe6c6415467d" +__version__: str = "23.11" diff --git a/src/amrex/space2d/__init__.pyi b/src/amrex/space2d/__init__.pyi index a00eb6a0..10319d3d 100644 --- a/src/amrex/space2d/__init__.pyi +++ b/src/amrex/space2d/__init__.pyi @@ -492,4 +492,4 @@ def d_decl(x, y, z): __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang" __license__: str = "BSD-3-Clause-LBNL" -__version__: str = "23.10-22-gbe6c6415467d" +__version__: str = "23.11" diff --git a/src/amrex/space2d/amrex_2d_pybind/__init__.pyi b/src/amrex/space2d/amrex_2d_pybind/__init__.pyi index a62cfcd2..0a223460 100644 --- a/src/amrex/space2d/amrex_2d_pybind/__init__.pyi +++ b/src/amrex/space2d/amrex_2d_pybind/__init__.pyi @@ -3575,7 +3575,7 @@ class BoxArray: def size(self) -> int: ... class Config: - amrex_version: typing.ClassVar[str] = "23.10-22-gbe6c6415467d" + amrex_version: typing.ClassVar[str] = "23.11" gpu_backend = None have_gpu: typing.ClassVar[bool] = False have_mpi: typing.ClassVar[bool] = True @@ -10872,4 +10872,4 @@ def write_single_level_plotfile( __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang" __license__: str = "BSD-3-Clause-LBNL" -__version__: str = "23.10-22-gbe6c6415467d" +__version__: str = "23.11" diff --git a/src/amrex/space3d/__init__.pyi b/src/amrex/space3d/__init__.pyi index 91431161..4467496b 100644 --- a/src/amrex/space3d/__init__.pyi +++ b/src/amrex/space3d/__init__.pyi @@ -492,4 +492,4 @@ def d_decl(x, y, z): __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang" __license__: str = "BSD-3-Clause-LBNL" -__version__: str = "23.10-22-gbe6c6415467d" +__version__: str = "23.11" diff --git a/src/amrex/space3d/amrex_3d_pybind/__init__.pyi b/src/amrex/space3d/amrex_3d_pybind/__init__.pyi index adf314e1..d2759024 100644 --- a/src/amrex/space3d/amrex_3d_pybind/__init__.pyi +++ b/src/amrex/space3d/amrex_3d_pybind/__init__.pyi @@ -3575,7 +3575,7 @@ class BoxArray: def size(self) -> int: ... class Config: - amrex_version: typing.ClassVar[str] = "23.10-22-gbe6c6415467d" + amrex_version: typing.ClassVar[str] = "23.11" gpu_backend = None have_gpu: typing.ClassVar[bool] = False have_mpi: typing.ClassVar[bool] = True @@ -10896,4 +10896,4 @@ def write_single_level_plotfile( __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang" __license__: str = "BSD-3-Clause-LBNL" -__version__: str = "23.10-22-gbe6c6415467d" +__version__: str = "23.11"