Fix get_ria_vector for BDM

diff --git a/source/fe/fe_bdm.cc b/source/fe/fe_bdm.cc
index 46cd58045bce28159fc6b3e875a68ca5d067b04e..6a72ac67a78014ccf732678904c6a1d1e3e54abc 100644 (file)
--- a/source/fe/fe_bdm.cc
+++ b/source/fe/fe_bdm.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2003 - 2016 by the deal.II authors
+// Copyright (C) 2003 - 2017 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -263,9 +263,9 @@ FE_BDM<dim>::get_ria_vector (const unsigned int deg)
     }
 
   const unsigned int dofs_per_cell = PolynomialsBDM<dim>::compute_n_pols(deg);
-  const unsigned int dofs_per_face = PolynomialSpace<dim-1>::compute_n_pols(deg);
+  const unsigned int dofs_per_face = PolynomialSpace<dim-1>::compute_n_pols(deg+1);
 
-  Assert(GeometryInfo<dim>::faces_per_cell*dofs_per_face < dofs_per_cell,
+  Assert(GeometryInfo<dim>::faces_per_cell*dofs_per_face <= dofs_per_cell,
          ExcInternalError());
 
   // all dofs need to be

diff --git a/tests/fe/bdm_16.cc b/tests/fe/bdm_16.cc
new file mode 100644 (file)
index 0000000..bf20482
--- /dev/null
+++ b/tests/fe/bdm_16.cc
@@ -0,0 +1,70 @@
+// ---------------------------------------------------------------------
+//
+// Copyright (C) 2017 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.
+//
+// ---------------------------------------------------------------------
+
+
+// The test is used to check the restriction_is_additive flags. The
+// face degrees of freedom of a BDM element must be non-additive as
+// they have continuity requirements, however the interior DOFs must
+// be additive, e.g. for order 1 elements all DOFs are non-additive,
+// while for the order 2 element in 2d we have 12 non-additive face DOFs
+// and 2 additive interior ones. The test should output a vector
+// consisting of faces_per_cell * dofs_per_face zeros, followed by
+// interior_dofs ones.
+
+#include "../tests.h"
+#include <deal.II/base/logstream.h>
+#include <deal.II/fe/fe_bdm.h>
+
+#include <fstream>
+#include <string>
+
+
+std::ofstream logfile ("output");
+
+template<int dim>
+void
+test (const unsigned int degree)
+{
+  FE_BDM<dim> fe_bdm(degree);
+
+  deallog << "Degree=" << degree
+          << ", restriction is additive flags:"
+          << std::endl;
+
+  for (unsigned int i=0; i<fe_bdm.dofs_per_cell; ++i)
+    std::cout << fe_bdm.restriction_is_additive(i) << " ";
+
+  deallog << std::endl;
+}
+
+
+int
+main()
+{
+  initlog();
+
+  deallog << "Dimension 2: " << std::endl;
+  for (unsigned int i=1; i<4; ++i)
+    test<2>(i);
+
+  deallog << "Dimension 3: " << std::endl;
+  for (unsigned int i=1; i<4; ++i)
+    test<3>(i);
+
+  return 0;
+}
+
+
+

diff --git a/tests/fe/bdm_16.output b/tests/fe/bdm_16.output
new file mode 100644 (file)
index 0000000..91073d5
--- /dev/null
+++ b/tests/fe/bdm_16.output
@@ -0,0 +1,15 @@
+
+DEAL::Dimension 2: 
+DEAL::Degree=1, restriction is additive flags:
+DEAL::0 0 0 0 0 0 0 0 
+DEAL::Degree=2, restriction is additive flags:
+DEAL::0 0 0 0 0 0 0 0 0 0 0 0 1 1 
+DEAL::Degree=3, restriction is additive flags:
+DEAL::0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 
+DEAL::Dimension 3: 
+DEAL::Degree=1, restriction is additive flags:
+DEAL::0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+DEAL::Degree=2, restriction is additive flags:
+DEAL::0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 
+DEAL::Degree=3, restriction is additive flags:
+DEAL::0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1