From: Wolfgang Bangerth Date: Fri, 6 Feb 2015 03:16:49 +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~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f08d57062577fb328c6e186c38741fb85841a007;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/manifold_lib.cc b/source/grid/manifold_lib.cc index 534fdfd7a8..b5d315d3a3 100644 --- a/source/grid/manifold_lib.cc +++ b/source/grid/manifold_lib.cc @@ -57,7 +57,7 @@ SphericalManifold::get_new_point(const Quadrature &quad) mid_point += quad.weight(i)*quad.point(i); } // Project the mid_pont back to the right location - Point R = mid_point-center; + Tensor<1,spacedim> R = mid_point-center; // Scale it to have radius rho_average R *= rho_average/R.norm(); // And return it. @@ -102,7 +102,7 @@ template Point SphericalManifold::pull_back(const Point &space_point) const { - const Point R = space_point-center; + const Tensor<1,spacedim> R = space_point-center; const double rho = R.norm(); Point p; @@ -193,9 +193,9 @@ get_new_point (const Quadrature &quad) const return middle; else - return (vector_from_axis / vector_from_axis.norm() * radius + - ((middle-point_on_axis) * direction) * direction + - point_on_axis); + return Point((vector_from_axis / vector_from_axis.norm() * radius + + ((middle-point_on_axis) * direction) * direction + + point_on_axis)); }