From a9b8e2f420004f27f3dad7818f66efe86d5e7ce0 Mon Sep 17 00:00:00 2001 From: Justin Privitera Date: Thu, 16 May 2024 15:20:28 -0700 Subject: [PATCH] checked all these in visit --- src/tests/relay/t_relay_io_silo.cpp | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/tests/relay/t_relay_io_silo.cpp b/src/tests/relay/t_relay_io_silo.cpp index dc9ca95b8..33227bb45 100644 --- a/src/tests/relay/t_relay_io_silo.cpp +++ b/src/tests/relay/t_relay_io_silo.cpp @@ -88,17 +88,17 @@ TEST(conduit_relay_io_silo, load_mesh_geometry) std::vector filename_vec = { "box2d.silo", "box3d.silo", - // "diamond.silo", <--- TODO this one fails because polytopal is not yet supported + "diamond.silo", // TODO: rename these files to be more descriptive. // would also require modifying the paths stored within the files, // and re-symlinking "testDisk2D_a.silo", - // "donordiv.s2_materials2.silo", <--- TODO this one fails because polytopal is not yet supported + "donordiv.s2_materials2.silo", "donordiv.s2_materials3.silo" }; - std::vector dims_vec = {2, 3, /*2,*/ 2, /*2,*/ 2}; - std::vector coordset_length_vec = {4, 8, /*36,*/ 1994, /*16,*/ 961}; - std::vector topology_length_vec = {1, 1, /*33,*/ 1920, /*9,*/ 900}; + std::vector dims_vec = {2, 3, 2, 2, 2, 2}; + std::vector coordset_length_vec = {4, 8, 36, 1994, 16, 961}; + std::vector topology_length_vec = {1, 1, 33, 1920, 9, 900}; for (int i = 0; i < filename_vec.size(); ++i) { Node mesh, info; @@ -1899,14 +1899,12 @@ TEST(conduit_relay_io_silo, read_overlink_symlink_format) {".", "box2d", ".silo", "MMESH"}, {".", "box3d", ".silo", "" }, // test default case {".", "box3d", ".silo", "MMESH"}, - // {".", "diamond", ".silo", "" }, // test default case - // {".", "diamond", ".silo", "MMESH"}, - // fails b/c polytopal not yet supported + {".", "diamond", ".silo", "" }, // test default case + {".", "diamond", ".silo", "MMESH"}, {".", "testDisk2D_a", ".silo", "" }, // test default case {".", "testDisk2D_a", ".silo", "MMESH"}, - // {".", "donordiv.s2_materials2", ".silo", "" }, // test default case - // {".", "donordiv.s2_materials2", ".silo", "MMESH"}, - // fails b/c polytopal not yet supported + {".", "donordiv.s2_materials2", ".silo", "" }, // test default case + {".", "donordiv.s2_materials2", ".silo", "MMESH"}, {".", "donordiv.s2_materials3", ".silo", "" }, // test default case {".", "donordiv.s2_materials3", ".silo", "MMESH"}, }; @@ -1953,12 +1951,12 @@ TEST(conduit_relay_io_silo, read_overlink_directly) {"box2d", "OvlTop", ".silo", "MMESH"}, {"box3d", "OvlTop", ".silo", "" }, // test default case {"box3d", "OvlTop", ".silo", "MMESH"}, - // {"diamond", "OvlTop", ".silo", "" }, // test default case - // {"diamond", "OvlTop", ".silo", "MMESH"}, + {"diamond", "OvlTop", ".silo", "" }, // test default case + {"diamond", "OvlTop", ".silo", "MMESH"}, {"testDisk2D_a", "OvlTop", ".silo", "" }, // test default case {"testDisk2D_a", "OvlTop", ".silo", "MMESH"}, - // {"donordiv.s2_materials2", "OvlTop", ".silo", "" }, // test default case - // {"donordiv.s2_materials2", "OvlTop", ".silo", "MMESH"}, + {"donordiv.s2_materials2", "OvlTop", ".silo", "" }, // test default case + {"donordiv.s2_materials2", "OvlTop", ".silo", "MMESH"}, {"donordiv.s2_materials3", "OvlTop", ".silo", "" }, // test default case {"donordiv.s2_materials3", "OvlTop", ".silo", "MMESH"}, };