diff --git a/CMakeLists.txt b/CMakeLists.txt index ceb5baeb..8b998dcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.24.0) -project(pyAMReX VERSION 25.01) +project(pyAMReX VERSION 25.02) include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake) diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index e721fc2e..57605f88 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -67,7 +67,7 @@ macro(find_amrex) message(STATUS "Searching for pre-installed AMReX ...") # https://amrex-codes.github.io/amrex/docs_html/BuildingAMReX.html#importing-amrex-into-your-cmake-project # not strictly required yet to compile pyAMReX: EB - find_package(AMReX 25.01 CONFIG REQUIRED COMPONENTS PARTICLES PIC) + find_package(AMReX 25.02 CONFIG REQUIRED COMPONENTS PARTICLES PIC) message(STATUS "AMReX: Found version '${AMReX_VERSION}'") if(AMReX_GPU_BACKEND STREQUAL CUDA) @@ -86,7 +86,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 "0f46a1615c17f0bbeaedb20c27a97c9f6e439781" +set(pyAMReX_amrex_branch "25.02" 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 04ebe0bb..f5e89332 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -72,9 +72,9 @@ # built documents. # # The short X.Y version. -version = "25.01" +version = "25.02" # The full version, including alpha/beta/rc tags. -release = "25.01" +release = "25.02" # 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 46078779..388dea96 100644 --- a/setup.py +++ b/setup.py @@ -217,7 +217,7 @@ def build_extension(self, ext): setup( name="amrex", # note PEP-440 syntax: x.y.zaN but x.y.z.devN - version="25.01", + version="25.02", packages=["amrex"], # Python sources: package_dir={"": "src"}, diff --git a/src/Base/MultiFab.H b/src/Base/MultiFab.H index 1cd55255..a772df34 100644 --- a/src/Base/MultiFab.H +++ b/src/Base/MultiFab.H @@ -225,7 +225,8 @@ factory : ) ; - // TODO: Missing in AMReX iMultiFab as of v25.01 + // TODO: Missing in AMReX iMultiFab as of v25.02 + // https://github.com/AMReX-Codes/amrex/issues/4317 if constexpr (std::is_same_v) { py_MultiFab .def("sum_unique", @@ -478,7 +479,7 @@ factory : ) ; - // TODO: Missing in iMultiFab + // TODO: Missing in iMultiFab https://github.com/AMReX-Codes/amrex/issues/4317 if constexpr (std::is_same_v) { py_MultiFab .def("add", @@ -503,7 +504,7 @@ factory : ) ; - // TODO: Missing in iMultiFab + // TODO: Missing in iMultiFab https://github.com/AMReX-Codes/amrex/issues/4317 if constexpr (std::is_same_v) { py_MultiFab .def("subtract", @@ -554,7 +555,7 @@ factory : if constexpr (std::is_same_v) { py_MultiFab - .def("divide", /* TODO: Missing in iMultiFab */ + .def("divide", /* TODO: Missing in iMultiFab https://github.com/AMReX-Codes/amrex/issues/4317 */ [](T &self, T const &src, int srccomp, int comp, int numcomp, IntVect const &nghost) { T::Divide(self, src, srccomp, comp, numcomp, nghost); }, @@ -563,7 +564,7 @@ factory : "The two MultiFabs MUST have the same underlying BoxArray." ) - .def("swap", /* TODO: Missing in iMultiFab */ + .def("swap", /* TODO: Missing in iMultiFab https://github.com/AMReX-Codes/amrex/issues/4317 */ [](T &self, T &src, int srccomp, int comp, int numcomp, int nghost) { T::Swap(self, src, srccomp, comp, numcomp, nghost); }, @@ -572,7 +573,7 @@ factory : "The two MultiFabs MUST have the same underlying BoxArray.\n" "The swap is local." ) - .def("swap", /* TODO: Missing in iMultiFab */ + .def("swap", /* TODO: Missing in iMultiFab https://github.com/AMReX-Codes/amrex/issues/4317 */ [](T &self, T &src, int srccomp, int comp, int numcomp, IntVect const &nghost) { T::Swap(self, src, srccomp, comp, numcomp, nghost); },