changed normal type in tuple in Tensor<1,3>

diff --git a/include/deal.II/opencascade/utilities.h b/include/deal.II/opencascade/utilities.h
index 081ce6e84f0429687f537fe17cb820aad62b9837..a16b32dd7cdd10d945a57642f4b27f676b2d9f11 100644 (file)
--- 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>, Point<3>, double, double>
+  std_cxx11::tuple<Point<3>,  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>, Point<3>, double, double>
+  std_cxx11::tuple<Point<3>,  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 afa45dc34e9cc1bda8408983c19778bd31f4317c..7f623d03188a04c1f50f81ab8198dfece8df7feb 100644 (file)
--- a/source/opencascade/boundary_lib.cc
+++ b/source/opencascade/boundary_lib.cc
@@ -169,7 +169,7 @@ namespace OpenCASCADE
       {
         for (unsigned int i=0; i<surrounding_points.size(); ++i)
           {
-            std_cxx11::tuple<Point<3>, Point<3>, double, double>
+            std_cxx11::tuple<Point<3>,  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 ce15798b03f21cfb942a3c0483e0865ae665d876..7034790113c6fd7d64ac2cf698f37864ab53fdfd 100644 (file)
--- 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>, Point<3>, double, double>
+  std_cxx11::tuple<Point<3>,  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>, Point<3>, double, double>
+  std_cxx11::tuple<Point<3>,  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>, Point<3>, double, double>(point(Value), normal, Min_Curvature, Max_Curvature);
+    return std_cxx11::tuple<Point<3>, Tensor<1,3>, double, double>(point(Value), normal, Min_Curvature, Max_Curvature);
   }