diff --git a/src/coordinates/uniform_cartesian.hpp b/src/coordinates/uniform_cartesian.hpp index 935430fa3406..b10cbe0ad06c 100644 --- a/src/coordinates/uniform_cartesian.hpp +++ b/src/coordinates/uniform_cartesian.hpp @@ -165,9 +165,12 @@ class UniformCartesian { template KOKKOS_FORCEINLINE_FUNCTION Real X(const int idx) const { using TE = TopologicalElement; - [[maybe_unused]] bool constexpr X1EDGE = el == TE::F1 || el == TE::E2 || el == TE::E3 || el == TE::NN; - [[maybe_unused]] bool constexpr X2EDGE = el == TE::F2 || el == TE::E3 || el == TE::E1 || el == TE::NN; - [[maybe_unused]] bool constexpr X3EDGE = el == TE::F3 || el == TE::E1 || el == TE::E2 || el == TE::NN; + [[maybe_unused]] bool constexpr X1EDGE = + el == TE::F1 || el == TE::E2 || el == TE::E3 || el == TE::NN; + [[maybe_unused]] bool constexpr X2EDGE = + el == TE::F2 || el == TE::E3 || el == TE::E1 || el == TE::NN; + [[maybe_unused]] bool constexpr X3EDGE = + el == TE::F3 || el == TE::E1 || el == TE::E2 || el == TE::NN; if constexpr (dir == X1DIR && X1EDGE) { return xmin_[dir - 1] + idx * dx_[dir - 1]; // idx - 1/2 } else if constexpr (dir == X2DIR && X2EDGE) { diff --git a/src/mesh/logical_location.cpp b/src/mesh/logical_location.cpp index cd60f4ecf19b..8b5797bd3355 100644 --- a/src/mesh/logical_location.cpp +++ b/src/mesh/logical_location.cpp @@ -220,9 +220,12 @@ std::unordered_set LogicalLocation::GetPossibleNeighborsImpl( const int extra1 = (rg_info.n[0] % down_shift > 0); const int extra2 = (rg_info.n[1] % down_shift > 0); const int extra3 = (rg_info.n[2] % down_shift > 0); - int n1_cells_level = std::max(n_per_root_block * (rg_info.n[0] / down_shift + extra1), 1); - int n2_cells_level = std::max(n_per_root_block * (rg_info.n[1] / down_shift + extra2), 1); - int n3_cells_level = std::max(n_per_root_block * (rg_info.n[2] / down_shift + extra3), 1); + int n1_cells_level = + std::max(n_per_root_block * (rg_info.n[0] / down_shift + extra1), 1); + int n2_cells_level = + std::max(n_per_root_block * (rg_info.n[1] / down_shift + extra2), 1); + int n3_cells_level = + std::max(n_per_root_block * (rg_info.n[2] / down_shift + extra3), 1); for (int i : irange) { for (int j : jrange) { for (int k : krange) { diff --git a/src/mesh/mesh-gmg.cpp b/src/mesh/mesh-gmg.cpp index 21c98e017e2e..c825d6a9167c 100644 --- a/src/mesh/mesh-gmg.cpp +++ b/src/mesh/mesh-gmg.cpp @@ -183,11 +183,12 @@ void Mesh::BuildGMGHierarchy(int nbs, ParameterInput *pin, ApplicationInput *app BoundaryFlag block_bcs[6]; auto block_size = block_size_default; SetBlockSizeAndBoundaries(loc, block_size, block_bcs); - printf("gid = %i gmg_level = %i loc.level() = %i nx = (%i, %i) l=(%i, %i) x1=(%e, %e) x2=(%e, " - "%e)\n", gid_rank.first, - gmg_level, loc.level(), block_size.nx(X1DIR), block_size.nx(X2DIR), - loc.lx1(), loc.lx2(), block_size.xmin(X1DIR), block_size.xmax(X1DIR), - block_size.xmin(X2DIR), block_size.xmax(X2DIR)); + printf("gid = %i gmg_level = %i loc.level() = %i nx = (%i, %i) l=(%i, %i) " + "x1=(%e, %e) x2=(%e, " + "%e)\n", + gid_rank.first, gmg_level, loc.level(), block_size.nx(X1DIR), + block_size.nx(X2DIR), loc.lx1(), loc.lx2(), block_size.xmin(X1DIR), + block_size.xmax(X1DIR), block_size.xmin(X2DIR), block_size.xmax(X2DIR)); gmg_block_lists[gmg_level].push_back( MeshBlock::Make(gid_rank.first, -1, loc, block_size, block_bcs, this, pin, app_in, packages, resolved_packages, gflag));