From a51ecfbe52192944dc4a3abd6bb65bb42c18ecde Mon Sep 17 00:00:00 2001 From: Matthew Bettencourt Date: Fri, 30 Jul 2021 07:48:24 -0600 Subject: [PATCH] Have all mesh tests passing --- ...parallel_periodic_local_mesh_utilities.cpp | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/packages/panzer/adapters-stk/test/local_mesh/parallel_periodic_local_mesh_utilities.cpp b/packages/panzer/adapters-stk/test/local_mesh/parallel_periodic_local_mesh_utilities.cpp index 6e67ee56a913..7455d92074af 100644 --- a/packages/panzer/adapters-stk/test/local_mesh/parallel_periodic_local_mesh_utilities.cpp +++ b/packages/panzer/adapters-stk/test/local_mesh/parallel_periodic_local_mesh_utilities.cpp @@ -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; @@ -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; @@ -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; @@ -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); } @@ -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; @@ -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; @@ -301,9 +311,9 @@ 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); } @@ -311,6 +321,8 @@ TEUCHOS_UNIT_TEST(parallelPeriodicLocalMeshUtilities, 1D_mesh) { 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; @@ -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); } }