Skip to content

Commit

Permalink
Have all mesh tests passing
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Bettencourt committed Jul 30, 2021
1 parent 5590ce5 commit a51ecfb
Showing 1 changed file with 30 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ TEUCHOS_UNIT_TEST(parallelPeriodicLocalMeshUtilities, 1D_mesh)

{
const auto & block = mesh_info->element_blocks.at("eblock-0");
auto global_cells_h = Kokkos::create_mirror_view(block.global_cells);
Kokkos::deep_copy(global_cells_h, block.global_cells);

out << "Element Block eblock-0" << std::endl;

Expand All @@ -183,15 +185,17 @@ TEUCHOS_UNIT_TEST(parallelPeriodicLocalMeshUtilities, 1D_mesh)
TEST_EQUALITY(block.num_owned_cells, 2);
TEST_EQUALITY(block.num_ghstd_cells, 2);
TEST_EQUALITY(block.num_virtual_cells, 0);
TEST_EQUALITY((int) block.global_cells(0), 0);
TEST_EQUALITY((int) block.global_cells(1), 1);
TEST_EQUALITY((int) block.global_cells(2), 2);
TEST_EQUALITY((int) block.global_cells(3), 5);
TEST_EQUALITY((int) global_cells_h(0), 0);
TEST_EQUALITY((int) global_cells_h(1), 1);
TEST_EQUALITY((int) global_cells_h(2), 2);
TEST_EQUALITY((int) global_cells_h(3), 5);
TEST_ASSERT(block.has_connectivity);
}

{
const auto & block = mesh_info->element_blocks.at("eblock-1");
auto global_cells_h = Kokkos::create_mirror_view(block.global_cells);
Kokkos::deep_copy(global_cells_h, block.global_cells);

out << "Element Block eblock-1" << std::endl;

Expand All @@ -215,15 +219,17 @@ TEUCHOS_UNIT_TEST(parallelPeriodicLocalMeshUtilities, 1D_mesh)
TEST_EQUALITY(block.num_owned_cells, 2);
TEST_EQUALITY(block.num_ghstd_cells, 2);
TEST_EQUALITY(block.num_virtual_cells, 0);
TEST_EQUALITY((int) block.global_cells(0), 3);
TEST_EQUALITY((int) block.global_cells(1), 4);
TEST_EQUALITY((int) block.global_cells(2), 5);
TEST_EQUALITY((int) block.global_cells(3), 2);
TEST_EQUALITY((int) global_cells_h(0), 3);
TEST_EQUALITY((int) global_cells_h(1), 4);
TEST_EQUALITY((int) global_cells_h(2), 5);
TEST_EQUALITY((int) global_cells_h(3), 2);
TEST_ASSERT(block.has_connectivity);
}

{
const auto & block = mesh_info->sidesets.at("eblock-0").at("left");
auto global_cells_h = Kokkos::create_mirror_view(block.global_cells);
Kokkos::deep_copy(global_cells_h, block.global_cells);

out << "Sideset eblock-0 left" << std::endl;

Expand All @@ -237,8 +243,8 @@ TEUCHOS_UNIT_TEST(parallelPeriodicLocalMeshUtilities, 1D_mesh)
TEST_EQUALITY(block.num_owned_cells, 1);
TEST_EQUALITY(block.num_ghstd_cells, 1);
TEST_EQUALITY(block.num_virtual_cells, 0);
TEST_EQUALITY((int) block.global_cells(0), 0);
TEST_EQUALITY((int) block.global_cells(1), 5);
TEST_EQUALITY((int) global_cells_h(0), 0);
TEST_EQUALITY((int) global_cells_h(1), 5);
TEST_ASSERT(block.has_connectivity);
}

Expand All @@ -247,6 +253,8 @@ TEUCHOS_UNIT_TEST(parallelPeriodicLocalMeshUtilities, 1D_mesh)
} else {
{
const auto & block = mesh_info->element_blocks.at("eblock-0");
auto global_cells_h = Kokkos::create_mirror_view(block.global_cells);
Kokkos::deep_copy(global_cells_h, block.global_cells);

out << "Element Block eblock-0" << std::endl;

Expand All @@ -270,14 +278,16 @@ TEUCHOS_UNIT_TEST(parallelPeriodicLocalMeshUtilities, 1D_mesh)
TEST_EQUALITY(block.num_owned_cells, 1);
TEST_EQUALITY(block.num_ghstd_cells, 2);
TEST_EQUALITY(block.num_virtual_cells, 0);
TEST_EQUALITY((int) block.global_cells(0), 2);
TEST_EQUALITY((int) block.global_cells(1), 3);
TEST_EQUALITY((int) block.global_cells(2), 1);
TEST_EQUALITY((int) global_cells_h(0), 2);
TEST_EQUALITY((int) global_cells_h(1), 3);
TEST_EQUALITY((int) global_cells_h(2), 1);
TEST_ASSERT(block.has_connectivity);
}

{
const auto & block = mesh_info->element_blocks.at("eblock-1");
auto global_cells_h = Kokkos::create_mirror_view(block.global_cells);
Kokkos::deep_copy(global_cells_h, block.global_cells);

out << "Element Block eblock-1" << std::endl;

Expand All @@ -301,16 +311,18 @@ TEUCHOS_UNIT_TEST(parallelPeriodicLocalMeshUtilities, 1D_mesh)
TEST_EQUALITY(block.num_owned_cells, 1);
TEST_EQUALITY(block.num_ghstd_cells, 2);
TEST_EQUALITY(block.num_virtual_cells, 0);
TEST_EQUALITY((int) block.global_cells(0), 5);
TEST_EQUALITY((int) block.global_cells(1), 0);
TEST_EQUALITY((int) block.global_cells(2), 4);
TEST_EQUALITY((int) global_cells_h(0), 5);
TEST_EQUALITY((int) global_cells_h(1), 0);
TEST_EQUALITY((int) global_cells_h(2), 4);
TEST_ASSERT(block.has_connectivity);
}

// TEUCHOS_ASSERT(mesh_info->sidesets.find("eblock-0") == mesh_info->sidesets.end());

{
const auto & block = mesh_info->sidesets.at("eblock-1").at("right");
auto global_cells_h = Kokkos::create_mirror_view(block.global_cells);
Kokkos::deep_copy(global_cells_h, block.global_cells);

out << "Sideset eblock-1 right" << std::endl;

Expand All @@ -324,8 +336,8 @@ TEUCHOS_UNIT_TEST(parallelPeriodicLocalMeshUtilities, 1D_mesh)
TEST_EQUALITY(block.num_owned_cells, 1);
TEST_EQUALITY(block.num_ghstd_cells, 1);
TEST_EQUALITY(block.num_virtual_cells, 0);
TEST_EQUALITY((int) block.global_cells(0), 5);
TEST_EQUALITY((int) block.global_cells(1), 0);
TEST_EQUALITY((int) global_cells_h(0), 5);
TEST_EQUALITY((int) global_cells_h(1), 0);
TEST_ASSERT(block.has_connectivity);
}
}
Expand Down

0 comments on commit a51ecfb

Please sign in to comment.