diff --git a/meshmode/discretization/connection/opposite_face.py b/meshmode/discretization/connection/opposite_face.py index 8c127bba3430b18ac75be8d6c5927c50d19ec2e6..98bee5c49d136b25c5baf94e4b46f4c9912f5f5d 100644 --- a/meshmode/discretization/connection/opposite_face.py +++ b/meshmode/discretization/connection/opposite_face.py @@ -451,13 +451,13 @@ def _make_cross_partition_batch(queue, vol_to_bdry_conns, basis_at_unit_nodes[i] = ( f(unit_nodes.reshape(dim, -1)) .reshape(n_tgt_unit_nodes)) - #intp_coeffs = src_inv_t_vdm @ basis_at_unit_nodes - intp_coeffs = np.einsum("ij,jk->ik", src_inv_t_vdm, basis_at_unit_nodes) + intp_coeffs = src_inv_t_vdm @ basis_at_unit_nodes + #intp_coeffs = np.einsum("ij,jk->ik", src_inv_t_vdm, basis_at_unit_nodes) # If we're interpolating 1, we had better get 1 back. one_deviation = np.abs(np.sum(intp_coeffs, axis=0) - 1) assert (one_deviation < tol).all(), np.max(one_deviation) - return np.einsum("ij,jk->ik", src_bdry_nodes, intp_coeffs) - #return src_bdry_nodes @ intp_coeffs.T + #return np.einsum("ij,jk,ik", src_bdry_nodes, intp_coeffs) + return src_bdry_nodes @ intp_coeffs def get_map_jacobian(unit_nodes): # unit_nodes: (dim, nto_unit_nodes) @@ -549,8 +549,6 @@ def make_partition_connection(vol_to_bdry_conns, part_meshes): from meshmode.discretization.connection import ( DirectDiscretizationConnection, DiscretizationConnectionElementGroup) - # Create a list of batches. Each batch contains interpolation - # data from one partition to another. for i_tgt_part, tgt_vol_conn in enumerate(vol_to_bdry_conns): # Is this ok in a loop? diff --git a/test/test_meshmode.py b/test/test_meshmode.py index f286177aaab361d87d1dca4e944c6b130784ec2a..613797ed2a35e40c9cc69ca862f4348f43570a53 100644 --- a/test/test_meshmode.py +++ b/test/test_meshmode.py @@ -60,7 +60,7 @@ def test_partition_interpolation(ctx_getter): from meshmode.mesh.generation import generate_regular_rect_mesh mesh = generate_regular_rect_mesh(a=(0, 0, 0), b=(1, 1, 1), n=(n, n, n)) #from meshmode.mesh.generation import generate_warped_rect_mesh - #mesh = generate_warped_rect_mesh(dim, order=order, n=n) + #mesh1 = generate_warped_rect_mesh(dim, order=order, n=n) #mesh2 = generate_warped_rect_mesh(dim, order=order, n=n) #from meshmode.mesh.processing import merge_disjoint_meshes @@ -95,8 +95,8 @@ def test_partition_interpolation(ctx_getter): connections = make_partition_connection(bdry_connections, part_meshes) from meshmode.discretization.connection import check_connection - #for conn in connections: - #check_connection(conn) + for conn in connections: + check_connection(conn) # }}}