Avoid use of deprecated functions in tests

dealii · Apr 8, 2020 · 241378a · 241378a
1 parent b15e787
commit 241378a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/tests/bits/fe_tools_01a.cc b/tests/bits/fe_tools_01a.cc
@@ -33,7 +33,7 @@
 
 
 // check
-//   DoFTools::lexicographic_to_hierarchic_numbering
+//   FETools::lexicographic_to_hierarchic_numbering
 
 
 template <int dim>
@@ -42,8 +42,8 @@ check(const FE_Q<dim> &fe, const std::string &name)
 {
   deallog << "Checking " << name << " in " << dim << "d:" << std::endl;
 
-  std::vector<unsigned int> n(fe.dofs_per_cell);
-  FETools::lexicographic_to_hierarchic_numbering(fe, n);
+  const std::vector<unsigned int> n =
+    FETools::lexicographic_to_hierarchic_numbering<dim>(fe.degree);
   for (unsigned int i = 0; i < fe.dofs_per_cell; ++i)
     deallog << n[i] << " ";
   deallog << std::endl;

diff --git a/tests/bits/fe_tools_01b.cc b/tests/bits/fe_tools_01b.cc
@@ -33,7 +33,7 @@
 
 
 // check
-//   DoFTools::hierarchic_to_lexicographic_numbering
+//   FETools::hierarchic_to_lexicographic_numbering
 
 
 template <int dim>
@@ -42,8 +42,8 @@ check(const FE_Q<dim> &fe, const std::string &name)
 {
   deallog << "Checking " << name << " in " << dim << "d:" << std::endl;
 
-  std::vector<unsigned int> n(fe.dofs_per_cell);
-  FETools::hierarchic_to_lexicographic_numbering(fe, n);
+  const std::vector<unsigned int> n =
+    FETools::hierarchic_to_lexicographic_numbering<dim>(fe.degree);
   for (unsigned int i = 0; i < fe.dofs_per_cell; ++i)
     deallog << n[i] << " ";
   deallog << std::endl;

diff --git a/tests/bits/fe_tools_01c.cc b/tests/bits/fe_tools_01c.cc
@@ -33,9 +33,9 @@
 
 
 // check invertability of the map from
-//   DoFTools::hierarchic_to_lexicographic_numbering
+//   FETools::hierarchic_to_lexicographic_numbering
 // to
-//   DoFTools::lexicographic_to_hierarchic_numbering
+//   FETools::lexicographic_to_hierarchic_numbering
 
 
 template <int dim>
@@ -44,11 +44,11 @@ check(const FE_Q<dim> &fe, const std::string &name)
 {
   deallog << "Checking " << name << " in " << dim << "d:" << std::endl;
 
-  std::vector<unsigned int> n1(fe.dofs_per_cell);
-  FETools::hierarchic_to_lexicographic_numbering(fe, n1);
+  const std::vector<unsigned int> n1 =
+    FETools::hierarchic_to_lexicographic_numbering<dim>(fe.degree);
 
-  std::vector<unsigned int> n2(fe.dofs_per_cell);
-  FETools::lexicographic_to_hierarchic_numbering(fe, n2);
+  const std::vector<unsigned int> n2 =
+    FETools::lexicographic_to_hierarchic_numbering<dim>(fe.degree);
 
   for (unsigned int i = 0; i < fe.dofs_per_cell; ++i)
     {

diff --git a/tests/fe/numbering.cc b/tests/fe/numbering.cc
@@ -234,8 +234,8 @@ check(const FE_Q<dim> &fe)
   // identity. output the two maps to
   // generate some output for
   // automatic comparison
-  std::vector<unsigned int> l2h(fe.dofs_per_cell);
-  FETools::lexicographic_to_hierarchic_numbering(fe, l2h);
+  const std::vector<unsigned int> l2h =
+    FETools::lexicographic_to_hierarchic_numbering<dim>(fe.degree);
   for (unsigned int i = 0; i < dofs_per_cell; ++i)
     {
       Assert(l2h[hierarchic_to_lexicographic_numbering[i]] == i,
@@ -247,8 +247,8 @@ check(const FE_Q<dim> &fe)
   // finally, we also have the
   // forward map in the lib, so check
   // for equality
-  std::vector<unsigned int> h2l(fe.dofs_per_cell);
-  FETools::hierarchic_to_lexicographic_numbering(fe, h2l);
+  const std::vector<unsigned int> h2l =
+    FETools::hierarchic_to_lexicographic_numbering<dim>(fe.degree);
   AssertThrow(hierarchic_to_lexicographic_numbering == h2l, ExcInternalError());
 }