]> https://gitweb.dealii.org/ - dealii.git/commitdiff
extend Point::distance_square() to work with VectorizedArray 4949/head
authorDenis Davydov <davydden@gmail.com>
Thu, 24 Aug 2017 12:57:46 +0000 (14:57 +0200)
committerDenis Davydov <davydden@gmail.com>
Thu, 24 Aug 2017 13:06:55 +0000 (15:06 +0200)
doc/news/changes/minor/20170824DenisDavydov [new file with mode: 0644]
include/deal.II/base/point.h
tests/base/point_03.cc [new file with mode: 0644]
tests/base/point_03.output [new file with mode: 0644]

diff --git a/doc/news/changes/minor/20170824DenisDavydov b/doc/news/changes/minor/20170824DenisDavydov
new file mode 100644 (file)
index 0000000..0f1898c
--- /dev/null
@@ -0,0 +1,3 @@
+New: extend Point::distance_square() to work with VectorizedArray numbers.
+<br>
+(Denis Davydov, 2017/08/24)
index 0e1b913ac8dc38ec5ce5da663acd4cc86f0e747d..ab9a52ca98a65d8ad3930a7c5a0f36df39a705e1 100644 (file)
@@ -494,10 +494,10 @@ inline
 typename numbers::NumberTraits<Number>::real_type
 Point<dim,Number>::distance_square (const Point<dim,Number> &p) const
 {
-  Number sum = Number();
+  Number sum = internal::NumberType<Number>::value(0.0);
   for (unsigned int i=0; i<dim; ++i)
     {
-      const Number diff=this->values[i]-p(i);
+      const Number diff=static_cast<Number>(this->values[i])-p(i);
       sum += numbers::NumberTraits<Number>::abs_square (diff);
     }
 
diff --git a/tests/base/point_03.cc b/tests/base/point_03.cc
new file mode 100644 (file)
index 0000000..79d6d0c
--- /dev/null
@@ -0,0 +1,72 @@
+// ---------------------------------------------------------------------
+//
+// Copyright (C) 2010 - 2015 by the deal.II authors
+//
+// This file is part of the deal.II library.
+//
+// The deal.II library is free software; you can use it, redistribute
+// it, and/or modify it under the terms of the GNU Lesser General
+// Public License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// The full text of the license can be found in the file LICENSE at
+// the top level of the deal.II distribution.
+//
+// ---------------------------------------------------------------------
+
+
+// test for Point::distance_square() for VectorizedArray numbers
+
+#include "../tests.h"
+#include <deal.II/base/point.h>
+#include <deal.II/base/vectorization.h>
+
+
+template <int dim, typename number>
+void check ()
+{
+  VectorizedArray<number> distance_vec;
+  Point<dim, VectorizedArray<number>> p1_vec, p2_vec;
+
+  for (unsigned int v = 0; v < VectorizedArray<number>::n_array_elements; ++v)
+    {
+      Point<dim,number> p1, p2;
+      for (unsigned int i=0; i<dim; ++i)
+        {
+          p1[i] = 10.0 + 0.12345 * i + 0.987 * v;
+          p1[i] = 0.5 + 0.6789   * i - 0.543 * v;
+
+          p1_vec[i][v] = p1[i];
+          p2_vec[i][v] = p2[i];
+        }
+
+      distance_vec[v] = p1.distance_square(p2);
+    }
+
+  const VectorizedArray<number> distance_vec2 = p1_vec.distance_square(p2_vec);
+  distance_vec -= distance_vec2;
+  number diff = 0.;
+
+  for (unsigned int v = 0; v < VectorizedArray<number>::n_array_elements; ++v)
+    diff += std::abs(distance_vec[v]);
+
+  AssertThrow(diff < 1e-10,
+              ExcMessage("diff is " + std::to_string(diff)));
+
+  deallog << "Ok" << std::endl;
+}
+
+int main ()
+{
+  std::ofstream logfile("output");
+  deallog << std::setprecision(3);
+  deallog.attach(logfile);
+
+  check<1,float>();
+  check<2,float>();
+  check<3,float>();
+
+  check<1,double>();
+  check<2,double>();
+  check<3,double>();
+
+}
diff --git a/tests/base/point_03.output b/tests/base/point_03.output
new file mode 100644 (file)
index 0000000..b3d2bc3
--- /dev/null
@@ -0,0 +1,7 @@
+
+DEAL::Ok
+DEAL::Ok
+DEAL::Ok
+DEAL::Ok
+DEAL::Ok
+DEAL::Ok

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.