From: David Wells Date: Mon, 11 Sep 2017 02:52:27 +0000 (-0400) Subject: Rename add_new_points as get_new_points. X-Git-Tag: v9.0.0-rc1~1099^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2893c0288299588c4f7ac2cb3fc519b7ccf97300;p=dealii.git Rename add_new_points as get_new_points. This function no longer appends new points to a vector so a name change is in order. --- diff --git a/include/deal.II/grid/manifold.h b/include/deal.II/grid/manifold.h index 8febab0547..64e12e0f43 100644 --- a/include/deal.II/grid/manifold.h +++ b/include/deal.II/grid/manifold.h @@ -419,7 +419,7 @@ public: */ virtual void - add_new_points (const ArrayView> &surrounding_points, + get_new_points (const ArrayView> &surrounding_points, const Table<2,double> &weights, ArrayView> new_points) const; @@ -738,7 +738,7 @@ public: */ virtual void - add_new_points (const ArrayView> &surrounding_points, + get_new_points (const ArrayView> &surrounding_points, const Table<2,double> &weights, ArrayView> new_points) const override; @@ -964,7 +964,7 @@ public: */ virtual void - add_new_points (const ArrayView> &surrounding_points, + get_new_points (const ArrayView> &surrounding_points, const Table<2,double> &weights, ArrayView> new_points) const override; /** diff --git a/include/deal.II/grid/manifold_lib.h b/include/deal.II/grid/manifold_lib.h index 23346d4147..6af780a6d0 100644 --- a/include/deal.II/grid/manifold_lib.h +++ b/include/deal.II/grid/manifold_lib.h @@ -619,7 +619,7 @@ private: * the case for PolarManifold but not for Spherical manifold, so be careful * when using the latter. In case the quality of the manifold is not good * enough, upon mesh refinement it may happen that the transformation to a - * chart inside the get_new_point() or add_new_points() methods produces + * chart inside the get_new_point() or get_new_points() methods produces * points that are outside the unit cell. Then this class throws an exception * of type Mapping::ExcTransformationFailed. In that case, the mesh should be * refined before attaching this class, as done in the following example: @@ -721,7 +721,7 @@ public: */ virtual void - add_new_points (const ArrayView> &surrounding_points, + get_new_points (const ArrayView> &surrounding_points, const Table<2,double> &weights, ArrayView> new_points) const override; diff --git a/source/fe/mapping_q_generic.cc b/source/fe/mapping_q_generic.cc index 4a3987ffb4..653d9d0c65 100644 --- a/source/fe/mapping_q_generic.cc +++ b/source/fe/mapping_q_generic.cc @@ -3821,7 +3821,7 @@ add_line_support_points (const typename Triangulation::cell_iterat const std::size_t n_rows = support_point_weights_perimeter_to_interior[0].size(0); a.resize(a.size() + n_rows); auto a_view = make_array_view(a.end() - n_rows, a.end()); - manifold.add_new_points(make_array_view(vertices.begin(), + manifold.get_new_points(make_array_view(vertices.begin(), vertices.end()), support_point_weights_perimeter_to_interior[0], a_view); @@ -3916,7 +3916,7 @@ add_quad_support_points(const Triangulation<3,3>::cell_iterator &cell, const std::size_t n_rows = support_point_weights_perimeter_to_interior[1].size(0); a.resize(a.size() + n_rows); auto a_view = make_array_view(a.end() - n_rows, a.end()); - face->get_manifold().add_new_points (make_array_view(tmp_points.begin(), + face->get_manifold().get_new_points (make_array_view(tmp_points.begin(), tmp_points.end()), support_point_weights_perimeter_to_interior[1], a_view); @@ -3959,7 +3959,7 @@ add_quad_support_points(const Triangulation<2,3>::cell_iterator &cell, const std::size_t n_rows = weights.size(0); a.resize(a.size() + n_rows); auto a_view = make_array_view(a.end() - n_rows, a.end()); - cell->get_manifold().add_new_points(make_array_view(vertices.begin(), + cell->get_manifold().get_new_points(make_array_view(vertices.begin(), vertices.end()), weights, a_view); @@ -4016,7 +4016,7 @@ compute_mapping_support_points(const typename Triangulation::cell_ const std::size_t n_rows = support_point_weights_cell.size(0); a.resize(a.size() + n_rows); auto a_view = make_array_view(a.end() - n_rows, a.end()); - cell->get_manifold().add_new_points(make_array_view(a.begin(), + cell->get_manifold().get_new_points(make_array_view(a.begin(), a.end() - n_rows), support_point_weights_cell, a_view); @@ -4040,7 +4040,7 @@ compute_mapping_support_points(const typename Triangulation::cell_ const std::size_t n_rows = support_point_weights_perimeter_to_interior[1].size(0); a.resize(a.size() + n_rows); auto a_view = make_array_view(a.end() - n_rows, a.end()); - cell->get_manifold().add_new_points(make_array_view(a.begin(), + cell->get_manifold().get_new_points(make_array_view(a.begin(), a.end() - n_rows), support_point_weights_perimeter_to_interior[1], a_view); @@ -4057,7 +4057,7 @@ compute_mapping_support_points(const typename Triangulation::cell_ const std::size_t n_rows = support_point_weights_perimeter_to_interior[2].size(0); a.resize(a.size() + n_rows); auto a_view = make_array_view(a.end() - n_rows, a.end()); - cell->get_manifold().add_new_points(make_array_view(a.begin(), + cell->get_manifold().get_new_points(make_array_view(a.begin(), a.end() - n_rows), support_point_weights_perimeter_to_interior[2], a_view); diff --git a/source/grid/manifold.cc b/source/grid/manifold.cc index c455a8a759..19940e1c06 100644 --- a/source/grid/manifold.cc +++ b/source/grid/manifold.cc @@ -116,7 +116,7 @@ get_new_point (const ArrayView> &surrounding_points, template void Manifold:: -add_new_points (const ArrayView> &surrounding_points, +get_new_points (const ArrayView> &surrounding_points, const Table<2,double> &weights, ArrayView> new_points) const { @@ -573,7 +573,7 @@ get_new_point (const ArrayView> &surrounding_points, template void FlatManifold:: -add_new_points (const ArrayView> &surrounding_points, +get_new_points (const ArrayView> &surrounding_points, const Table<2,double> &weights, ArrayView> new_points) const { @@ -731,7 +731,7 @@ get_new_point (const ArrayView> &surrounding_points, template void ChartManifold:: -add_new_points (const ArrayView> &surrounding_points, +get_new_points (const ArrayView> &surrounding_points, const Table<2,double> &weights, ArrayView> new_points) const { @@ -745,7 +745,7 @@ add_new_points (const ArrayView> &surrounding_points, chart_points[i] = pull_back(surrounding_points[i]); boost::container::small_vector, 200> new_points_on_chart(weights.size(0)); - sub_manifold.add_new_points(make_array_view(chart_points.begin(), + sub_manifold.get_new_points(make_array_view(chart_points.begin(), chart_points.end()), weights, make_array_view(new_points_on_chart.begin(), diff --git a/source/grid/manifold_lib.cc b/source/grid/manifold_lib.cc index fd8c68c321..7de1cede1a 100644 --- a/source/grid/manifold_lib.cc +++ b/source/grid/manifold_lib.cc @@ -1146,7 +1146,7 @@ TransfiniteInterpolationManifold template void TransfiniteInterpolationManifold:: -add_new_points (const ArrayView> &surrounding_points, +get_new_points (const ArrayView> &surrounding_points, const Table<2,double> &weights, ArrayView > new_points) const { @@ -1159,7 +1159,7 @@ add_new_points (const ArrayView> &surrounding_points, const auto cell = compute_chart_points(surrounding_points, chart_points_view); boost::container::small_vector, 100> new_points_on_chart(weights.size(0)); - chart_manifold.add_new_points(chart_points_view, + chart_manifold.get_new_points(chart_points_view, weights, make_array_view(new_points_on_chart.begin(), new_points_on_chart.end()));