From 054bd8594190edaf06dcc87a3c77752d6e16bf2b Mon Sep 17 00:00:00 2001 From: amola Date: Sun, 17 Apr 2016 21:24:01 +0200 Subject: [PATCH] changed normal type in tuple in Tensor<1,3> --- include/deal.II/opencascade/utilities.h | 4 ++-- source/opencascade/boundary_lib.cc | 2 +- source/opencascade/utilities.cc | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/deal.II/opencascade/utilities.h b/include/deal.II/opencascade/utilities.h index 081ce6e84f..a16b32dd7c 100644 --- a/include/deal.II/opencascade/utilities.h +++ b/include/deal.II/opencascade/utilities.h @@ -276,7 +276,7 @@ namespace OpenCASCADE * face, returns the corresponding point in real space, the normal to the * surface at that point and the min and max curvatures as a tuple. */ - std_cxx11::tuple, Point<3>, double, double> + std_cxx11::tuple, Tensor<1,3>, double, double> push_forward_and_differential_forms(const TopoDS_Face &face, const double u, const double v, @@ -290,7 +290,7 @@ namespace OpenCASCADE * and only the closest point is returned. This function will throw an * exception if the @p in_shape does not contain at least one face. */ - std_cxx11::tuple, Point<3>, double, double> + std_cxx11::tuple, Tensor<1,3>, double, double> closest_point_and_differential_forms(const TopoDS_Shape &in_shape, const Point<3> &origin, const double tolerance=1e-7); diff --git a/source/opencascade/boundary_lib.cc b/source/opencascade/boundary_lib.cc index afa45dc34e..7f623d0318 100644 --- a/source/opencascade/boundary_lib.cc +++ b/source/opencascade/boundary_lib.cc @@ -169,7 +169,7 @@ namespace OpenCASCADE { for (unsigned int i=0; i, Point<3>, double, double> + std_cxx11::tuple, Tensor<1,3>, double, double> p_and_diff_forms = closest_point_and_differential_forms(sh, surrounding_points[i], diff --git a/source/opencascade/utilities.cc b/source/opencascade/utilities.cc index ce15798b03..7034790113 100644 --- a/source/opencascade/utilities.cc +++ b/source/opencascade/utilities.cc @@ -546,7 +546,7 @@ namespace OpenCASCADE return std_cxx11::get<0>(ref); } - std_cxx11::tuple, Point<3>, double, double> + std_cxx11::tuple, Tensor<1,3>, double, double> closest_point_and_differential_forms(const TopoDS_Shape &in_shape, const Point<3> &origin, const double tolerance) @@ -601,7 +601,7 @@ namespace OpenCASCADE return Point<3>(); } - std_cxx11::tuple, Point<3>, double, double> + std_cxx11::tuple, Tensor<1,3>, double, double> push_forward_and_differential_forms(const TopoDS_Face &face, const double u, const double v, @@ -615,7 +615,7 @@ namespace OpenCASCADE Assert(props.IsCurvatureDefined(), ExcMessage("Curvature is not well defined!")); Standard_Real Min_Curvature = props.MinCurvature(); Standard_Real Max_Curvature = props.MaxCurvature(); - Point<3> normal = Point<3>(Normal.X(),Normal.Y(),Normal.Z()); + Tensor<1,3> normal = Point<3>(Normal.X(),Normal.Y(),Normal.Z()); // In the case your manifold changes from convex to concave or viceversa // the normal could jump from "inner" to "outer" normal. @@ -628,7 +628,7 @@ namespace OpenCASCADE Max_Curvature *= -1; } - return std_cxx11::tuple, Point<3>, double, double>(point(Value), normal, Min_Curvature, Max_Curvature); + return std_cxx11::tuple, Tensor<1,3>, double, double>(point(Value), normal, Min_Curvature, Max_Curvature); } -- 2.39.5