|
59 | 59 | ArrayContext, |
60 | 60 | with_container_arithmetic, |
61 | 61 | dataclass_array_container, |
62 | | - get_container_context_recursively, |
| 62 | + get_container_context_recursively_opt, |
63 | 63 | to_numpy, |
64 | 64 | from_numpy) |
65 | 65 | from arraycontext.container import ArrayOrContainerT |
@@ -259,7 +259,7 @@ def bv_trace_pair( |
259 | 259 | DeprecationWarning, stacklevel=2) |
260 | 260 | dd = dof_desc.as_dofdesc(dd) |
261 | 261 | return bdry_trace_pair( |
262 | | - dcoll, dd, project(dcoll, "vol", dd, interior), exterior) |
| 262 | + dcoll, dd, project(dcoll, dd.domain_tag.volume_tag, dd, interior), exterior) |
263 | 263 |
|
264 | 264 | # }}} |
265 | 265 |
|
@@ -471,7 +471,7 @@ def inter_volume_trace_pairs(dcoll: DiscretizationCollection, |
471 | 471 | result[directional_vol_dd_pair] = [tpair] |
472 | 472 |
|
473 | 473 | for directional_vol_dd_pair, tpairs in cross_rank_tpairs.items(): |
474 | | - result.setdefault(directional_vol_dd_pair, []).append(tpairs) |
| 474 | + result.setdefault(directional_vol_dd_pair, []).extend(tpairs) |
475 | 475 |
|
476 | 476 | return result |
477 | 477 |
|
@@ -839,7 +839,7 @@ def cross_rank_trace_pairs( |
839 | 839 | assert len(remote_part_ids) == len( |
840 | 840 | {dcoll._part_id_helper.get_mpi_rank(part_id) for part_id in remote_part_ids}) |
841 | 841 |
|
842 | | - actx = get_container_context_recursively(ary) |
| 842 | + actx = get_container_context_recursively_opt(ary) |
843 | 843 |
|
844 | 844 | if actx is None: |
845 | 845 | # NOTE: Assumes that the same number is passed on every rank |
@@ -925,7 +925,7 @@ def cross_rank_inter_volume_trace_pairs( |
925 | 925 |
|
926 | 926 | for vol_data_pair in pairwise_volume_data.values(): |
927 | 927 | for vol_data in vol_data_pair: |
928 | | - actx = get_container_context_recursively(vol_data) |
| 928 | + actx = get_container_context_recursively_opt(vol_data) |
929 | 929 | if actx is not None: |
930 | 930 | break |
931 | 931 | if actx is not None: |
|
0 commit comments