From 39286dc3fe97ebe8357404912442e3e2aa97980b Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 24 Jan 2018 22:40:03 +0100 Subject: [PATCH] Fix unused variables in Manifold source files --- source/grid/manifold.cc | 13 ++---------- source/grid/manifold_lib.cc | 41 +++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 33 deletions(-) diff --git a/source/grid/manifold.cc b/source/grid/manifold.cc index 66bbb73ea4..1672a018ee 100644 --- a/source/grid/manifold.cc +++ b/source/grid/manifold.cc @@ -480,15 +480,6 @@ namespace internal { namespace { - Tensor<1,2> - normalized_alternating_product (const Tensor<1,2> (&basis_vectors)[1]) - { - Tensor<1,2> tmp = cross_product_2d (basis_vectors[0]); - return tmp/tmp.norm(); - } - - - Tensor<1,3> normalized_alternating_product (const Tensor<1,3> ( &)[1]) { @@ -748,8 +739,8 @@ get_normals_at_vertices (const Triangulation<2>::face_iterator &face, template <> void FlatManifold<2,3>:: -get_normals_at_vertices (const Triangulation<2,3>::face_iterator &face, - Manifold<2,3>::FaceVertexNormals &face_vertex_normals) const +get_normals_at_vertices (const Triangulation<2,3>::face_iterator &/*face*/, + Manifold<2,3>::FaceVertexNormals &/*face_vertex_normals*/) const { Assert(false, ExcNotImplemented()); } diff --git a/source/grid/manifold_lib.cc b/source/grid/manifold_lib.cc index 4628d6410a..c7db0f2daa 100644 --- a/source/grid/manifold_lib.cc +++ b/source/grid/manifold_lib.cc @@ -543,10 +543,8 @@ get_new_points (const ArrayView> &surrounding_points, // Search for duplicate weight rows and merge them to minimize the cost of // the get_new_point function call below. boost::container::small_vector merged_weights_index(new_points.size(),numbers::invalid_unsigned_int); - unsigned int unique_weight_rows = 0; for (unsigned int row = 0; row < weight_rows; ++row) { - bool found_identical_row = false; for (unsigned int existing_row = 0; existing_row < row; ++existing_row) { bool identical_weights = true; @@ -560,7 +558,6 @@ get_new_points (const ArrayView> &surrounding_points, if (identical_weights) { - found_identical_row = true; merged_weights_index[row] = existing_row; break; } @@ -632,11 +629,10 @@ namespace { template Point - do_get_new_point(const ArrayView> &directions, - const ArrayView &distances, - const ArrayView &weights, - const Point &candidate_point, - const Point ¢er) + do_get_new_point(const ArrayView> &/*directions*/, + const ArrayView &/*distances*/, + const ArrayView &/*weights*/, + const Point &/*candidate_point*/) { Assert(false,ExcNotImplemented()); return Point(); @@ -647,9 +643,10 @@ namespace do_get_new_point(const ArrayView> &directions, const ArrayView &distances, const ArrayView &weights, - const Point<3> &candidate_point, - const Point<3> ¢er) + const Point<3> &candidate_point) { + (void) distances; + AssertDimension(directions.size(), distances.size()); AssertDimension(directions.size(), weights.size()); @@ -762,10 +759,10 @@ namespace template Point SphericalManifold:: -get_new_point (const ArrayView> &directions, - const ArrayView &distances, - const ArrayView &weights, - const Point &candidate_point) const +get_new_point (const ArrayView> &, + const ArrayView &, + const ArrayView &, + const Point &) const { Assert (false, ExcNotImplemented()); return Point(); @@ -781,7 +778,7 @@ get_new_point (const ArrayView> &directions, const ArrayView &weights, const Point<3> &candidate_point) const { - return do_get_new_point(directions,distances,weights,candidate_point,center); + return do_get_new_point(directions,distances,weights,candidate_point); } @@ -794,7 +791,7 @@ get_new_point (const ArrayView> &directions, const ArrayView &weights, const Point<3> &candidate_point) const { - return do_get_new_point(directions,distances,weights,candidate_point,center); + return do_get_new_point(directions,distances,weights,candidate_point); } @@ -807,7 +804,7 @@ get_new_point (const ArrayView> &directions, const ArrayView &weights, const Point<3> &candidate_point) const { - return do_get_new_point(directions,distances,weights,candidate_point,center); + return do_get_new_point(directions,distances,weights,candidate_point); } @@ -870,8 +867,8 @@ CylindricalManifold::CylindricalManifold(const Point<3> &direction_, template Point CylindricalManifold:: -get_new_point (const ArrayView> &surrounding_points, - const ArrayView &weights) const +get_new_point (const ArrayView> &/*surrounding_points*/, + const ArrayView &/*weights*/) const { Assert (spacedim==3, ExcMessage("CylindricalManifold can only be used for spacedim==3!")); @@ -908,7 +905,7 @@ get_new_point (const ArrayView> &surrounding_points, template Point<3> -CylindricalManifold::pull_back(const Point &space_point) const +CylindricalManifold::pull_back(const Point &/*space_point*/) const { Assert (spacedim==3, ExcMessage("CylindricalManifold can only be used for spacedim==3!")); @@ -941,7 +938,7 @@ CylindricalManifold::pull_back(const Point<3> &space_point) const template Point -CylindricalManifold::push_forward(const Point<3> &chart_point) const +CylindricalManifold::push_forward(const Point<3> &/*chart_point*/) const { Assert (spacedim==3, ExcMessage("CylindricalManifold can only be used for spacedim==3!")); @@ -972,7 +969,7 @@ CylindricalManifold::push_forward(const Point<3> &chart_point) const template DerivativeForm<1, 3, spacedim> -CylindricalManifold::push_forward_gradient(const Point<3> &chart_point) const +CylindricalManifold::push_forward_gradient(const Point<3> &/*chart_point*/) const { Assert (spacedim==3, ExcMessage("CylindricalManifold can only be used for spacedim==3!")); -- 2.39.5