#include <base/config.h>
#include <base/exceptions.h>
#include <base/table.h>
+#include <lac/constraint_matrix.h>
#include <dofs/function_map.h>
-#include <dofs/dof_constraints.h>
#include <vector>
#include <set>
// $Id$
// Version: $Name$
//
-// Copyright (C) 2003, 2004, 2005, 2006, 2007 by the deal.II authors
+// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 by the deal.II authors
//
// This file is subject to QPL and may not be distributed
// without copyright and license information. Please refer
#define __deal2__mg_transfer_templates_h
#include <lac/sparse_matrix.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria_iterator.h>
#include <fe/fe.h>
-#include <dofs/dof_constraints.h>
#include <multigrid/mg_base.h>
#include <multigrid/mg_dof_accessor.h>
#include <multigrid/mg_tools.h>
// mg_transfer.templates.h,v 1.22 2006/01/29 15:03:55 guido Exp
// Version:
//
-// Copyright (C) 2003, 2004, 2005, 2006, 2007 by the deal.II authors
+// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 by the deal.II authors
//
// This file is subject to QPL and may not be distributed
// without copyright and license information. Please refer
#define __deal2__mg_transfer_block_templates_h
#include <lac/sparse_matrix.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria_iterator.h>
#include <fe/fe.h>
-#include <dofs/dof_constraints.h>
#include <multigrid/mg_base.h>
#include <multigrid/mg_dof_accessor.h>
#include <multigrid/mg_tools.h>
// mg_transfer.templates.h,v 1.22 2006/01/29 15:03:55 guido Exp
// Version:
//
-// Copyright (C) 2003, 2004, 2005, 2006, 2007 by the deal.II authors
+// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 by the deal.II authors
//
// This file is subject to QPL and may not be distributed
// without copyright and license information. Please refer
#include <lac/sparse_matrix.h>
#include <grid/tria_iterator.h>
#include <fe/fe.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
#include <multigrid/mg_base.h>
#include <multigrid/mg_dof_accessor.h>
#include <multigrid/mg_tools.h>
// $Id$
// Version: $Name: $
//
-// Copyright (C) 2005, 2006, 2007, 2008 by the deal.II authors
+// Copyright (C) 2005, 2006, 2007, 2008, 2009 by the deal.II authors
//
// This file is subject to QPL and may not be distributed
// without copyright and license information. Please refer
#include <lac/solver_cg.h>
#include <lac/vector_memory.h>
#include <lac/filtered_matrix.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria_iterator.h>
#include <grid/grid_tools.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
-#include <dofs/dof_constraints.h>
#include <dofs/dof_tools.h>
#include <fe/fe.h>
#include <fe/fe_tools.h>
#include <lac/sparsity_pattern.h>
#include <lac/sparsity_tools.h>
#include <lac/compressed_sparsity_pattern.h>
+#include <lac/constraint_matrix.h>
#include <dofs/dof_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/tria.h>
#include <dofs/dof_handler.h>
#include <hp/dof_handler.h>
-#include <dofs/dof_constraints.h>
#include <dofs/dof_tools.h>
#include <fe/fe.h>
#include <dofs/dof_renumbering.h>
#include <base/table.h>
#include <base/template_constraints.h>
#include <base/utilities.h>
+#include <lac/sparsity_pattern.h>
+#include <lac/compressed_sparsity_pattern.h>
+#include <lac/compressed_set_sparsity_pattern.h>
+#include <lac/compressed_simple_sparsity_pattern.h>
+#include <lac/trilinos_sparsity_pattern.h>
+#include <lac/block_sparsity_pattern.h>
+#include <lac/vector.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/tria_iterator.h>
#include <grid/intergrid_map.h>
#include <grid/grid_tools.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
-#include <dofs/dof_constraints.h>
#include <fe/fe.h>
#include <fe/fe_values.h>
#include <fe/fe_tools.h>
#include <hp/fe_collection.h>
#include <dofs/dof_tools.h>
-#include <lac/sparsity_pattern.h>
-#include <lac/compressed_sparsity_pattern.h>
-#include <lac/compressed_set_sparsity_pattern.h>
-#include <lac/compressed_simple_sparsity_pattern.h>
-#include <lac/trilinos_sparsity_pattern.h>
-#include <lac/block_sparsity_pattern.h>
-#include <lac/vector.h>
#include <numerics/vectors.h>
#include <multigrid/mg_dof_handler.h>
// $Id$
// Version: $Name$
//
-// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by the deal.II authors
+// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors
//
// This file is subject to QPL and may not be distributed
// without copyright and license information. Please refer
#include <lac/block_vector.h>
#include <lac/trilinos_vector.h>
#include <lac/trilinos_block_vector.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/tria_iterator.h>
#include <grid/grid_generator.h>
#include <fe/fe_system.h>
#include <fe/fe_values.h>
#include <fe/mapping_cartesian.h>
-#include <dofs/dof_constraints.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <lac/precondition.h>
#include <lac/solver_cg.h>
#include <lac/sparse_matrix.h>
+#include <lac/constraint_matrix.h>
#include <grid/grid_generator.h>
#include <grid/grid_reordering.h>
#include <grid/grid_tools.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
#include <fe/mapping_q1.h>
#include <fe/fe_q.h>
#include <numerics/matrices.h>
//---------------------------------------------------------------------------
#include <base/memory_consumption.h>
+#include <lac/sparse_matrix.h>
+#include <lac/constraint_matrix.h>
#include <dofs/dof_levels.h>
#include <dofs/dof_faces.h>
-#include <dofs/dof_constraints.h>
#include <multigrid/mg_dof_handler.h>
#include <multigrid/mg_dof_accessor.h>
#include <grid/tria_levels.h>
#include <grid/tria.h>
#include <base/geometry_info.h>
#include <fe/fe.h>
-#include <lac/sparse_matrix.h>
#include <base/exceptions.h>
#include <algorithm>
//---------------------------------------------------------------------------
+#include <lac/vector.h>
+#include <lac/block_vector.h>
+#include <lac/sparse_matrix.h>
+#include <lac/block_sparse_matrix.h>
+#include <lac/constraint_matrix.h>
+#include <fe/fe.h>
#include <grid/tria.h>
-#include <dofs/dof_constraints.h>
+#include <grid/tria_iterator.h>
#include <multigrid/mg_dof_handler.h>
#include <multigrid/mg_dof_accessor.h>
-#include <grid/tria_iterator.h>
-#include <fe/fe.h>
#include <multigrid/mg_smoother.h>
#include <multigrid/mg_smoother.templates.h>
-#include <lac/vector.h>
-#include <lac/block_vector.h>
-#include <lac/sparse_matrix.h>
-#include <lac/block_sparse_matrix.h>
#include <algorithm>
</p>
<ol>
+ <li>
+ <p>
+ Changed: The files implementing the class ConstraintMatrix are now
+ saved in the lac/ subdirectory, named <code>constraint_matrix.h</code>
+ and included by the line <code>#include
+ <lac/constraint_matrix.h></code>. After all, constraints are just
+ algebraic objects and do not depend on anything in the deal.II
+ directory (in particular, they are dimension-independent). The old
+ <code>#include <dofs/dof_constraints.h></code> include line is still
+ enabled by a reference to the new file, but users should try to adapt
+ their codes to the new file names as the reference might be removed in
+ the future.
+ <br>
+ (Martin Kronbichler 2009/03/04)
+ </p>
+
<li>
<p>
Changed: The function DoFTools::get_subdomain_association function used
/* $Id$ */
/* */
-/* Copyright (C) 2001, 2002, 2003, 2004, 2006 by the deal.II authors */
+/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2009 by the deal.II authors */
/* */
/* This file is subject to QPL and may not be distributed */
/* without copyright and license information. Please refer */
#include <lac/sparse_matrix.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <grid/tria_boundary_lib.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <fe/fe_q.h>
/* $Id$ */
/* */
-/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2008 by the deal.II authors */
+/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 by the deal.II authors */
/* */
/* This file is subject to QPL and may not be distributed */
/* without copyright and license information. Please refer */
#include <lac/sparse_matrix.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/grid_refinement.h>
#include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <fe/fe_q.h>
/* $Id$ */
/* */
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 by the deal.II authors */
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors */
/* */
/* This file is subject to QPL and may not be distributed */
/* without copyright and license information. Please refer */
#include <lac/sparse_matrix.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
#include <grid/grid_refinement.h>
#include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <fe/fe_q.h>
/* $Id$ */
/* */
-/* Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 by the deal.II authors */
+/* Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009 by the deal.II authors */
/* */
/* This file is subject to QPL and may not be distributed */
/* without copyright and license information. Please refer */
#include <lac/sparse_matrix.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <grid/tria_boundary_lib.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
-#include <dofs/dof_constraints.h>
#include <dofs/dof_tools.h>
#include <fe/fe_q.h>
#include <fe/fe_values.h>
/* $Id$ */
/* */
-/* Copyright (C) 2000, 2004, 2005, 2006, 2007, 2008 by the deal.II authors */
+/* Copyright (C) 2000, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors */
/* */
/* This file is subject to QPL and may not be distributed */
/* without copyright and license information. Please refer */
#include <base/logstream.h>
#include <lac/vector.h>
#include <lac/full_matrix.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
#include <fe/fe_values.h>
#include <fe/fe_system.h>
#include <fe/fe_q.h>
/* $Id$ */
/* */
-/* Copyright (C) 2000, 2004, 2005, 2006, 2007, 2008 by the deal.II authors */
+/* Copyright (C) 2000, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors */
/* */
/* This file is subject to QPL and may not be distributed */
/* without copyright and license information. Please refer */
#include <lac/petsc_parallel_sparse_matrix.h>
#include <lac/petsc_solver.h>
#include <lac/petsc_precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
#include <dofs/dof_renumbering.h>
#include <fe/fe_values.h>
#include <fe/fe_system.h>
/* $Id$ */
/* */
-/* Copyright (C) 2006, 2007, 2008 by the deal.II authors */
+/* Copyright (C) 2006, 2007, 2008, 2009 by the deal.II authors */
/* */
/* This file is subject to QPL and may not be distributed */
/* without copyright and license information. Please refer */
#include <lac/block_sparse_matrix.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <dofs/dof_renumbering.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
#include <fe/fe_raviart_thomas.h>
#include <fe/fe_dgq.h>
#include <lac/block_sparse_matrix.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <dofs/dof_renumbering.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <fe/fe_system.h>
/* $Id$ */
/* Version: $Name: $ */
/* */
-/* Copyright (C) 2006, 2007, 2008 by the deal.II authors */
+/* Copyright (C) 2006, 2007, 2008, 2009 by the deal.II authors */
/* */
/* This file is subject to QPL and may not be distributed */
/* without copyright and license information. Please refer */
#include <lac/sparse_matrix.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <fe/fe_values.h>
/* $Id$ */
/* Version: $Name: $ */
/* */
-/* Copyright (C) 2006, 2007, 2008 by the deal.II authors */
+/* Copyright (C) 2006, 2007, 2008, 2009 by the deal.II authors */
/* Author: Xing Jin, Wolfgang Bangerth, Texas A&M University, 2006 */
/* */
/* This file is subject to QPL and may not be distributed */
#include <lac/sparse_matrix.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <fe/fe_values.h>
/* $Id$ */
-/* Copyright (C) 2006, 2007, 2008 by the deal.II authors */
+/* Copyright (C) 2006, 2007, 2008, 2009 by the deal.II authors */
/* Author: Ivan Christov, Wolfgang Bangerth, Texas A&M University, 2006 */
/* */
/* This file is subject to QPL and may not be distributed */
#include <lac/sparse_matrix.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <grid/tria_accessor.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <fe/fe_values.h>
#include <numerics/vectors.h>
/* $Id$ */
/* */
-/* Copyright (C) 2006, 2007, 2008 by the deal.II authors */
+/* Copyright (C) 2006, 2007, 2008, 2009 by the deal.II authors */
/* */
/* This file is subject to QPL and may not be distributed */
/* without copyright and license information. Please refer */
#include <lac/sparse_matrix.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_refinement.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
/* $Id$ */
/* Version: $Name: $ */
/* */
-/* Copyright (C) 2006, 2007, 2008 by the deal.II authors and Yaqi Wang */
+/* Copyright (C) 2006, 2007, 2008, 2009 by the deal.II authors and Yaqi Wang */
/* */
/* This file is subject to QPL and may not be distributed */
/* without copyright and license information. Please refer */
#include <lac/sparse_matrix.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_refinement.h>
#include <grid/grid_out.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <fe/fe_values.h>
#include <numerics/vectors.h>
#include <lac/full_matrix.h>
#include <lac/solver_gmres.h>
#include <lac/solver_cg.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <dofs/dof_renumbering.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <fe/fe_system.h>
/* $Id$ */
/* Author: Martin Kronbichler, Uppsala University,
- Wolfgang Bangerth, Texas A&M University 2007, 2008 */
+ Wolfgang Bangerth, Texas A&M University 2007, 2008, 2009 */
/* */
/* Copyright (C) 2008, 2009 by the deal.II authors */
/* */
#include <lac/full_matrix.h>
#include <lac/solver_gmres.h>
#include <lac/solver_cg.h>
+#include <lac/constraint_matrix.h>
#include <lac/trilinos_block_vector.h>
#include <lac/trilinos_sparse_matrix.h>
#include <lac/trilinos_block_sparse_matrix.h>
#include <dofs/dof_renumbering.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <fe/fe_system.h>
// following file contains a class
// which is used to handle these
// constraints:
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
// In order to refine our grids
// locally, we need a function from
/* $Id$ */
/* */
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 by the deal.II authors */
+/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 by the deal.II authors */
/* */
/* This file is subject to QPL and may not be distributed */
/* without copyright and license information. Please refer */
#include <lac/sparse_matrix.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <grid/tria_iterator.h>
#include <grid/tria_boundary_lib.h>
#include <dofs/dof_handler.h>
-#include <dofs/dof_constraints.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <fe/fe_q.h>
#include <lac/sparse_matrix.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>
-#include <dofs/dof_constraints.h>
#include <numerics/error_estimator.h>
// In this example, we need
#include <lac/sparse_matrix.h>
#include <lac/solver_bicgstab.h>
#include <lac/precondition.h>
+#include <lac/constraint_matrix.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <dofs/dof_constraints.h>
#include <fe/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <base/config.h>
-#include <dofs/dof_constraints.h>
+#include <lac/constraint_matrix.h>
#include <lac/vector.h>
#include <lac/full_matrix.h>
#include <lac/sparsity_pattern.h>
//---------------------------------------------------------------------------
-#include <dofs/dof_constraints.h>
-#include <dofs/dof_constraints.templates.h>
+#include <lac/constraint_matrix.h>
+#include <lac/constraint_matrix.templates.h>
#include <base/memory_consumption.h>
#include <lac/sparsity_pattern.h>