From f62b72ed8b7b474bed7bc4f8f4acd9f5d06e3d90 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 25 Sep 2015 17:34:05 -0500 Subject: [PATCH] Update tests --- tests/base/tensor.cc | 6 +++--- tests/base/tensor_complex.cc | 6 +++--- tests/base/tensor_float.cc | 6 +++--- tests/codim_one/bem_integration.cc | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/base/tensor.cc b/tests/base/tensor.cc index fb2b32301c..f8d550bdc4 100644 --- a/tests/base/tensor.cc +++ b/tests/base/tensor.cc @@ -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; diff --git a/tests/base/tensor_complex.cc b/tests/base/tensor_complex.cc index 1f8dbcb258..56a0e75e74 100644 --- a/tests/base/tensor_complex.cc +++ b/tests/base/tensor_complex.cc @@ -96,17 +96,17 @@ int main () e1[0] = 1.; e2[1] = 1.; e3[2] = 1.; - Tensor<1,3,std::complex > result = cross_product(e1, e2); + Tensor<1,3,std::complex > 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; diff --git a/tests/base/tensor_float.cc b/tests/base/tensor_float.cc index ee2fa3da2d..455b684cdf 100644 --- a/tests/base/tensor_float.cc +++ b/tests/base/tensor_float.cc @@ -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(result[0]) << '\t' << static_cast(result[1]) << '\t' << static_cast(result[2]) << std::endl; - result = cross_product(e2, e3); + result = cross_product_3d(e2, e3); deallog << '\t' << static_cast(result[0]) << '\t' << static_cast(result[1]) << '\t' << static_cast(result[2]) << std::endl; - result = cross_product(e3, e1); + result = cross_product_3d(e3, e1); deallog << '\t' << static_cast(result[0]) << '\t' << static_cast(result[1]) << '\t' << static_cast(result[2]) << std::endl; diff --git a/tests/codim_one/bem_integration.cc b/tests/codim_one/bem_integration.cc index 65491b03c5..c1b08bf2ba 100644 --- a/tests/codim_one/bem_integration.cc +++ b/tests/codim_one/bem_integration.cc @@ -154,9 +154,9 @@ LaplaceKernelIntegration::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::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))); -- 2.39.5