From: kronbichler Date: Wed, 4 Mar 2009 22:01:56 +0000 (+0000) Subject: Move the ConstraintMatrix class to the lac subdirectory (that's where it belongs... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3d11107ba1274b187fe16ca920413d4bd2e0d23;p=dealii-svn.git Move the ConstraintMatrix class to the lac subdirectory (that's where it belongs to, since it is completely algebraic). Adapt all code that depends on it. Reintroduce a dummy for keeping the inclusion via dofs/dof_constraints.h in one minute. git-svn-id: https://svn.dealii.org/trunk@18448 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/dofs/dof_tools.h b/deal.II/deal.II/include/dofs/dof_tools.h index 0c1b4a9304..ffdfb14edc 100644 --- a/deal.II/deal.II/include/dofs/dof_tools.h +++ b/deal.II/deal.II/include/dofs/dof_tools.h @@ -17,8 +17,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/deal.II/deal.II/include/multigrid/mg_transfer.templates.h b/deal.II/deal.II/include/multigrid/mg_transfer.templates.h index 0660168b79..ed103605a7 100644 --- a/deal.II/deal.II/include/multigrid/mg_transfer.templates.h +++ b/deal.II/deal.II/include/multigrid/mg_transfer.templates.h @@ -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 +#include #include #include -#include #include #include #include diff --git a/deal.II/deal.II/include/multigrid/mg_transfer_block.templates.h b/deal.II/deal.II/include/multigrid/mg_transfer_block.templates.h index 9ac0705c2a..5ead161738 100644 --- a/deal.II/deal.II/include/multigrid/mg_transfer_block.templates.h +++ b/deal.II/deal.II/include/multigrid/mg_transfer_block.templates.h @@ -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 +#include #include #include -#include #include #include #include diff --git a/deal.II/deal.II/include/multigrid/mg_transfer_component.templates.h b/deal.II/deal.II/include/multigrid/mg_transfer_component.templates.h index a8b23c023b..ce7bc81818 100644 --- a/deal.II/deal.II/include/multigrid/mg_transfer_component.templates.h +++ b/deal.II/deal.II/include/multigrid/mg_transfer_component.templates.h @@ -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 #include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/include/numerics/vectors.templates.h b/deal.II/deal.II/include/numerics/vectors.templates.h index 6f4616b6d3..1677cbd99f 100644 --- a/deal.II/deal.II/include/numerics/vectors.templates.h +++ b/deal.II/deal.II/include/numerics/vectors.templates.h @@ -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 @@ -24,11 +24,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include diff --git a/deal.II/deal.II/source/dofs/dof_renumbering.cc b/deal.II/deal.II/source/dofs/dof_renumbering.cc index dce10f28d2..c46add54d7 100644 --- a/deal.II/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/deal.II/source/dofs/dof_renumbering.cc @@ -17,12 +17,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index 077b493fc4..3545b3fff2 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -18,25 +18,25 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include #include -#include #include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include #include #include diff --git a/deal.II/deal.II/source/fe/fe_tools.cc b/deal.II/deal.II/source/fe/fe_tools.cc index eb5b92a437..0dc2b331b7 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -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 #include #include +#include #include #include #include @@ -39,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/deal.II/deal.II/source/grid/grid_generator.cc b/deal.II/deal.II/source/grid/grid_generator.cc index a3fd18767f..a959825bc3 100644 --- a/deal.II/deal.II/source/grid/grid_generator.cc +++ b/deal.II/deal.II/source/grid/grid_generator.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -29,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/deal.II/deal.II/source/multigrid/mg_dof_handler.cc b/deal.II/deal.II/source/multigrid/mg_dof_handler.cc index ad9996744c..eccdbbcf05 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_handler.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_handler.cc @@ -12,9 +12,10 @@ //--------------------------------------------------------------------------- #include +#include +#include #include #include -#include #include #include #include @@ -23,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/deal.II/deal.II/source/multigrid/mg_smoother.cc b/deal.II/deal.II/source/multigrid/mg_smoother.cc index 34399ec465..76a5a9af7e 100644 --- a/deal.II/deal.II/source/multigrid/mg_smoother.cc +++ b/deal.II/deal.II/source/multigrid/mg_smoother.cc @@ -12,18 +12,18 @@ //--------------------------------------------------------------------------- +#include +#include +#include +#include +#include +#include #include -#include +#include #include #include -#include -#include #include #include -#include -#include -#include -#include #include diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index fd6eeafa1e..68d1a323f2 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -30,6 +30,22 @@ inconvenience this causes.

    +
  1. +

    + Changed: The files implementing the class ConstraintMatrix are now + saved in the lac/ subdirectory, named constraint_matrix.h + and included by the line #include + . 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 + #include 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. +
    + (Martin Kronbichler 2009/03/04) +

    +
  2. Changed: The function DoFTools::get_subdomain_association function used diff --git a/deal.II/examples/step-11/step-11.cc b/deal.II/examples/step-11/step-11.cc index a862b28525..77fb944fa1 100644 --- a/deal.II/examples/step-11/step-11.cc +++ b/deal.II/examples/step-11/step-11.cc @@ -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 */ @@ -22,13 +22,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include diff --git a/deal.II/examples/step-13/step-13.cc b/deal.II/examples/step-13/step-13.cc index 5bfff99d8c..4b9d28f851 100644 --- a/deal.II/examples/step-13/step-13.cc +++ b/deal.II/examples/step-13/step-13.cc @@ -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 */ @@ -30,13 +30,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include diff --git a/deal.II/examples/step-14/step-14.cc b/deal.II/examples/step-14/step-14.cc index 6626b0621f..eda4c9ff10 100644 --- a/deal.II/examples/step-14/step-14.cc +++ b/deal.II/examples/step-14/step-14.cc @@ -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 #include #include +#include #include #include #include @@ -28,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/deal.II/examples/step-15/step-15.cc b/deal.II/examples/step-15/step-15.cc index bfd33111b1..46ec6243e9 100644 --- a/deal.II/examples/step-15/step-15.cc +++ b/deal.II/examples/step-15/step-15.cc @@ -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 #include #include +#include #include #include #include @@ -29,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/deal.II/examples/step-17/step-17.cc b/deal.II/examples/step-17/step-17.cc index 6b261db1a7..30a967d979 100644 --- a/deal.II/examples/step-17/step-17.cc +++ b/deal.II/examples/step-17/step-17.cc @@ -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 #include #include +#include #include #include #include @@ -28,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/deal.II/examples/step-18/step-18.cc b/deal.II/examples/step-18/step-18.cc index ceb709eaf7..ac3b795241 100644 --- a/deal.II/examples/step-18/step-18.cc +++ b/deal.II/examples/step-18/step-18.cc @@ -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 #include #include +#include #include #include #include @@ -37,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/deal.II/examples/step-21/step-21.cc b/deal.II/examples/step-21/step-21.cc index b490275e58..75bf4b7af0 100644 --- a/deal.II/examples/step-21/step-21.cc +++ b/deal.II/examples/step-21/step-21.cc @@ -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 #include #include +#include #include #include @@ -42,7 +43,6 @@ #include #include #include -#include #include #include diff --git a/deal.II/examples/step-22/step-22.cc b/deal.II/examples/step-22/step-22.cc index 644c745783..939726b6a9 100644 --- a/deal.II/examples/step-22/step-22.cc +++ b/deal.II/examples/step-22/step-22.cc @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -38,7 +39,6 @@ #include #include #include -#include #include #include diff --git a/deal.II/examples/step-23/step-23.cc b/deal.II/examples/step-23/step-23.cc index 0c15524402..96804c5315 100644 --- a/deal.II/examples/step-23/step-23.cc +++ b/deal.II/examples/step-23/step-23.cc @@ -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 #include #include +#include #include #include @@ -35,7 +36,6 @@ #include #include #include -#include #include #include diff --git a/deal.II/examples/step-24/step-24.cc b/deal.II/examples/step-24/step-24.cc index cdeab1c4a2..bcd0bbd594 100644 --- a/deal.II/examples/step-24/step-24.cc +++ b/deal.II/examples/step-24/step-24.cc @@ -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 #include #include +#include #include #include @@ -34,7 +35,6 @@ #include #include #include -#include #include #include diff --git a/deal.II/examples/step-25/step-25.cc b/deal.II/examples/step-25/step-25.cc index c596e2d531..2d5eeb9228 100644 --- a/deal.II/examples/step-25/step-25.cc +++ b/deal.II/examples/step-25/step-25.cc @@ -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 #include #include +#include #include #include #include @@ -41,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/deal.II/examples/step-27/step-27.cc b/deal.II/examples/step-27/step-27.cc index 7fdbc93bf0..a5ac374a72 100644 --- a/deal.II/examples/step-27/step-27.cc +++ b/deal.II/examples/step-27/step-27.cc @@ -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 #include #include +#include #include #include #include @@ -32,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/deal.II/examples/step-28/step-28.cc b/deal.II/examples/step-28/step-28.cc index a0dccc1b7f..57b85369ba 100644 --- a/deal.II/examples/step-28/step-28.cc +++ b/deal.II/examples/step-28/step-28.cc @@ -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 #include #include +#include #include #include #include @@ -36,7 +37,6 @@ #include #include #include -#include #include #include #include diff --git a/deal.II/examples/step-31/step-31.cc b/deal.II/examples/step-31/step-31.cc index eead40b517..68c6d1b5cb 100644 --- a/deal.II/examples/step-31/step-31.cc +++ b/deal.II/examples/step-31/step-31.cc @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -36,7 +37,6 @@ #include #include #include -#include #include #include diff --git a/deal.II/examples/step-32/step-32.cc b/deal.II/examples/step-32/step-32.cc index 3687414cca..35adcfff59 100644 --- a/deal.II/examples/step-32/step-32.cc +++ b/deal.II/examples/step-32/step-32.cc @@ -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 #include #include +#include #include #include #include @@ -41,7 +42,6 @@ #include #include #include -#include #include #include diff --git a/deal.II/examples/step-6/step-6.cc b/deal.II/examples/step-6/step-6.cc index 54dfdf9314..b6d3ae2729 100644 --- a/deal.II/examples/step-6/step-6.cc +++ b/deal.II/examples/step-6/step-6.cc @@ -76,7 +76,7 @@ // following file contains a class // which is used to handle these // constraints: -#include +#include // In order to refine our grids // locally, we need a function from diff --git a/deal.II/examples/step-7/step-7.cc b/deal.II/examples/step-7/step-7.cc index a00785874f..494c663b14 100644 --- a/deal.II/examples/step-7/step-7.cc +++ b/deal.II/examples/step-7/step-7.cc @@ -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 #include #include +#include #include #include #include @@ -31,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/deal.II/examples/step-8/step-8.cc b/deal.II/examples/step-8/step-8.cc index f5d8f820ae..c4dc5eb8d4 100644 --- a/deal.II/examples/step-8/step-8.cc +++ b/deal.II/examples/step-8/step-8.cc @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -36,7 +37,6 @@ #include #include #include -#include #include // In this example, we need diff --git a/deal.II/examples/step-9/step-9.cc b/deal.II/examples/step-9/step-9.cc index 602d2ba20e..ea368148a0 100644 --- a/deal.II/examples/step-9/step-9.cc +++ b/deal.II/examples/step-9/step-9.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -31,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/deal.II/deal.II/include/dofs/dof_constraints.h b/deal.II/lac/include/lac/constraint_matrix.h similarity index 100% rename from deal.II/deal.II/include/dofs/dof_constraints.h rename to deal.II/lac/include/lac/constraint_matrix.h diff --git a/deal.II/deal.II/include/dofs/dof_constraints.templates.h b/deal.II/lac/include/lac/constraint_matrix.templates.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 db04ee8136..951d98b510 100644 --- a/deal.II/deal.II/include/dofs/dof_constraints.templates.h +++ b/deal.II/lac/include/lac/constraint_matrix.templates.h @@ -15,7 +15,7 @@ #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/source/dofs/dof_constraints.cc b/deal.II/lac/source/constraint_matrix.cc similarity index 99% rename from deal.II/deal.II/source/dofs/dof_constraints.cc rename to deal.II/lac/source/constraint_matrix.cc index 823d11a4bc..3734785d59 100644 --- a/deal.II/deal.II/source/dofs/dof_constraints.cc +++ b/deal.II/lac/source/constraint_matrix.cc @@ -12,8 +12,8 @@ //--------------------------------------------------------------------------- -#include -#include +#include +#include #include #include