New tests. The outputs have been verified to be correct and have been generated with...

git-svn-id: https://svn.dealii.org/trunk@30100 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/bits/dof_tools_21_b_x.cc b/tests/bits/dof_tools_21_b_x.cc
new file mode 100644 (file)
index 0000000..c6d8ef6
--- /dev/null
+++ b/tests/bits/dof_tools_21_b_x.cc
@@ -0,0 +1,185 @@
+// ---------------------------------------------------------------------
+// $Id$
+//
+// Copyright (C) 2003 - 2013 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
+//   DoFTools::
+//   make_periodicity_constraints (const FaceIterator       &,
+//                                 const FaceIterator       &,
+//                                 dealii::ConstraintMatrix &,
+//                                 const std::vector<bool>  &,
+//                                 bool, bool, bool)
+// for correct behaviour on non standard oriented meshes.
+//
+// a redux of why the 21_b test failed starting in r29525. in essence,
+// what it boils down is that the new code did not implement the
+// face_flip flag correctly
+
+#include "../tests.h"
+#include <deal.II/base/logstream.h>
+#include <deal.II/dofs/dof_handler.h>
+#include <deal.II/dofs/dof_tools.h>
+#include <deal.II/fe/fe_q.h>
+#include <deal.II/fe/fe_system.h>
+#include <deal.II/fe/component_mask.h>
+#include <deal.II/fe/mapping_q.h>
+#include <deal.II/grid/grid_tools.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/lac/constraint_matrix.h>
+
+#include <iostream>
+#include <utility>
+
+#include <fstream>
+std::ofstream logfile("dof_tools_21_b_x/output");
+
+using namespace dealii;
+
+
+
+/*
+ * Generate a grid consisting of two disjoint cells, colorize the two
+ * outermost faces. They will be matched via collect_periodic_face_pairs
+ *
+ * The integer orientation determines the orientation of the second cell
+ * to get something else than the boring default orientation.
+ */
+
+/* The 2D case */
+void generate_grid(Triangulation<2> &triangulation)
+{
+  Point<2> vertices_1[]
+  =
+  {
+    Point<2> (-1.,-3.),
+    Point<2> (+1.,-3.),
+    Point<2> (-1.,-1.),
+    Point<2> (+1.,-1.),
+    Point<2> (-1.,+1.),
+    Point<2> (+1.,+1.),
+    Point<2> (-1.,+3.),
+    Point<2> (+1.,+3.),
+  };
+  std::vector<Point<2> > vertices (&vertices_1[0], &vertices_1[8]);
+
+  std::vector<CellData<2> > cells (2, CellData<2>());
+
+  /* cell 0 */
+  int cell_vertices_0[GeometryInfo<2>::vertices_per_cell] = {0, 1,  2,  3};
+
+  /* cell 1 */
+  int cell_vertices_1[GeometryInfo<2>::vertices_per_cell] = {7,6,5,4};
+
+  for (unsigned int j=0; j<GeometryInfo<2>::vertices_per_cell; ++j)
+    {
+      cells[0].vertices[j] = cell_vertices_0[j];
+      cells[1].vertices[j] = cell_vertices_1[j];
+    }
+  cells[0].material_id = 0;
+  cells[1].material_id = 0;
+
+  triangulation.create_triangulation(vertices, cells, SubCellData());
+
+  Triangulation<2>::cell_iterator cell_1 = triangulation.begin();
+  Triangulation<2>::cell_iterator cell_2 = cell_1++;
+  Triangulation<2>::face_iterator face_1;
+  Triangulation<2>::face_iterator face_2;
+
+  // Look for the two outermost faces:
+  for (unsigned int j=0; j<GeometryInfo<2>::faces_per_cell; ++j)
+    {
+      if (cell_1->face(j)->center()(1) > 2.9)
+        face_1 = cell_1->face(j);
+      if (cell_2->face(j)->center()(1) < -2.9)
+        face_2 = cell_2->face(j);
+    }
+  face_1->set_boundary_indicator(42);
+  face_2->set_boundary_indicator(43);
+}
+
+
+/*
+ * Print out all face DoFs and support points as well as the actual
+ * matching via make_periodicity_constraints
+ */
+template<int dim>
+void print_matching(DoFHandler<dim> &dof_handler)
+{
+  const FiniteElement<dim> &fe = dof_handler.get_fe();
+  MappingQ<dim> mapping(1);
+
+  ConstraintMatrix constraint_matrix;
+  std::vector<Point<dim> > support_points(dof_handler.n_dofs());
+  DoFTools::map_dofs_to_support_points<dim>(mapping, dof_handler, support_points);
+
+  // Look for the two outermost faces:
+  typename DoFHandler<dim>::face_iterator face_1 = (++dof_handler.begin(0))->face(2);
+  typename DoFHandler<dim>::face_iterator face_2 = dof_handler.begin(0)->face(2);
+
+  // Determine the orientation of the two faces:
+
+  std::vector<types::global_dof_index> dofs_1(fe.dofs_per_face);
+  std::vector<types::global_dof_index> dofs_2(fe.dofs_per_face);
+  face_1->get_dof_indices(dofs_1);
+  face_2->get_dof_indices(dofs_2);
+
+  // Print out all DoF support points on the two faces:
+  deallog << "DoFs of face_1:" << std::endl;
+  for (unsigned int i = 0; i < fe.dofs_per_face; ++i)
+    deallog << dofs_1[i] << " is located at "
+           << support_points[dofs_1[i]] << std::endl;
+  deallog << "DoFs of face_2:" << std::endl;
+  for (unsigned int i = 0; i < fe.dofs_per_face; ++i)
+    deallog << dofs_2[i] << " is located at "
+           << support_points[dofs_2[i]] << std::endl;
+
+
+  std::bitset<3> orientation;
+  orientation[0] = 1;
+  orientation[1] = 1;
+  orientation[2] = 0;
+
+  DoFTools::make_periodicity_constraints (face_1,
+                                          face_2,
+                                          constraint_matrix,
+                                          ComponentMask(),
+                                          orientation[0], orientation[1], orientation[2]);
+  constraint_matrix.print(deallog.get_file_stream());
+  constraint_matrix.close();
+  deallog << "Matching:" << std::endl;
+}
+
+
+
+int main()
+{
+  deallog << std::setprecision(4);
+  logfile << std::setprecision(4);
+  deallog.attach(logfile);
+  deallog.depth_console(0);
+  deallog.threshold_double(1.e-10);
+
+  // Generate a triangulation and match:
+  Triangulation<2> triangulation;
+  FE_Q<2> fe(1);
+  DoFHandler<2> dof_handler;
+
+  generate_grid(triangulation);
+  dof_handler.initialize(triangulation, fe);
+  print_matching(dof_handler);
+
+  return 0;
+}

