Skip to content

Commit

Permalink
fix minor bugs w/ blueprint's unstructured::generate_* functions (#651
Browse files Browse the repository at this point in the history
)
  • Loading branch information
xjrc authored Jan 15, 2021
1 parent f04d8fe commit 3539e80
Show file tree
Hide file tree
Showing 5 changed files with 1,152 additions and 560 deletions.
46 changes: 23 additions & 23 deletions src/docs/sphinx/t_conduit_docs_blueprint_demos_out.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Running main() from /Users/harrison37/Work/github/llnl/conduit/src/blt/thirdparty_builtin/googletest-master-2020-01-07/googletest/src/gtest_main.cc
Running main() from /g/g19/ciurej1/projects/conduit/src/blt/thirdparty_builtin/googletest-master-2020-01-07/googletest/src/gtest_main.cc
[==========] Running 10 tests from 1 test suite.
[----------] Global test environment set-up.
[----------] 10 tests from conduit_docs
Expand Down Expand Up @@ -29,9 +29,9 @@ fields:
values: [0.0, 1.0, 2.0, 3.0]

END_EXAMPLE("blueprint_demo_basic_uniform")
[/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
[/g/g19/ciurej1/projects/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
Testing Basic Example 'uniform'
[ OK ] conduit_docs.blueprint_demo_basic_uniform (18 ms)
[ OK ] conduit_docs.blueprint_demo_basic_uniform (8 ms)
[ RUN ] conduit_docs.blueprint_demo_basic_rectilinear
BEGIN_EXAMPLE("blueprint_demo_basic_rectilinear")

Expand All @@ -53,9 +53,9 @@ fields:
values: [0.0, 1.0, 2.0, 3.0]

END_EXAMPLE("blueprint_demo_basic_rectilinear")
[/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
[/g/g19/ciurej1/projects/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
Testing Basic Example 'rectilinear'
[ OK ] conduit_docs.blueprint_demo_basic_rectilinear (8 ms)
[ OK ] conduit_docs.blueprint_demo_basic_rectilinear (6 ms)
[ RUN ] conduit_docs.blueprint_demo_basic_structured
BEGIN_EXAMPLE("blueprint_demo_basic_structured")

Expand All @@ -81,9 +81,9 @@ fields:
values: [0.0, 1.0, 2.0, 3.0]

END_EXAMPLE("blueprint_demo_basic_structured")
[/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
[/g/g19/ciurej1/projects/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
Testing Basic Example 'structured'
[ OK ] conduit_docs.blueprint_demo_basic_structured (11 ms)
[ OK ] conduit_docs.blueprint_demo_basic_structured (6 ms)
[ RUN ] conduit_docs.blueprint_demo_basic_tris
BEGIN_EXAMPLE("blueprint_demo_basic_tris")

Expand All @@ -108,9 +108,9 @@ fields:
values: [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0]

END_EXAMPLE("blueprint_demo_basic_tris")
[/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
[/g/g19/ciurej1/projects/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
Testing Basic Example 'tris'
[ OK ] conduit_docs.blueprint_demo_basic_tris (8 ms)
[ OK ] conduit_docs.blueprint_demo_basic_tris (6 ms)
[ RUN ] conduit_docs.blueprint_demo_basic_quads
BEGIN_EXAMPLE("blueprint_demo_basic_quads")

Expand All @@ -135,9 +135,9 @@ fields:
values: [0.0, 1.0, 2.0, 3.0]

END_EXAMPLE("blueprint_demo_basic_quads")
[/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
[/g/g19/ciurej1/projects/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
Testing Basic Example 'quads'
[ OK ] conduit_docs.blueprint_demo_basic_quads (8 ms)
[ OK ] conduit_docs.blueprint_demo_basic_quads (6 ms)
[ RUN ] conduit_docs.blueprint_demo_basic_tets
BEGIN_EXAMPLE("blueprint_demo_basic_tets")

Expand All @@ -163,9 +163,9 @@ fields:
values: [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0, 33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0]

END_EXAMPLE("blueprint_demo_basic_tets")
[/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
[/g/g19/ciurej1/projects/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
Testing Basic Example 'tets'
[ OK ] conduit_docs.blueprint_demo_basic_tets (8 ms)
[ OK ] conduit_docs.blueprint_demo_basic_tets (7 ms)
[ RUN ] conduit_docs.blueprint_demo_basic_hexs
BEGIN_EXAMPLE("blueprint_demo_basic_hexs")

Expand All @@ -191,9 +191,9 @@ fields:
values: [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0]

END_EXAMPLE("blueprint_demo_basic_hexs")
[/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
[/g/g19/ciurej1/projects/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
Testing Basic Example 'hexs'
[ OK ] conduit_docs.blueprint_demo_basic_hexs (11 ms)
[ OK ] conduit_docs.blueprint_demo_basic_hexs (6 ms)
[ RUN ] conduit_docs.blueprint_demo_basic_polygons
BEGIN_EXAMPLE("blueprint_demo_basic_polygons")

Expand All @@ -220,9 +220,9 @@ fields:
values: [0.0, 1.0, 2.0, 3.0]

END_EXAMPLE("blueprint_demo_basic_polygons")
[/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
[/g/g19/ciurej1/projects/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
Testing Basic Example 'polygons'
[ OK ] conduit_docs.blueprint_demo_basic_polygons (10 ms)
[ OK ] conduit_docs.blueprint_demo_basic_polygons (7 ms)
[ RUN ] conduit_docs.blueprint_demo_basic_polyhedra
BEGIN_EXAMPLE("blueprint_demo_basic_polyhedra")

Expand All @@ -244,7 +244,7 @@ topologies:
offsets: [0, 6, 12, 18, 24, 30, 36, 42]
subelements:
shape: "polygonal"
connectivity: [0, 1, 4, 3, 0, 1, 10, 9, 1, 4, 13, 10, 4, 3, 12, 13, 3, 0, 9, 12, 9, 10, 13, 12, 1, 2, 5, 4, 1, 2, 11, 10, 2, 5, 14, 11, 5, 4, 13, 14, 10, 11, 14, 13, 3, 4, 7, 6, 4, 7, 16, 13, 7, 6, 15, 16, 6, 3, 12, 15, 12, 13, 16, 15, 4, 5, 8, 7, 5, 8, 17, 14, 8, 7, 16, 17, 13, 14, 17, 16, 9, 10, 19, 18, 10, 13, 22, 19, 13, 12, 21, 22, 12, 9, 18, 21, 18, 19, 22, 21, 10, 11, 20, 19, 11, 14, 23, 20, 14, 13, 22, 23, 19, 20, 23, 22, 13, 16, 25, 22, 16, 15, 24, 25, 15, 12, 21, 24, 21, 22, 25, 24, 14, 17, 26, 23, 17, 16, 25, 26, 22, 23, 26, 25]
connectivity: [0, 3, 4, 1, 0, 1, 10, 9, 1, 4, 13, 10, 4, 3, 12, 13, 3, 0, 9, 12, 9, 10, 13, 12, 1, 4, 5, 2, 1, 2, 11, 10, 2, 5, 14, 11, 5, 4, 13, 14, 10, 11, 14, 13, 3, 6, 7, 4, 4, 7, 16, 13, 7, 6, 15, 16, 6, 3, 12, 15, 12, 13, 16, 15, 4, 7, 8, 5, 5, 8, 17, 14, 8, 7, 16, 17, 13, 14, 17, 16, 9, 10, 19, 18, 10, 13, 22, 19, 13, 12, 21, 22, 12, 9, 18, 21, 18, 19, 22, 21, 10, 11, 20, 19, 11, 14, 23, 20, 14, 13, 22, 23, 19, 20, 23, 22, 13, 16, 25, 22, 16, 15, 24, 25, 15, 12, 21, 24, 21, 22, 25, 24, 14, 17, 26, 23, 17, 16, 25, 26, 22, 23, 26, 25]
sizes: [4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4]
offsets: [0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60, 64, 68, 72, 76, 80, 84, 88, 92, 96, 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140]
fields:
Expand All @@ -255,9 +255,9 @@ fields:
values: [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0]

END_EXAMPLE("blueprint_demo_basic_polyhedra")
[/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
[/g/g19/ciurej1/projects/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
Testing Basic Example 'polyhedra'
[ OK ] conduit_docs.blueprint_demo_basic_polyhedra (11 ms)
[ OK ] conduit_docs.blueprint_demo_basic_polyhedra (9 ms)
[ RUN ] conduit_docs.blueprint_demo_basic_uniform_complete
BEGIN_EXAMPLE("blueprint_demo_basic_uniform_complete")

Expand Down Expand Up @@ -288,9 +288,9 @@ fields:
values: [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0]

END_EXAMPLE("blueprint_demo_basic_uniform_complete")
[ OK ] conduit_docs.blueprint_demo_basic_uniform_complete (8 ms)
[----------] 10 tests from conduit_docs (102 ms total)
[ OK ] conduit_docs.blueprint_demo_basic_uniform_complete (10 ms)
[----------] 10 tests from conduit_docs (71 ms total)

[----------] Global test environment tear-down
[==========] 10 tests from 1 test suite ran. (102 ms total)
[==========] 10 tests from 1 test suite ran. (71 ms total)
[ PASSED ] 10 tests.
Loading

0 comments on commit 3539e80

Please sign in to comment.