Skip to content

Commit

Permalink
Release 23.07 (#399)
Browse files Browse the repository at this point in the history
* Release 23.07

Prepare the July release of ImpactX.

* FIx: PoissonSolve.cpp Constant

```
impactx/src/particles/spacecharge/PoissonSolve.cpp:106:36: error: use of undeclared identifier 'PhysConst'
            rho[lev].mult(-1._rt * PhysConst::ep0);
                                   ^
```

* [Workaround] ABLASTR 23.07 Poisson eps0

Workaround for
  ECP-WarpX/WarpX#4090
in ABLASTR 23.07
  • Loading branch information
ax3l authored Jul 18, 2023
1 parent 7206d3e commit 0e14bec
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 10 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(ImpactX VERSION 23.06)
project(ImpactX VERSION 23.07)

include(${ImpactX_SOURCE_DIR}/cmake/ImpactXFunctions.cmake)

Expand Down
6 changes: 3 additions & 3 deletions cmake/dependencies/ABLASTR.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -166,15 +166,15 @@ 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)")

# AMReX is transitively pulled through ABLASTR
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)")

Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/pyAMReX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)")

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.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.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
9 changes: 8 additions & 1 deletion src/particles/spacecharge/PoissonSolve.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
*/
#include "PoissonSolve.H"

#include <ablastr/constant.H>
/* work-around for https://github.com/ECP-WarpX/WarpX/pull/4090 in ABLASTR 23.07 */
namespace PhysConst
{
using namespace ablastr::constant::SI;
}
#include <ablastr/fields/PoissonSolver.H>

#include <AMReX_BLProfiler.H>
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0e14bec

Please sign in to comment.