]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Update tests to use new cross_product signature
authorMatthias Maier <tamiko@43-1.org>
Tue, 15 Sep 2015 04:22:32 +0000 (23:22 -0500)
committerMatthias Maier <tamiko@43-1.org>
Tue, 15 Sep 2015 17:04:05 +0000 (12:04 -0500)
tests/base/tensor.cc
tests/base/tensor_complex.cc
tests/base/tensor_float.cc
tests/codim_one/bem_integration.cc

index e31151448b750b3772fef62f72cc793cb27925e6..c230cf1089e58ec64b558741fc9231afe2d4e65e 100644 (file)
@@ -75,18 +75,17 @@ int main ()
       e1[0] = 1.;
       e2[1] = 1.;
       e3[2] = 1.;
-      Tensor<1,3> result;
-      cross_product(result,e1,e2);
+      Tensor<1,3> result = cross_product(e1, e2);
       deallog << '\t' << result[0]
               << '\t' << result[1]
               << '\t' << result[2] << std::endl;
 
-      cross_product(result,e2,e3);
+      result = cross_product(e2, e3);
       deallog << '\t' << result[0]
               << '\t' << result[1] << '\t'
               << result[2] << std::endl;
 
-      cross_product(result,e3,e1);
+      result = cross_product(e3, e1);
       deallog << '\t' << result[0]
               << '\t' << result[1]
               << '\t' << result[2] << std::endl;
index 068fb7e6ee11ab206e1175e57315014b414aa8b2..4c28b99cd0954fba1d3b7118a6fc913e36cba47a 100644 (file)
@@ -96,18 +96,17 @@ int main ()
       e1[0] = 1.;
       e2[1] = 1.;
       e3[2] = 1.;
-      Tensor<1,3,std::complex<double> > result;
-      cross_product(result,e1,e2);
+      Tensor<1,3,std::complex<double> > result = cross_product(e1, e2);
       deallog << '\t' << result[0]
               << '\t' << result[1]
               << '\t' << result[2] << std::endl;
 
-      cross_product(result,e2,e3);
+      result = cross_product(e2, e3);
       deallog << '\t' << result[0]
               << '\t' << result[1] << '\t'
               << result[2] << std::endl;
 
-      cross_product(result,e3,e1);
+      result = cross_product(e3, e1);
       deallog << '\t' << result[0]
               << '\t' << result[1]
               << '\t' << result[2] << std::endl;
index 9d3121286e324dc3642e6e85625835126c051e1f..4b617969f1824309f34307e15ac7d9e31b9d54f1 100644 (file)
@@ -80,18 +80,17 @@ int main ()
       e1[0] = 1.;
       e2[1] = 1.;
       e3[2] = 1.;
-      Tensor<1,3,float> result;
-      cross_product(result,e1,e2);
+      Tensor<1,3,float> result = cross_product(e1, e2);
       deallog << '\t' << static_cast<double>(result[0])
               << '\t' << static_cast<double>(result[1])
               << '\t' << static_cast<double>(result[2]) << std::endl;
 
-      cross_product(result,e2,e3);
+      result = cross_product(e2, e3);
       deallog << '\t' << static_cast<double>(result[0])
               << '\t' << static_cast<double>(result[1]) << '\t'
               << static_cast<double>(result[2]) << std::endl;
 
-      cross_product(result,e3,e1);
+      result = cross_product(e3, e1);
       deallog << '\t' << static_cast<double>(result[0])
               << '\t' << static_cast<double>(result[1])
               << '\t' << static_cast<double>(result[2]) << std::endl;
index cb3e7fd05a35a4589dc82c9ecf9f95e0a19af937..65491b03c5f3cf0bf1b8e6aef7effaa7a0171e45 100644 (file)
@@ -154,11 +154,9 @@ LaplaceKernelIntegration<dim>::term_S (const Tensor<1,3> &r,
                                        const Tensor<1,3> &n,
                                        const double &rn_c)
 {
-  Point<3> ra1, ra2, a12;
-
-  cross_product(ra1,r,a1);
-  cross_product(ra2,r,a2);
-  cross_product(a12,a1,a2);
+  Tensor<1, 3> ra1 = cross_product(r, a1);
+  Tensor<1, 3> ra2 = cross_product(r, a2);
+  Tensor<1, 3> a12 = cross_product(a1, a2);
 
   double integral =
     -1./2./numbers::PI
@@ -178,11 +176,9 @@ LaplaceKernelIntegration<dim>::term_D (const Tensor<1,3> &r,
                                        const Tensor<1,3> &a1,
                                        const Tensor<1,3> &a2)
 {
-  Point<3> ra1, ra2, a12;
-
-  cross_product(ra1,r,a1);
-  cross_product(ra2,r,a2);
-  cross_product(a12,a1,a2);
+  Tensor<1, 3> ra1 = cross_product(r, a1);
+  Tensor<1, 3> ra2 = cross_product(r, a2);
+  Tensor<1, 3> a12 = cross_product(a1, a2);
 
   double integral = 1./2./numbers::PI
                     *atan2( ra1*ra2, (r.norm()* (r*a12)));

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.