Skip to content

Shape map verify tests for int64 and int32 case #1663

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

Open
JustinPrivitera wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Shape map verify tests for int64 and int32 case #1663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 45 additions & 0 deletions src/tests/blueprint/python/t_python_blueprint_mesh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,51 @@ def test_convert(self):
conduit.blueprint.mesh.convert(n, options, output)
conduit.blueprint.mesh.convert(n, options, output, maps)

def test_shape_map_int64_verify(self):
mesh = conduit.Node()
conduit.blueprint.mesh.examples.braid("mixed_2d", 2, 2, 0, mesh)
# state:
# ...
# coordsets:
# ...
# topologies:
# mesh:
# type: "unstructured"
# coordset: "coords"
# elements:
# shape: "mixed"
# shape_map:
# quad: 9
# tri: 5
# shapes: ...
# sizes: ...
# offsets: ...
# connectivity: ...
# fields:
# ...

info = conduit.Node()

quadnode = mesh.fetch("topologies/mesh/elements/shape_map/quad")
self.assertTrue(conduit.DataType.is_int32(quadnode.dtype()))
trinode = mesh.fetch("topologies/mesh/elements/shape_map/tri")
self.assertTrue(conduit.DataType.is_int32(trinode.dtype()))

self.assertTrue(conduit.blueprint.mesh.verify(mesh, info))

mesh["topologies/mesh/elements/shape_map"].remove_child("quad")
mesh["topologies/mesh/elements/shape_map"].remove_child("tri")
mesh["topologies/mesh/elements/shape_map/quad"].set(conduit.DataType.int64(1))
mesh["topologies/mesh/elements/shape_map/quad"] = 9
mesh["topologies/mesh/elements/shape_map/tri"].set(conduit.DataType.int64(1))
mesh["topologies/mesh/elements/shape_map/tri"] = 5

quadnode = mesh.fetch("topologies/mesh/elements/shape_map/quad")
self.assertTrue(conduit.DataType.is_int64(quadnode.dtype()))
trinode = mesh.fetch("topologies/mesh/elements/shape_map/tri")
self.assertTrue(conduit.DataType.is_int64(trinode.dtype()))

self.assertTrue(conduit.blueprint.mesh.verify(mesh, info))

if __name__ == '__main__':
unittest.main()
Expand Down
42 changes: 42 additions & 0 deletions src/tests/blueprint/t_blueprint_mesh_verify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2734,3 +2734,45 @@ TEST(conduit_blueprint_mesh_verify, empty_mesh_vs_gen_index)

}

//-----------------------------------------------------------------------------
TEST(conduit_blueprint_mesh_verify, shape_map_int64_entries)
{
Node mesh, info;
blueprint::mesh::examples::braid("mixed_2d", 2, 2, 0, mesh);

// state:
// ...
// coordsets:
// ...
// topologies:
// mesh:
// type: "unstructured"
// coordset: "coords"
// elements:
// shape: "mixed"
// shape_map:
// quad: 9
// tri: 5
// shapes: [5, 5]
// sizes: [3, 3]
// offsets: [0, 3]
// connectivity: [0, 1, 3, ..., 3, 2]
// fields:
// ...

EXPECT_EQ(mesh["topologies/mesh/elements/shape_map/quad"].dtype().id(), CONDUIT_INT32_ID);
EXPECT_EQ(mesh["topologies/mesh/elements/shape_map/tri"].dtype().id(), CONDUIT_INT32_ID);

EXPECT_TRUE(blueprint::mesh::verify(mesh, info));

mesh["topologies/mesh/elements/shape_map"].remove_child("quad");
mesh["topologies/mesh/elements/shape_map"].remove_child("tri");

mesh["topologies/mesh/elements/shape_map/quad"].set(static_cast<int64>(9));
EXPECT_EQ(mesh["topologies/mesh/elements/shape_map/quad"].dtype().id(), CONDUIT_INT64_ID);
mesh["topologies/mesh/elements/shape_map/tri"].set(static_cast<int64>(5));
EXPECT_EQ(mesh["topologies/mesh/elements/shape_map/tri"].dtype().id(), CONDUIT_INT64_ID);

EXPECT_TRUE(blueprint::mesh::verify(mesh, info));
}

Loading