Release 24.07 (#643)

* Release 24.07 * `deposit_charge`: ABLASTR 24.07 Update to latest APIs.
ECP-WarpX · Jul 16, 2024 · bbc2093 · bbc2093
1 parent e0360fa
commit bbc2093
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Preamble ####################################################################
 #
 cmake_minimum_required(VERSION 3.20.0)
-project(ImpactX VERSION 24.06)
+project(ImpactX VERSION 24.07)
 
 include(${ImpactX_SOURCE_DIR}/cmake/ImpactXFunctions.cmake)
 

diff --git 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 24.06 CONFIG REQUIRED COMPONENTS ${COMPONENT_DIM})
+        find_package(ABLASTR 24.07 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 "24.06"
+set(ImpactX_ablastr_branch "24.07"
     CACHE STRING
     "Repository branch for ImpactX_ablastr_repo if(ImpactX_ablastr_internal)")
 

diff --git 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 24.06 CONFIG REQUIRED)
+        find_package(pyAMReX 24.07 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 "24.06"
+set(ImpactX_pyamrex_branch "24.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
@@ -73,9 +73,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "24.06"
+version = "24.07"
 # The full version, including alpha/beta/rc tags.
-release = "24.06"
+release = "24.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
@@ -223,7 +223,7 @@ def build_extension(self, ext):
 setup(
     name="impactx",
     # note PEP-440 syntax: x.y.zaN but x.y.z.devN
-    version="24.06",
+    version="24.07",
     packages=["impactx"],
     # Python sources:
     package_dir={"": "src/python"},

diff --git a/src/particles/ChargeDeposition.cpp b/src/particles/ChargeDeposition.cpp
@@ -64,7 +64,6 @@ namespace impactx
                     tilebox.grow(rho_at_level.nGrowVect());
                     amrex::RealBox const grid_box{tilebox, gm.CellSize(), gm.ProbLo()};
                     amrex::Real const * const AMREX_RESTRICT xyzmin_ptr = grid_box.lo();
-                    std::array<amrex::Real, 3> const xyzmin = {xyzmin_ptr[0], xyzmin_ptr[1], xyzmin_ptr[2]};
 
                     // mesh-refinement: for when we do not deposit on the same level
                     // note: would need to communicate the deposited-to boxes afterwards
@@ -76,8 +75,9 @@ namespace impactx
                     // in SI [C]
                     amrex::ParticleReal const charge = m_refpart.charge;
 
-                    // cell size of the mesh to deposit to
-                    std::array<amrex::Real, 3> const & AMREX_RESTRICT dx = {gm.CellSize(0), gm.CellSize(1), gm.CellSize(2)};
+                    // lower end and inverse cell size of the mesh to deposit to
+                    amrex::XDim3 const xyzmin = {xyzmin_ptr[0], xyzmin_ptr[1], xyzmin_ptr[2]};
+                    amrex::XDim3 const dinv = {1.0_rt/gm.CellSize(0), 1.0_rt/gm.CellSize(1), 1.0_rt/gm.CellSize(2)};
 
                     // RZ modes (unused)
                     int const n_rz_azimuthal_modes = 0;
@@ -86,7 +86,7 @@ namespace impactx
                             (pti, wp, charge, ion_lev, &rho_at_level,
                              local_rho_fab,
                              m_particle_shape.value(),
-                             dx, xyzmin, n_rz_azimuthal_modes);
+                             dinv, xyzmin, n_rz_azimuthal_modes);
                 }
             }