]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Move the ConstraintMatrix class to the lac subdirectory (that's where it belongs...
authorkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 4 Mar 2009 22:01:56 +0000 (22:01 +0000)
committerkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 4 Mar 2009 22:01:56 +0000 (22:01 +0000)
git-svn-id: https://svn.dealii.org/trunk@18448 0785d39b-7218-0410-832d-ea1e28bc413d

34 files changed:
deal.II/deal.II/include/dofs/dof_tools.h
deal.II/deal.II/include/multigrid/mg_transfer.templates.h
deal.II/deal.II/include/multigrid/mg_transfer_block.templates.h
deal.II/deal.II/include/multigrid/mg_transfer_component.templates.h
deal.II/deal.II/include/numerics/vectors.templates.h
deal.II/deal.II/source/dofs/dof_renumbering.cc
deal.II/deal.II/source/dofs/dof_tools.cc
deal.II/deal.II/source/fe/fe_tools.cc
deal.II/deal.II/source/grid/grid_generator.cc
deal.II/deal.II/source/multigrid/mg_dof_handler.cc
deal.II/deal.II/source/multigrid/mg_smoother.cc
deal.II/doc/news/changes.h
deal.II/examples/step-11/step-11.cc
deal.II/examples/step-13/step-13.cc
deal.II/examples/step-14/step-14.cc
deal.II/examples/step-15/step-15.cc
deal.II/examples/step-17/step-17.cc
deal.II/examples/step-18/step-18.cc
deal.II/examples/step-21/step-21.cc
deal.II/examples/step-22/step-22.cc
deal.II/examples/step-23/step-23.cc
deal.II/examples/step-24/step-24.cc
deal.II/examples/step-25/step-25.cc
deal.II/examples/step-27/step-27.cc
deal.II/examples/step-28/step-28.cc
deal.II/examples/step-31/step-31.cc
deal.II/examples/step-32/step-32.cc
deal.II/examples/step-6/step-6.cc
deal.II/examples/step-7/step-7.cc
deal.II/examples/step-8/step-8.cc
deal.II/examples/step-9/step-9.cc
deal.II/lac/include/lac/constraint_matrix.h [moved from deal.II/deal.II/include/dofs/dof_constraints.h with 100% similarity]
deal.II/lac/include/lac/constraint_matrix.templates.h [moved from deal.II/deal.II/include/dofs/dof_constraints.templates.h with 99% similarity]
deal.II/lac/source/constraint_matrix.cc [moved from deal.II/deal.II/source/dofs/dof_constraints.cc with 99% similarity]

index 0c1b4a93047f4e1e812e30cc40c68282400cfeac..ffdfb14edc32869994d2a0270fbf1e4a2619b277 100644 (file)
@@ -17,8 +17,8 @@
 #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>
index 0660168b793b72b12010acd514298e056c5be260..ed103605a74c784365d80a52b1de7f751eaa062a 100644 (file)
@@ -2,7 +2,7 @@
 //    $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
@@ -15,9 +15,9 @@
 #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>
index 9ac0705c2a9ea99a1c81f22ae16b03157264d683..5ead16173831912012cc9033748df65ec43ab8ab 100644 (file)
@@ -2,7 +2,7 @@
 //    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
@@ -15,9 +15,9 @@
 #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>
index a8b23c023b97095a0521be66e40aa85220066017..ce7bc818181022d2e93f077de6528e2e65a75308 100644 (file)
@@ -2,7 +2,7 @@
 //    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
@@ -17,7 +17,7 @@
 #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>
index 6f4616b6d34a513af81843c1c4b8c7ad45686f17..1677cbd99f0badf038bdfc77f3ab2364b200f2c9 100644 (file)
@@ -2,7 +2,7 @@
 //    $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>
index dce10f28d26f52ebb4ee8920a7215e02be3ffa8e..c46add54d7baacd16acf33aea83b215655b1cb8c 100644 (file)
 #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>
index 077b493fc4af2e445d97ad972b04f51f23d9018f..3545b3fff2f92258dbae500a14f7db1aaa157ea1 100644 (file)
 #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>
index eb5b92a437e7bd799546746014d457d72bbf8d69..0dc2b331b7747a06a3be59d721c3bee0b0f58d66 100644 (file)
@@ -2,7 +2,7 @@
 //    $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
@@ -23,6 +23,7 @@
 #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>
@@ -39,7 +40,6 @@
 #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>
index a3fd18767fc956d923e61a8a96e1410b26ca62c3..a959825bc3c1dc30e33758cedbce942d14f14f15 100644 (file)
@@ -20,6 +20,7 @@
 #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>
@@ -29,7 +30,6 @@
 #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>
index ad9996744cea1ff02b8bb7096d4658f20d7351d0..eccdbbcf05f3ee36269ded58f432b8ddab235b90 100644 (file)
 //---------------------------------------------------------------------------
 
 #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>
@@ -23,7 +24,6 @@
 #include <grid/tria.h>
 #include <base/geometry_info.h>
 #include <fe/fe.h>
-#include <lac/sparse_matrix.h>
 #include <base/exceptions.h>
 
 #include <algorithm>
index 34399ec465acf36382c1b07a32718abd45d082b6..76a5a9af7e0fccc6dec978f96e71ab02f38ca252 100644 (file)
 //---------------------------------------------------------------------------
 
 
+#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>
 
index fd6eeafa1e4addb47bcdbe92b117cede8fff2490..68d1a323f2817b921826f67c7eea8bc60b9cb568 100644 (file)
@@ -30,6 +30,22 @@ inconvenience this causes.
 </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
index a862b28525b33d8f72e5acb157262eaef132e8df..77fb944fa16ebd1a8c501acf815bb2be9b39b6e5 100644 (file)
@@ -3,7 +3,7 @@
 
 /*    $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>
index 5bfff99d8c0208032a031b1a8f6092dc30976808..4b9d28f851795a4711056ec54c34c48062540a21 100644 (file)
@@ -3,7 +3,7 @@
 
 /*    $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>
index 6626b0621f036f312f626f1f8685b326476c96bc..eda4c9ff10ac84a1c9b8254bdbc898bb5fde9755 100644 (file)
@@ -3,7 +3,7 @@
 
 /*    $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     */
@@ -21,6 +21,7 @@
 #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>
@@ -28,7 +29,6 @@
 #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>
index bfd33111b19e97a92ccc071664165c24943a5c06..46ec6243e90b02df84a938baa84a1d91665a7129 100644 (file)
@@ -3,7 +3,7 @@
 
 /*    $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     */
@@ -21,6 +21,7 @@
 #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>
@@ -29,7 +30,6 @@
 #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>
index 6b261db1a762b3bd679a3c3c954c8cc6c440e70c..30a967d979367633a663b3a4d7e550302003bb7e 100644 (file)
@@ -3,7 +3,7 @@
 
 /*    $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     */
@@ -19,6 +19,7 @@
 #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>
@@ -28,7 +29,6 @@
 #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>
index ceb709eaf70c0f3cb9d8acf6891a18377510869f..ac3b795241122ad6ca9fb6923bdaea44f8d06745 100644 (file)
@@ -3,7 +3,7 @@
 
 /*    $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     */
@@ -27,6 +27,7 @@
 #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>
@@ -37,7 +38,6 @@
 #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>
index b490275e58f5bad191e6d6f20876e6e387369e4c..75bf4b7af079e90b933821808f69bafa72e781e2 100644 (file)
@@ -3,7 +3,7 @@
 
 /*    $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     */
@@ -31,6 +31,7 @@
 #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>
@@ -42,7 +43,6 @@
 #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>
index 644c7457836e2703054548d3fe0f26cbe45e1708..939726b6a9a722e53f4c659b041e69bffb738555 100644 (file)
@@ -25,6 +25,7 @@
 #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>
@@ -38,7 +39,6 @@
 #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>
index 0c1552440225a6cf293301e81a1ebbe8b8081636..96804c531507cd2f88ad142dac1925274864d259 100644 (file)
@@ -4,7 +4,7 @@
 /*    $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     */
@@ -26,6 +26,7 @@
 #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>
@@ -35,7 +36,6 @@
 #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>
index cdeab1c4a24c2641a76fef1428d80b8c276925c5..bcd0bbd594579c13bef974da267518b5bc6e1f63 100644 (file)
@@ -1,7 +1,7 @@
 /* $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     */
@@ -24,6 +24,7 @@
 #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>
@@ -34,7 +35,6 @@
 #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>
index c596e2d531e2a8dcd1cd36a25c6ac8cc7e0a17d8..2d5eeb9228c9b581e2f6b99ee6543849f81b8bd2 100644 (file)
@@ -1,5 +1,5 @@
 /* $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     */
@@ -34,6 +34,7 @@
 #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>
@@ -41,7 +42,6 @@
 #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>
index 7fdbc93bf0c5ce7feb0f1ce228c9bdb67f6abac0..a5ac374a72d1cc503238ca22b831464affd34d75 100644 (file)
@@ -3,7 +3,7 @@
 
 /*    $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     */
@@ -25,6 +25,7 @@
 #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>
@@ -32,7 +33,6 @@
 #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>
index a0dccc1b7f63813c2e0e7a2ca94474689774bf43..57b85369baae7b75190bebaebcb012e72c44741a 100644 (file)
@@ -1,7 +1,7 @@
 /*    $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     */
@@ -26,6 +26,7 @@
 #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>
@@ -36,7 +37,6 @@
 #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>
index eead40b5175f6fe2a62a0262a4200f862f3e25b3..68c6d1b5cb03ecb59566ed2d923e447ffe10151e 100644 (file)
@@ -24,6 +24,7 @@
 #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>
@@ -36,7 +37,6 @@
 #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>
index 3687414cca88ec246fc17b16d4ddb04e50a9bcaf..35adcfff592009c115fe56da9c10c36553ea018d 100644 (file)
@@ -1,6 +1,6 @@
 /* $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 */
 /*                                                                */
@@ -24,6 +24,7 @@
 #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>
@@ -41,7 +42,6 @@
 #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>
index 54dfdf93142133f31dbe986dacaac5ef4efdf2da..b6d3ae272965e557ccdc222f968515102e19969c 100644 (file)
@@ -76,7 +76,7 @@
                                 // 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
index a00785874f876e406a488452ed0081b211d39152..494c663b14e0b27bf5410cb5cfa3387c0113bb03 100644 (file)
@@ -3,7 +3,7 @@
 
 /*    $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     */
@@ -24,6 +24,7 @@
 #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>
@@ -31,7 +32,6 @@
 #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>
index f5d8f820aeedceeff631bf124f506bb7110242ed..c4dc5eb8d4a3563be22cf191a6a7fdbd775ce7e0 100644 (file)
@@ -23,6 +23,7 @@
 #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>
@@ -36,7 +37,6 @@
 #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
index 602d2ba20eb1c613fbc5c0fa0c081b8c5c250661..ea368148a0916d8fe73ade637ec3ee6e6aba24e3 100644 (file)
@@ -22,6 +22,7 @@
 #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>
@@ -31,7 +32,6 @@
 #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>
similarity index 99%
rename from deal.II/deal.II/include/dofs/dof_constraints.templates.h
rename to deal.II/lac/include/lac/constraint_matrix.templates.h
index db04ee81362c30b1d6a5424ebdc6de6df78d636d..951d98b51032fd1ab5105cfbe86963b09f48e5bc 100644 (file)
@@ -15,7 +15,7 @@
 
 
 #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>
similarity index 99%
rename from deal.II/deal.II/source/dofs/dof_constraints.cc
rename to deal.II/lac/source/constraint_matrix.cc
index 823d11a4bc3ed2da7b06068603c5f4f5b6758758..3734785d59326c5f1fe7b72cfc12abff9867e89e 100644 (file)
@@ -12,8 +12,8 @@
 //---------------------------------------------------------------------------
 
 
-#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>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.