Update: ABLASTR, pyAMReX (BLAST-ImpactX#660)

* Update: ABLASTR, pyAMReX * AMReX & WarpX 24.08: Breaking Changes
proy30 · Aug 7, 2024 · 77f7525 · 77f7525
1 parent 187b56a
commit 77f7525
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/cmake/dependencies/ABLASTR.cmake b/cmake/dependencies/ABLASTR.cmake
@@ -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 "b58343a9cf31ad2e2e0c47b2c5f0b15cc122a961"
+set(ImpactX_ablastr_branch "547794da10a10698bb9fdd434b2935ba063521a6"
     CACHE STRING
     "Repository branch for ImpactX_ablastr_repo if(ImpactX_ablastr_internal)")
 

diff --git a/cmake/dependencies/pyAMReX.cmake b/cmake/dependencies/pyAMReX.cmake
@@ -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 "ff4643869c63d4ee40a87054b901f61eefcb97a3"
+set(ImpactX_pyamrex_branch "8b8e2b68503c412262815b3499d802a77d5c47ec"
     CACHE STRING
     "Repository branch for ImpactX_pyamrex_repo if(ImpactX_pyamrex_internal)")
 

diff --git a/src/initialization/InitAmrCore.cpp b/src/initialization/InitAmrCore.cpp
@@ -114,10 +114,10 @@ namespace details
         // set max_grid_size to blocking_factor to fix the number of boxes we generate
         amrex::ParmParse pp_amr("amr");
         bool const has_max_grid_size =
-                pp_amr.countRecords("max_grid_size") > 0 ||
-                pp_amr.countRecords("max_grid_size_x") > 0 ||
-                pp_amr.countRecords("max_grid_size_y") > 0 ||
-                pp_amr.countRecords("max_grid_size_z") > 0;
+                pp_amr.countname("max_grid_size") > 0 ||
+                pp_amr.countname("max_grid_size_x") > 0 ||
+                pp_amr.countname("max_grid_size_y") > 0 ||
+                pp_amr.countname("max_grid_size_z") > 0;
         amrex::Vector<int> const bf_lvl0(amr_info.blocking_factor[0].begin(), amr_info.blocking_factor[0].end());
         auto bf_lvl0_iv = amrex::IntVect(bf_lvl0[0]);
         if (!has_max_grid_size) {

diff --git a/src/particles/spacecharge/PoissonSolve.cpp b/src/particles/spacecharge/PoissonSolve.cpp
@@ -108,6 +108,7 @@ namespace impactx::spacecharge
             pc.GetParGDB()->Geom(),
             pc.GetParGDB()->DistributionMap(),
             pc.GetParGDB()->boxArray(),
+            ablastr::utils::enums::GridType::Collocated,
             poisson_boundary_handler,
             is_solver_igf_on_lev0,
             do_single_precision_comms,