From: Wolfgang Bangerth Date: Mon, 1 Nov 2021 19:18:44 +0000 (-0600) Subject: Update general node lookup routine. X-Git-Tag: v9.4.0-rc1~867^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f5355d7ac075eadeb00c6d667ec379daf517f0c;p=dealii.git Update general node lookup routine. --- diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc index fe4ef1eee9..6a44dd6db0 100644 --- a/source/base/data_out_base.cc +++ b/source/base/data_out_base.cc @@ -799,38 +799,47 @@ namespace // instead. template inline Point - compute_arbitrary_node(const DataOutBase::Patch &patch, - const unsigned int point_no) + get_node_location(const DataOutBase::Patch &patch, + const unsigned int node_index) { - Point node; - - unsigned int point_no_actual = point_no; - + // Due to a historical accident, we are using a different indexing + // for pyramids in this file than we do where we create patches. + // So translate if necessary. + unsigned int point_no_actual = node_index; if (patch.reference_cell == ReferenceCells::Pyramid) { AssertDimension(patch.n_subdivisions, 1); static const std::array table = {{0, 1, 3, 2, 4}}; - point_no_actual = table[point_no]; + point_no_actual = table[node_index]; } + // If the patch stores the locations of nodes (rather than of only the + // vertices), then obtain the location by direct lookup. if (patch.points_are_available) { + Point node; for (unsigned int d = 0; d < spacedim; ++d) node[d] = patch.data(patch.data.size(0) - spacedim + d, point_no_actual); return node; } else + // The patch does not store node locations, so we have to interpolate + // between its vertices. This isn't currently implemented for anything + // other than one subdivision, but would go here. + // + // For n_subdivisions==1, the locations are simply those of vertices, so + // get the information from there. { AssertDimension(patch.n_subdivisions, 1); - node = patch.vertices[point_no_actual]; + return patch.vertices[point_no_actual]; } - - return node; } + + /** * Given (i,j,k) coordinates within the Lagrange quadrilateral, return an * offset into the local connectivity array. @@ -875,6 +884,8 @@ namespace return offset + (i - 1) + (order[0] - 1) * ((j - 1)); } + + /** * Given (i,j,k) coordinates within the Lagrange hexahedron, return an * offset into the local connectivity array. @@ -947,6 +958,8 @@ namespace (order[0] - 1) * ((j - 1) + (order[1] - 1) * ((k - 1))); } + + int vtk_point_index_from_ijk(const unsigned, const unsigned, @@ -957,6 +970,8 @@ namespace return 0; } + + int vtk_point_index_from_ijk(const unsigned, const unsigned, @@ -968,6 +983,7 @@ namespace } + template static void compute_sizes(const std::vector> &patches, @@ -999,6 +1015,8 @@ namespace } } + + template static void compute_sizes(const std::vector> &patches, @@ -2768,13 +2786,12 @@ namespace DataOutBase { for (unsigned int point_no = 0; point_no < patch.data.n_cols(); ++point_no) - out.write_point( - count++, - compute_arbitrary_node(patch, - (patch.reference_cell == - ReferenceCells::Pyramid ? - table[point_no] : - point_no))); + out.write_point(count++, + get_node_location(patch, + (patch.reference_cell == + ReferenceCells::Pyramid ? + table[point_no] : + point_no))); } else { @@ -3824,20 +3841,20 @@ namespace DataOutBase // // This also matches the example here: // https://stackoverflow.com/questions/42784369/drawing-triangular-mesh-using-gnuplot - out << compute_arbitrary_node(patch, 0) << ' '; + out << get_node_location(patch, 0) << ' '; output_point_data(0); out << '\n'; - out << compute_arbitrary_node(patch, 1) << ' '; + out << get_node_location(patch, 1) << ' '; output_point_data(1); out << '\n'; out << '\n'; // end of one row of points - out << compute_arbitrary_node(patch, 2) << ' '; + out << get_node_location(patch, 2) << ' '; output_point_data(2); out << '\n'; - out << compute_arbitrary_node(patch, 2) << ' '; + out << get_node_location(patch, 2) << ' '; output_point_data(2); out << '\n'; out << '\n'; // end of the second row of points