Skip to content

Fix test_bnd.cxx #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JamesMcClung merged 3 commits into from
Apr 14, 2025
Merged

Fix test_bnd.cxx #349

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
128b8a4
test_bnd: rename n_nei
JamesMcClung Apr 11, 2025
493c6b9
test_bnd: rm unused vars
JamesMcClung Apr 11, 2025
c927006
test_bnd: fix/explain why n_neighbors=11
JamesMcClung Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions src/libpsc/tests/test_bnd.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,7 @@ TYPED_TEST(BndTest, AddGhosts)
for (int p = 0; p < mflds.n_patches(); p++) {
auto flds = make_Fields3d<dim_xyz>(
h_mflds.view(_all, _all, _all, _all, p), -grid.ibn);
int i0 = grid.patches[p].off[0];
int j0 = grid.patches[p].off[1];
int k0 = grid.patches[p].off[2];

grid.Foreach_3d(B, B, [&](int i, int j, int k) { flds(0, i, j, k) = 1; });
}
gt::copy(h_mflds, mflds.storage());
Expand All @@ -264,30 +262,37 @@ TYPED_TEST(BndTest, AddGhosts)
{
auto&& h_mflds = gt::host_mirror(mflds.storage());
gt::copy(mflds.storage(), h_mflds);

for (int p = 0; p < mflds.n_patches(); p++) {
auto flds = make_Fields3d<dim_xyz>(
h_mflds.view(_all, _all, _all, _all, p), -grid.ibn);
int j0 = grid.patches[p].off[1];
int k0 = grid.patches[p].off[2];
auto& ldims = grid.ldims;

grid.Foreach_3d(B, B, [&](int i, int j, int k) {
int n_nei = 0;
int n_neighbors_x = 0;
int n_neighbors_y = 0;
int n_neighbors_z = 0;

if (i >= 0 && i < ldims[0] && j >= 0 && j < ldims[1] && k >= 0 &&
k < ldims[2]) {
if (!dim::InvarX::value) {
if (i < B || i >= ldims[0] - B)
n_nei++;
n_neighbors_x += i < B;
n_neighbors_x += i >= ldims[0] - B;
}
if (j < B || j >= ldims[1] - B)
n_nei++;
if (k < B || k >= ldims[2] - B)
n_nei++;
if (n_nei == 2)
n_nei = 3; // edge -> diagonal contribution, too
else if (n_nei == 3)
n_nei = 11; // corner -> why? FIXME why not 7?

n_neighbors_y += j < B;
n_neighbors_y += j >= ldims[1] - B;

n_neighbors_z += k < B;
n_neighbors_z += k >= ldims[2] - B;
}
EXPECT_EQ(flds(0, i, j, k), 1 + n_nei)

int n_neighbors =
(n_neighbors_x + 1) * (n_neighbors_y + 1) * (n_neighbors_z + 1) - 1;

EXPECT_EQ(flds(0, i, j, k), 1 + n_neighbors)
<< "ijk " << i << " " << j << " " << k;
});
}
Expand Down