Skip to content

Commit 0637c59

Browse files
committed
replaced magic numbers
1 parent d3da127 commit 0637c59

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

test/testMPAppIDs.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ void testAppIDPointer(MPMesh_ptr p_mpmesh) {
2525
auto added_mpIDs_d = create_mirror_view_and_copy(added_mpIDs.data(), numAddedMPs);
2626

2727
//Maps used to check values after rebuild
28-
Kokkos::UnorderedMap<int, int> added_MPs_data(numAddedMPs+1);
28+
Kokkos::UnorderedMap<int, int> added_MPs_data(numAddedMPs);
2929
Kokkos::parallel_for("set added_MPs_data", numAddedMPs, KOKKOS_LAMBDA (const int i) {
3030
added_MPs_data.insert(added_mpIDs_d(i), added_mp2Elm_d(i));
3131
});
3232

33-
Kokkos::UnorderedMap<int, int> old_MPs_data(numAddedMPs+1);
33+
int numOldMPs= p_MPs->getCount();
34+
Kokkos::UnorderedMap<int, int> old_MPs_data(numOldMPs);
3435
auto oldAppIDs = p_MPs->getData<polyMPO::MPF_MP_APP_ID>();
3536
auto setOldAppIDs = PS_LAMBDA(const int& e, const int& mp, const int& mask) {
3637
if(mask)
@@ -41,6 +42,7 @@ void testAppIDPointer(MPMesh_ptr p_mpmesh) {
4142
p_MPs->rebuild(added_mp2Elm_d, added_mpIDs_d);
4243

4344
//Assert rebuild worked
45+
int elm_invalid= -1;
4446
auto newAppID = p_MPs->getData<polyMPO::MPF_MP_APP_ID>();
4547
Kokkos::View<int*> numAddedMPsAfter("numAddedMPsAfter", 1);
4648
auto checkAddedMPs = PS_LAMBDA(const int& e, const int& mp, const int& mask) {
@@ -49,12 +51,12 @@ void testAppIDPointer(MPMesh_ptr p_mpmesh) {
4951
int index = added_MPs_data.find(newAppID(mp));
5052
Kokkos::atomic_increment(&numAddedMPsAfter(0));
5153
assert(e == added_MPs_data.value_at(index));
52-
added_MPs_data.insert(newAppID(mp), -1); //reset
54+
added_MPs_data.insert(newAppID(mp), elm_invalid); //reset
5355
}
5456
else if (old_MPs_data.exists(newAppID(mp))) {
5557
int index = old_MPs_data.find(newAppID(mp));
5658
assert(e == old_MPs_data.value_at(index));
57-
old_MPs_data.insert(newAppID(mp), -1); //reset
59+
old_MPs_data.insert(newAppID(mp), elm_invalid); //reset
5860
}
5961
else Kokkos::abort("Material point in wrong place!\n");
6062
}

0 commit comments

Comments
 (0)