From dc5450dd8281cd45d95cb13bfb378413236ccbc3 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 6 Jan 2024 23:59:19 +0100 Subject: [PATCH] Release 24.01 (#500) * Release 24.01 Pepare the January release of ImpactX. * pyAMReX: Update Breaking APIs --- CMakeLists.txt | 2 +- cmake/dependencies/ABLASTR.cmake | 4 ++-- cmake/dependencies/pyAMReX.cmake | 4 ++-- docs/source/conf.py | 4 ++-- setup.py | 2 +- tests/python/test_charge_deposition.py | 2 +- tests/python/test_impactx.py | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92e156733..86feebedf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.20.0) -project(ImpactX VERSION 23.12) +project(ImpactX VERSION 24.01) include(${ImpactX_SOURCE_DIR}/cmake/ImpactXFunctions.cmake) diff --git a/cmake/dependencies/ABLASTR.cmake b/cmake/dependencies/ABLASTR.cmake index 555efa370..f2df7a9c3 100644 --- a/cmake/dependencies/ABLASTR.cmake +++ b/cmake/dependencies/ABLASTR.cmake @@ -144,7 +144,7 @@ macro(find_ablastr) set(COMPONENT_DIM 3D) set(COMPONENT_PRECISION ${ImpactX_PRECISION} P${ImpactX_PRECISION}) - find_package(ABLASTR 23.12 CONFIG REQUIRED COMPONENTS ${COMPONENT_DIM}) + find_package(ABLASTR 24.01 CONFIG REQUIRED COMPONENTS ${COMPONENT_DIM}) message(STATUS "ABLASTR: Found version '${ABLASTR_VERSION}'") endif() @@ -178,7 +178,7 @@ set(ImpactX_openpmd_src "" set(ImpactX_ablastr_repo "https://github.com/ECP-WarpX/WarpX.git" CACHE STRING "Repository URI to pull and build ABLASTR from if(ImpactX_ablastr_internal)") -set(ImpactX_ablastr_branch "23.12" +set(ImpactX_ablastr_branch "24.01" CACHE STRING "Repository branch for ImpactX_ablastr_repo if(ImpactX_ablastr_internal)") diff --git a/cmake/dependencies/pyAMReX.cmake b/cmake/dependencies/pyAMReX.cmake index 780bcda50..43f8d95a5 100644 --- a/cmake/dependencies/pyAMReX.cmake +++ b/cmake/dependencies/pyAMReX.cmake @@ -64,7 +64,7 @@ function(find_pyamrex) endif() elseif(NOT ImpactX_pyamrex_internal) # TODO: MPI control - find_package(pyAMReX 23.12 CONFIG REQUIRED) + find_package(pyAMReX 24.01 CONFIG REQUIRED) message(STATUS "pyAMReX: Found version '${pyAMReX_VERSION}'") endif() endfunction() @@ -79,7 +79,7 @@ option(ImpactX_pyamrex_internal "Download & build pyAMReX" ON) set(ImpactX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git" CACHE STRING "Repository URI to pull and build pyamrex from if(ImpactX_pyamrex_internal)") -set(ImpactX_pyamrex_branch "23.12" +set(ImpactX_pyamrex_branch "24.01" CACHE STRING "Repository branch for ImpactX_pyamrex_repo if(ImpactX_pyamrex_internal)") diff --git a/docs/source/conf.py b/docs/source/conf.py index 2488314a8..21e9a09fd 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -73,9 +73,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. diff --git a/setup.py b/setup.py index cb109dcd1..10801ee9c 100644 --- a/setup.py +++ b/setup.py @@ -235,7 +235,7 @@ def build_extension(self, ext): setup( name="impactx", # note PEP-440 syntax: x.y.zaN but x.y.z.devN - version="23.12", + version="24.01", packages=["impactx"], # Python sources: package_dir={"": "src/python"}, diff --git a/tests/python/test_charge_deposition.py b/tests/python/test_charge_deposition.py index fbcb52840..3e93bc4d1 100755 --- a/tests/python/test_charge_deposition.py +++ b/tests/python/test_charge_deposition.py @@ -70,7 +70,7 @@ def test_charge_deposition(save_png=True): # plot data slices f = plt.figure() ax = f.gca() - ng = rho_host.nGrowVect + ng = rho_host.n_grow_vect for mfi in rho_host: bx = mfi.validbox() rbx = amr.RealBox(bx, dr, gm.ProbLo()) diff --git a/tests/python/test_impactx.py b/tests/python/test_impactx.py index b900f11fe..8ee5b453a 100755 --- a/tests/python/test_impactx.py +++ b/tests/python/test_impactx.py @@ -264,8 +264,8 @@ def test_impactx_change_resolution(): assert rho.nComp == 1 assert rho.size == 1 assert rho.num_comp == 1 - # assert rho.nGrowVect == [2, 2, 2] - print(f"rho.nGrowVect={rho.nGrowVect}") + # assert rho.n_grow_vect == [2, 2, 2] + print(f"rho.n_grow_vect={rho.n_grow_vect}") assert iter(rho).length > 0 assert not rho.is_all_cell_centered assert rho.is_all_nodal