]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Update tests
authorMatthias Maier <tamiko@43-1.org>
Fri, 25 Sep 2015 22:34:05 +0000 (17:34 -0500)
committerMatthias Maier <tamiko@43-1.org>
Fri, 25 Sep 2015 22:34:05 +0000 (17:34 -0500)
tests/base/tensor.cc
tests/base/tensor_complex.cc
tests/base/tensor_float.cc
tests/codim_one/bem_integration.cc

index fb2b32301cf87ad4b8f0f0adf2938d50daf55826..f8d550bdc4e9cba1bb9f5c26f2e0ff0a772cb96c 100644 (file)
@@ -75,17 +75,17 @@ int main ()
       e1[0] = 1.;
       e2[1] = 1.;
       e3[2] = 1.;
-      Tensor<1,3> result = cross_product(e1, e2);
+      Tensor<1,3> result = cross_product_3d(e1, e2);
       deallog << '\t' << result[0]
               << '\t' << result[1]
               << '\t' << result[2] << std::endl;
 
-      result = cross_product(e2, e3);
+      result = cross_product_3d(e2, e3);
       deallog << '\t' << result[0]
               << '\t' << result[1] << '\t'
               << result[2] << std::endl;
 
-      result = cross_product(e3, e1);
+      result = cross_product_3d(e3, e1);
       deallog << '\t' << result[0]
               << '\t' << result[1]
               << '\t' << result[2] << std::endl;
index 1f8dbcb2584bffa44e6313a97a96ab8551c6eb4f..56a0e75e7407acc233d4e66ff53735237322ef2e 100644 (file)
@@ -96,17 +96,17 @@ int main ()
       e1[0] = 1.;
       e2[1] = 1.;
       e3[2] = 1.;
-      Tensor<1,3,std::complex<double> > result = cross_product(e1, e2);
+      Tensor<1,3,std::complex<double> > result = cross_product_3d(e1, e2);
       deallog << '\t' << result[0]
               << '\t' << result[1]
               << '\t' << result[2] << std::endl;
 
-      result = cross_product(e2, e3);
+      result = cross_product_3d(e2, e3);
       deallog << '\t' << result[0]
               << '\t' << result[1] << '\t'
               << result[2] << std::endl;
 
-      result = cross_product(e3, e1);
+      result = cross_product_3d(e3, e1);
       deallog << '\t' << result[0]
               << '\t' << result[1]
               << '\t' << result[2] << std::endl;
index ee2fa3da2d32a47092b0dfaac3f5b112c67451d4..455b684cdf0efb8ce0e5821b24f43a81cb799621 100644 (file)
@@ -80,17 +80,17 @@ int main ()
       e1[0] = 1.;
       e2[1] = 1.;
       e3[2] = 1.;
-      Tensor<1,3,float> result = cross_product(e1, e2);
+      Tensor<1,3,float> result = cross_product_3d(e1, e2);
       deallog << '\t' << static_cast<double>(result[0])
               << '\t' << static_cast<double>(result[1])
               << '\t' << static_cast<double>(result[2]) << std::endl;
 
-      result = cross_product(e2, e3);
+      result = cross_product_3d(e2, e3);
       deallog << '\t' << static_cast<double>(result[0])
               << '\t' << static_cast<double>(result[1]) << '\t'
               << static_cast<double>(result[2]) << std::endl;
 
-      result = cross_product(e3, e1);
+      result = cross_product_3d(e3, e1);
       deallog << '\t' << static_cast<double>(result[0])
               << '\t' << static_cast<double>(result[1])
               << '\t' << static_cast<double>(result[2]) << std::endl;
index 65491b03c5f3cf0bf1b8e6aef7effaa7a0171e45..c1b08bf2ba64b01dec6d08459d8b190861101389 100644 (file)
@@ -154,9 +154,9 @@ LaplaceKernelIntegration<dim>::term_S (const Tensor<1,3> &r,
                                        const Tensor<1,3> &n,
                                        const double &rn_c)
 {
-  Tensor<1, 3> ra1 = cross_product(r, a1);
-  Tensor<1, 3> ra2 = cross_product(r, a2);
-  Tensor<1, 3> a12 = cross_product(a1, a2);
+  Tensor<1, 3> ra1 = cross_product_3d(r, a1);
+  Tensor<1, 3> ra2 = cross_product_3d(r, a2);
+  Tensor<1, 3> a12 = cross_product_3d(a1, a2);
 
   double integral =
     -1./2./numbers::PI
@@ -176,9 +176,9 @@ LaplaceKernelIntegration<dim>::term_D (const Tensor<1,3> &r,
                                        const Tensor<1,3> &a1,
                                        const Tensor<1,3> &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);
+  Tensor<1, 3> ra1 = cross_product_3d(r, a1);
+  Tensor<1, 3> ra2 = cross_product_3d(r, a2);
+  Tensor<1, 3> a12 = cross_product_3d(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.