diff --git a/tests/bits/dof_tools_21_b_x/cmp/generic b/tests/bits/dof_tools_21_b_x/cmp/generic
new file mode 100644 (file)
index 0000000..0876ae0
--- /dev/null
+++ b/tests/bits/dof_tools_21_b_x/cmp/generic
@@ -0,0 +1,10 @@
+
+DEAL::DoFs of face_1:
+DEAL::4 is located at 1.000 3.000
+DEAL::5 is located at -1.000 3.000
+DEAL::DoFs of face_2:
+DEAL::0 is located at -1.000 -3.000
+DEAL::1 is located at 1.000 -3.000
+    4 1:  1.000
+    5 0:  1.000
+DEAL::Matching:

diff --git a/tests/bits/dof_tools_21_b_y.cc b/tests/bits/dof_tools_21_b_y.cc
new file mode 100644 (file)
index 0000000..ca82a6c
--- /dev/null
+++ b/tests/bits/dof_tools_21_b_y.cc
@@ -0,0 +1,184 @@
+// ---------------------------------------------------------------------
+// $Id$
+//
+// Copyright (C) 2003 - 2013 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
+//   DoFTools::
+//   make_periodicity_constraints (const FaceIterator       &,
+//                                 const FaceIterator       &,
+//                                 dealii::ConstraintMatrix &,
+//                                 const std::vector<bool>  &,
+//                                 bool, bool, bool)
+// for correct behaviour on non standard oriented meshes.
+//
+// like _21_b_x, but with a once refined mesh
+
+#include "../tests.h"
+#include <deal.II/base/logstream.h>
+#include <deal.II/dofs/dof_handler.h>
+#include <deal.II/dofs/dof_tools.h>
+#include <deal.II/fe/fe_q.h>
+#include <deal.II/fe/fe_system.h>
+#include <deal.II/fe/component_mask.h>
+#include <deal.II/fe/mapping_q.h>
+#include <deal.II/grid/grid_tools.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/lac/constraint_matrix.h>
+
+#include <iostream>
+#include <utility>
+
+#include <fstream>
+std::ofstream logfile("dof_tools_21_b_y/output");
+
+using namespace dealii;
+
+
+
+/*
+ * Generate a grid consisting of two disjoint cells, colorize the two
+ * outermost faces. They will be matched via collect_periodic_face_pairs
+ *
+ * The integer orientation determines the orientation of the second cell
+ * to get something else than the boring default orientation.
+ */
+
+/* The 2D case */
+void generate_grid(Triangulation<2> &triangulation)
+{
+  Point<2> vertices_1[]
+  =
+  {
+    Point<2> (-1.,-3.),
+    Point<2> (+1.,-3.),
+    Point<2> (-1.,-1.),
+    Point<2> (+1.,-1.),
+    Point<2> (-1.,+1.),
+    Point<2> (+1.,+1.),
+    Point<2> (-1.,+3.),
+    Point<2> (+1.,+3.),
+  };
+  std::vector<Point<2> > vertices (&vertices_1[0], &vertices_1[8]);
+
+  std::vector<CellData<2> > cells (2, CellData<2>());
+
+  /* cell 0 */
+  int cell_vertices_0[GeometryInfo<2>::vertices_per_cell] = {0, 1,  2,  3};
+
+  /* cell 1 */
+  int cell_vertices_1[GeometryInfo<2>::vertices_per_cell] = {7,6,5,4};
+
+  for (unsigned int j=0; j<GeometryInfo<2>::vertices_per_cell; ++j)
+    {
+      cells[0].vertices[j] = cell_vertices_0[j];
+      cells[1].vertices[j] = cell_vertices_1[j];
+    }
+  cells[0].material_id = 0;
+  cells[1].material_id = 0;
+
+  triangulation.create_triangulation(vertices, cells, SubCellData());
+  triangulation.refine_global (1);
+
+  Triangulation<2>::cell_iterator cell_1 = triangulation.begin();
+  Triangulation<2>::cell_iterator cell_2 = cell_1++;
+  Triangulation<2>::face_iterator face_1;
+  Triangulation<2>::face_iterator face_2;
+
+  // Look for the two outermost faces:
+  for (unsigned int j=0; j<GeometryInfo<2>::faces_per_cell; ++j)
+    {
+      if (cell_1->face(j)->center()(1) > 2.9)
+        face_1 = cell_1->face(j);
+      if (cell_2->face(j)->center()(1) < -2.9)
+        face_2 = cell_2->face(j);
+    }
+  face_1->set_boundary_indicator(42);
+  face_2->set_boundary_indicator(43);
+}
+
+
+/*
+ * Print out all face DoFs and support points as well as the actual
+ * matching via make_periodicity_constraints
+ */
+template<int dim>
+void print_matching(DoFHandler<dim> &dof_handler)
+{
+  const FiniteElement<dim> &fe = dof_handler.get_fe();
+  MappingQ<dim> mapping(1);
+
+  ConstraintMatrix constraint_matrix;
+  std::vector<Point<dim> > support_points(dof_handler.n_dofs());
+  DoFTools::map_dofs_to_support_points<dim>(mapping, dof_handler, support_points);
+
+  // Look for the two outermost faces:
+  typename DoFHandler<dim>::face_iterator face_1 = (++dof_handler.begin(0))->face(2);
+  typename DoFHandler<dim>::face_iterator face_2 = dof_handler.begin(0)->face(2);
+
+  // Determine the orientation of the two faces:
+
+  std::vector<types::global_dof_index> dofs_1(fe.dofs_per_face);
+  std::vector<types::global_dof_index> dofs_2(fe.dofs_per_face);
+  face_1->get_dof_indices(dofs_1);
+  face_2->get_dof_indices(dofs_2);
+
+  // Print out all DoF support points on the two faces:
+  deallog << "DoFs of face_1:" << std::endl;
+  for (unsigned int i = 0; i < fe.dofs_per_face; ++i)
+    deallog << dofs_1[i] << " is located at "
+           << support_points[dofs_1[i]] << std::endl;
+  deallog << "DoFs of face_2:" << std::endl;
+  for (unsigned int i = 0; i < fe.dofs_per_face; ++i)
+    deallog << dofs_2[i] << " is located at "
+           << support_points[dofs_2[i]] << std::endl;
+
+
+  std::bitset<3> orientation;
+  orientation[0] = 1;
+  orientation[1] = 1;
+  orientation[2] = 0;
+
+  DoFTools::make_periodicity_constraints (face_1,
+                                          face_2,
+                                          constraint_matrix,
+                                          ComponentMask(),
+                                          orientation[0], orientation[1], orientation[2]);
+  constraint_matrix.print(deallog.get_file_stream());
+  constraint_matrix.close();
+  deallog << "Matching:" << std::endl;
+}
+
+
+
+int main()
+{
+  deallog << std::setprecision(4);
+  logfile << std::setprecision(4);
+  deallog.attach(logfile);
+  deallog.depth_console(0);
+  deallog.threshold_double(1.e-10);
+
+  // Generate a triangulation and match:
+  Triangulation<2> triangulation;
+  FE_Q<2> fe(1);
+  DoFHandler<2> dof_handler;
+
+  generate_grid(triangulation);
+  dof_handler.initialize(triangulation, fe);
+  print_matching(dof_handler);
+
+  return 0;
+}

diff --git a/tests/bits/dof_tools_21_b_y/cmp/generic b/tests/bits/dof_tools_21_b_y/cmp/generic
new file mode 100644 (file)
index 0000000..2a38ad5
--- /dev/null
+++ b/tests/bits/dof_tools_21_b_y/cmp/generic
@@ -0,0 +1,11 @@
+
+DEAL::DoFs of face_1:
+DEAL::9 is located at 1.000 3.000
+DEAL::13 is located at -1.000 3.000
+DEAL::DoFs of face_2:
+DEAL::0 is located at -1.000 -3.000
+DEAL::4 is located at 1.000 -3.000
+    9 4:  1.000
+    10 1:  1.000
+    13 0:  1.000
+DEAL::Matching: