From: Wolfgang Bangerth Date: Fri, 6 Feb 2015 03:16:50 +0000 (-0600) Subject: Either make implicit casts from Tensor<1,dim> to Point explicit, or correct... X-Git-Tag: v8.3.0-rc1~492^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11071492ff71ed3833efd5c655f5d2f7536bcd44;p=dealii.git Either make implicit casts from Tensor<1,dim> to Point explicit, or correct the data type of where we store the result. --- diff --git a/source/grid/tria_boundary.cc b/source/grid/tria_boundary.cc index d7fae946ec..e296a5f215 100644 --- a/source/grid/tria_boundary.cc +++ b/source/grid/tria_boundary.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 1998 - 2014 by the deal.II authors +// Copyright (C) 1998 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -628,7 +628,7 @@ normal_vector (const typename Triangulation::face_iterator &face, for (unsigned int k=0; k delta_xi = -invert(H) * J; + const Tensor<1,facedim> delta_xi = -invert(H) * J; xi += delta_xi; if (delta_xi.norm() < eps) @@ -847,7 +847,7 @@ namespace internal H_k += (object->vertex(i) * object->vertex(j)) * tmp; } - const Point delta_xi = - invert(H_k) * F_k; + const Tensor<1,dim> delta_xi = - invert(H_k) * F_k; xi += delta_xi; x_k = Point();