From fd7a32fac6016d977561c2f313c5d8fd7969accc Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 4 Feb 2015 20:37:20 -0600 Subject: [PATCH] Fix up a place where we use Point for directions when we should be using Tensor<1,dim>. --- include/deal.II/dofs/dof_renumbering.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/include/deal.II/dofs/dof_renumbering.h b/include/deal.II/dofs/dof_renumbering.h index 68ff5c38f4..44acdadf01 100644 --- a/include/deal.II/dofs/dof_renumbering.h +++ b/include/deal.II/dofs/dof_renumbering.h @@ -350,7 +350,7 @@ namespace DoFRenumbering /** * Constructor. */ - CompareDownstream (const Point &dir) + CompareDownstream (const Tensor<1,dim> &dir) : dir(dir) {} @@ -359,7 +359,7 @@ namespace DoFRenumbering */ bool operator () (const Iterator &c1, const Iterator &c2) const { - const Point diff = c2->center() - c1->center(); + const Tensor<1,dim> diff = c2->center() - c1->center(); return (diff*dir > 0); } @@ -367,7 +367,7 @@ namespace DoFRenumbering /** * Flow direction. */ - const Point dir; + const Tensor<1,dim> dir; }; @@ -384,7 +384,7 @@ namespace DoFRenumbering /** * Constructor. */ - ComparePointwiseDownstream (const Point &dir) + ComparePointwiseDownstream (const Tensor<1,dim> &dir) : dir(dir) {} @@ -394,7 +394,7 @@ namespace DoFRenumbering bool operator () (const std::pair,types::global_dof_index> &c1, const std::pair,types::global_dof_index> &c2) const { - const Point diff = c2.first-c1.first; + const Tensor<1,dim> diff = c2.first-c1.first; return (diff*dir > 0 || (diff*dir==0 && c1.second dir; + const Tensor<1,dim> dir; }; + + /** * A namespace for the implementation of some renumbering algorithms based * on algorithms implemented in the Boost Graph Library (BGL) by Jeremy Siek -- 2.39.5