diff --git a/CMakeLists.txt b/CMakeLists.txt index 6366a5ce6..769913025 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.20.0) -project(ImpactX VERSION 23.06) +project(ImpactX VERSION 23.07) include(${ImpactX_SOURCE_DIR}/cmake/ImpactXFunctions.cmake) diff --git a/cmake/dependencies/ABLASTR.cmake b/cmake/dependencies/ABLASTR.cmake index b6162bdc4..ba32182ca 100644 --- a/cmake/dependencies/ABLASTR.cmake +++ b/cmake/dependencies/ABLASTR.cmake @@ -135,7 +135,7 @@ macro(find_ablastr) set(COMPONENT_DIM 3D) set(COMPONENT_PRECISION ${ImpactX_PRECISION} P${ImpactX_PRECISION}) - find_package(ABLASTR 23.06 CONFIG REQUIRED COMPONENTS ${COMPONENT_DIM}) + find_package(ABLASTR 23.07 CONFIG REQUIRED COMPONENTS ${COMPONENT_DIM}) message(STATUS "ABLASTR: Found version '${ABLASTR_VERSION}'") endif() @@ -166,7 +166,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.06" +set(ImpactX_ablastr_branch "23.07" CACHE STRING "Repository branch for ImpactX_ablastr_repo if(ImpactX_ablastr_internal)") @@ -174,7 +174,7 @@ set(ImpactX_ablastr_branch "23.06" set(ImpactX_amrex_repo "https://github.com/AMReX-Codes/amrex.git" CACHE STRING "Repository URI to pull and build AMReX from if(ImpactX_amrex_internal)") -set(ImpactX_amrex_branch "23.06" +set(ImpactX_amrex_branch "23.07" CACHE STRING "Repository branch for ImpactX_amrex_repo if(ImpactX_amrex_internal)") diff --git a/cmake/dependencies/pyAMReX.cmake b/cmake/dependencies/pyAMReX.cmake index dee95a5ff..85cc031ae 100644 --- a/cmake/dependencies/pyAMReX.cmake +++ b/cmake/dependencies/pyAMReX.cmake @@ -61,7 +61,7 @@ function(find_pyamrex) endif() elseif(NOT ImpactX_pyamrex_internal) # TODO: MPI control - find_package(pyAMReX 23.06 CONFIG REQUIRED) + find_package(pyAMReX 23.07 CONFIG REQUIRED) message(STATUS "pyAMReX: Found version '${pyamrex_VERSION}'") endif() endfunction() @@ -76,7 +76,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.06" +set(ImpactX_pyamrex_branch "23.07" 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 77611018d..4a7494e20 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -72,9 +72,9 @@ # built documents. # # The short X.Y version. -version = "23.06" +version = "23.07" # The full version, including alpha/beta/rc tags. -release = "23.06" +release = "23.07" # 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 cf991edda..6b1b96e2c 100644 --- a/setup.py +++ b/setup.py @@ -239,7 +239,7 @@ def build_extension(self, ext): setup( name="impactx", # note PEP-440 syntax: x.y.zaN but x.y.z.devN - version="23.06", + version="23.07", packages=["impactx"], # Python sources: package_dir={"": "src/python"}, diff --git a/src/particles/spacecharge/PoissonSolve.cpp b/src/particles/spacecharge/PoissonSolve.cpp index aec6f79ad..9909edb95 100644 --- a/src/particles/spacecharge/PoissonSolve.cpp +++ b/src/particles/spacecharge/PoissonSolve.cpp @@ -9,6 +9,12 @@ */ #include "PoissonSolve.H" +#include +/* work-around for https://github.com/ECP-WarpX/WarpX/pull/4090 in ABLASTR 23.07 */ +namespace PhysConst +{ + using namespace ablastr::constant::SI; +} #include #include @@ -103,7 +109,8 @@ namespace impactx::spacecharge // fix side effect on rho from previous call for (int lev=0; lev<=finest_level; lev++) { - rho[lev].mult(-1._rt * PhysConst::ep0); + using namespace ablastr::constant::SI; + rho[lev].mult(-1._rt * ep0); } // fill boundary