]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Hopefully fix a few build regressions with opencascade (can't test here
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 17 Feb 2015 23:46:04 +0000 (17:46 -0600)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 17 Feb 2015 23:46:04 +0000 (17:46 -0600)
since no opencascade installation locally available).

source/opencascade/boundary_lib.cc

index f8a3b22ced4d5a58c10735252814f40af744c390..c5b3a3a80bb7570c1ab4aa5a1b146b1c9665d618 100644 (file)
@@ -131,7 +131,7 @@ namespace OpenCASCADE
                        const Point<spacedim> &candidate) const
   {
     TopoDS_Shape out_shape;
-    Point<3> average_normal(0.0,0.0,0.0);
+    Tensor<1,3> average_normal;
 #ifdef DEBUG
     for (unsigned int i=0; i<surrounding_points.size(); ++i)
       {
@@ -161,7 +161,7 @@ namespace OpenCASCADE
         Assert(average_normal.norm() > 1e-4,
                ExcMessage("Failed to refine cell: the average of the surface normals at the surrounding edge turns out to be a null vector, making the projection direction undetermined."));
 
-        Point<3> T = surrounding_points[0]-surrounding_points[1];
+        Tensor<1,3> T = surrounding_points[0]-surrounding_points[1];
         T /= T.norm();
         average_normal = average_normal-(average_normal*T)*T;
         average_normal /= average_normal.norm();
@@ -169,13 +169,13 @@ namespace OpenCASCADE
       }
       case 8:
       {
-        Point<3> u = surrounding_points[1]-surrounding_points[0];
-        Point<3> v = surrounding_points[2]-surrounding_points[0];
-        Point<3> n1(u(1)*v(2)-u(2)*v(1),u(2)*v(0)-u(0)*v(2),u(0)*v(1)-u(1)*v(0));
+        Tensor<1,3> u = surrounding_points[1]-surrounding_points[0];
+        Tensor<1,3> v = surrounding_points[2]-surrounding_points[0];
+        Tensor<1,3> n1(u(1)*v(2)-u(2)*v(1),u(2)*v(0)-u(0)*v(2),u(0)*v(1)-u(1)*v(0));
         n1 = n1/n1.norm();
         u = surrounding_points[2]-surrounding_points[3];
         v = surrounding_points[1]-surrounding_points[3];
-        Point<3> n2(u(1)*v(2)-u(2)*v(1),u(2)*v(0)-u(0)*v(2),u(0)*v(1)-u(1)*v(0));
+        Tensor<1,3> n2(u(1)*v(2)-u(2)*v(1),u(2)*v(0)-u(0)*v(2),u(0)*v(1)-u(1)*v(0));
         n2 = n2/n2.norm();
         u = surrounding_points[4]-surrounding_points[7];
         v = surrounding_points[6]-surrounding_points[7];

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.