Update tests.

dealii · Oct 12, 2021 · 75dd7fc · 75dd7fc
1 parent 1cb1343
commit 75dd7fc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/tests/physics/step-18-rotation_matrix.cc b/tests/physics/step-18-rotation_matrix.cc
@@ -128,14 +128,14 @@ namespace Step18
   Tensor<2, 3>
   get_rotation_matrix(const std::vector<Tensor<1, 3>> &grad_u)
   {
-    const Point<3> curl(grad_u[2][1] - grad_u[1][2],
-                        grad_u[0][2] - grad_u[2][0],
-                        grad_u[1][0] - grad_u[0][1]);
-    const double   tan_angle = std::sqrt(curl * curl);
+    const Tensor<1, 3> curl({grad_u[2][1] - grad_u[1][2],
+                             grad_u[0][2] - grad_u[2][0],
+                             grad_u[1][0] - grad_u[0][1]});
+    const double       tan_angle = std::sqrt(curl * curl);
     // Note: Here the negative angle suggests that we're computing the rotation
     // of the coordinate system around a fixed point
-    const double   angle = -std::atan(tan_angle);
-    const Point<3> axis  = curl / tan_angle;
+    const double       angle = -std::atan(tan_angle);
+    const Tensor<1, 3> axis  = curl / tan_angle;
     return Physics::Transformations::Rotations::rotation_matrix_3d(axis, angle);
   }
   template <int dim>

diff --git a/tests/physics/transformations-rotations_01.cc b/tests/physics/transformations-rotations_01.cc
@@ -42,7 +42,8 @@ test_rotation_matrix_3d_z_axis(const double angle)
   Assert(std::abs(determinant(R_z) - 1.0) < 1e-9,
          ExcMessage("Rodrigues rotation matrix determinant is not unity"));
   const Tensor<2, 3> R =
-    Transformations::Rotations::rotation_matrix_3d(Point<3>({0, 0, 1}), angle);
+    Transformations::Rotations::rotation_matrix_3d(Tensor<1, 3>({0., 0., 1.}),
+                                                   angle);
   Assert(std::abs(determinant(R) - 1.0) < 1e-9,
          ExcMessage("Rotation matrix determinant is not unity"));
 
@@ -53,7 +54,7 @@ test_rotation_matrix_3d_z_axis(const double angle)
 }
 
 void
-test_rotation_matrix_3d(const Point<3> &axis, const double angle)
+test_rotation_matrix_3d(const Tensor<1, 3> &axis, const double angle)
 {
   // http://en.wikipedia.org/wiki/Rodrigues%27_rotation_formula
   // http://en.wikipedia.org/wiki/Rotation_matrix
@@ -146,9 +147,12 @@ main()
   test_rotation_matrix_3d_z_axis(45.0 * deg_to_rad);
   test_rotation_matrix_3d_z_axis(60.0 * deg_to_rad);
 
-  test_rotation_matrix_3d(normalise(Point<3>({1, 1, 1})), 90.0 * deg_to_rad);
-  test_rotation_matrix_3d(normalise(Point<3>({0, 2, 1})), 45.0 * deg_to_rad);
-  test_rotation_matrix_3d(normalise(Point<3>({-1, 3, 2})), 60.0 * deg_to_rad);
+  test_rotation_matrix_3d(normalise(Tensor<1, 3>({1., 1., 1.})),
+                          90.0 * deg_to_rad);
+  test_rotation_matrix_3d(normalise(Tensor<1, 3>({0., 2., 1.})),
+                          45.0 * deg_to_rad);
+  test_rotation_matrix_3d(normalise(Tensor<1, 3>({-1., 3., 2.})),
+                          60.0 * deg_to_rad);
 
   deallog << "OK" << std::endl;
 }
diff --git a/tests/simplex/step-18.cc b/tests/simplex/step-18.cc
@@ -163,9 +163,9 @@ namespace Step18
   Tensor<2, 3>
   get_rotation_matrix(const std::vector<Tensor<1, 3>> &grad_u)
   {
-    const Point<3> curl(grad_u[2][1] - grad_u[1][2],
-                        grad_u[0][2] - grad_u[2][0],
-                        grad_u[1][0] - grad_u[0][1]);
+    const Tensor<1, 3> curl({grad_u[2][1] - grad_u[1][2],
+                             grad_u[0][2] - grad_u[2][0],
+                             grad_u[1][0] - grad_u[0][1]});
 
     const double tan_angle = std::sqrt(curl * curl);
     const double angle     = std::atan(tan_angle);
@@ -177,7 +177,7 @@ namespace Step18
         return rot;
       }
 
-    const Point<3> axis = curl / tan_angle;
+    const Tensor<1, 3> axis = curl / tan_angle;
     return Physics::Transformations::Rotations::rotation_matrix_3d(axis,
                                                                    -angle);
   }