Skip to content

Commit adbc821

Browse files
committed
Fix handling of partial_lo/hi cases for polygonal adjsets
1 parent 1f5d42d commit adbc821

3 files changed

Lines changed: 223 additions & 90 deletions

File tree

src/libs/blueprint/conduit_blueprint_mesh_partition.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9356,9 +9356,16 @@ combine(const std::vector<const Node*>& in_adjsets,
93569356
Node tmp_dom;
93579357
for(size_t iadj = 0; iadj < in_adjsets.size(); iadj++)
93589358
{
9359-
const Node& adjset = *in_adjsets[iadj];
9360-
local_cnk_idx[in_chunk_ids[iadj]] = iadj;
9361-
attach_chunk_adjset_to_single_dom(tmp_dom, in_chunk_ids[iadj], &adjset);
9359+
local_cnk_idx[in_chunk_ids[iadj]] = static_cast<index_t>(iadj);
9360+
9361+
const Node *adjset = in_adjsets[iadj];
9362+
if(adjset == nullptr)
9363+
{
9364+
// Valid: this input chunk has no adjsets to contribute.
9365+
continue;
9366+
}
9367+
9368+
attach_chunk_adjset_to_single_dom(tmp_dom, in_chunk_ids[iadj], adjset);
93629369
}
93639370

93649371
for (const auto& adjset : tmp_dom["adjsets"].children())

src/libs/blueprint/conduit_blueprint_mesh_utils.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,15 +1181,13 @@ connectivity::connect_elements_2d(const Node& ref_win,
11811181
else
11821182
{
11831183
++jstart;
1184-
new_vertex += ratio - part_lo;
11851184
}
11861185
}
11871186
if (part_hi > 1)
11881187
{
11891188
if (flip)
11901189
{
11911190
++jstart;
1192-
new_vertex += ratio - part_hi;
11931191
}
11941192
else
11951193
{
@@ -1264,15 +1262,13 @@ connectivity::connect_elements_2d(const Node& ref_win,
12641262
else
12651263
{
12661264
++istart;
1267-
new_vertex += ratio - part_lo;
12681265
}
12691266
}
12701267
if (part_hi > 1)
12711268
{
12721269
if (flip)
12731270
{
12741271
++istart;
1275-
new_vertex += ratio - part_hi;
12761272
}
12771273
else
12781274
{
@@ -5071,4 +5067,3 @@ void CONDUIT_BLUEPRINT_API lerp(const Node& As,
50715067
//-----------------------------------------------------------------------------
50725068
// -- end conduit:: --
50735069
//-----------------------------------------------------------------------------
5074-

0 commit comments

Comments
 (0)