From 23d849dd4610090e575b9d202bc5671993697232 Mon Sep 17 00:00:00 2001 From: wolf Date: Thu, 9 Dec 1999 17:28:14 +0000 Subject: [PATCH] Adapt to changes in directory structure. git-svn-id: https://svn.dealii.org/trunk@2030 0785d39b-7218-0410-832d-ea1e28bc413d --- .../Attic/examples/convergence/convergence.cc | 8 ++++---- deal.II/deal.II/Attic/examples/dof/dof_test.cc | 10 +++++----- .../examples/error-estimation/error-estimation.cc | 12 ++++++------ deal.II/deal.II/Attic/examples/grid/grid_test.cc | 2 +- .../deal.II/Attic/examples/multigrid/multigrid.cc | 13 +++++++------ .../nonlinear/fixed-point-iteration/nonlinear.cc | 6 +++--- deal.II/deal.II/Attic/examples/poisson/poisson.h | 10 +++++----- deal.II/deal.II/Attic/examples/poisson/problem.cc | 2 +- .../Attic/examples/step-by-step/step-1/step-1.cc | 2 +- .../Attic/examples/step-by-step/step-2/step-2.cc | 6 +++--- deal.II/examples/step-1/step-1.cc | 2 +- deal.II/examples/step-2/step-2.cc | 6 +++--- tests/big-tests/convergence/convergence.cc | 8 ++++---- tests/big-tests/dof/dof_test.cc | 10 +++++----- .../big-tests/error-estimation/error-estimation.cc | 12 ++++++------ tests/big-tests/grid/grid_test.cc | 2 +- tests/big-tests/multigrid/multigrid.cc | 13 +++++++------ .../nonlinear/fixed-point-iteration/nonlinear.cc | 6 +++--- tests/big-tests/poisson/poisson.h | 10 +++++----- tests/big-tests/poisson/problem.cc | 2 +- 20 files changed, 72 insertions(+), 70 deletions(-) diff --git a/deal.II/deal.II/Attic/examples/convergence/convergence.cc b/deal.II/deal.II/Attic/examples/convergence/convergence.cc index 82df0ccc72..b95a2e8dc6 100644 --- a/deal.II/deal.II/Attic/examples/convergence/convergence.cc +++ b/deal.II/deal.II/Attic/examples/convergence/convergence.cc @@ -3,15 +3,15 @@ #include -#include +#include #include -#include +#include #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/Attic/examples/dof/dof_test.cc b/deal.II/deal.II/Attic/examples/dof/dof_test.cc index 011b95ca10..594c1c0842 100644 --- a/deal.II/deal.II/Attic/examples/dof/dof_test.cc +++ b/deal.II/deal.II/Attic/examples/dof/dof_test.cc @@ -3,18 +3,18 @@ -#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/Attic/examples/error-estimation/error-estimation.cc b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc index 7fa9eaf784..308df10603 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc +++ b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc @@ -3,16 +3,16 @@ #include -#include +#include #include -#include +#include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/deal.II/deal.II/Attic/examples/grid/grid_test.cc b/deal.II/deal.II/Attic/examples/grid/grid_test.cc index 8af569d929..c5d4c0800a 100644 --- a/deal.II/deal.II/Attic/examples/grid/grid_test.cc +++ b/deal.II/deal.II/Attic/examples/grid/grid_test.cc @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc b/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc index 49ec01502e..9e13e94fd2 100644 --- a/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc +++ b/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc @@ -3,15 +3,16 @@ #include -#include +#include #include -#include +#include #include #include -#include +#include +#include #include #include -#include +#include #include #include #include @@ -23,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -354,7 +355,7 @@ void PoissonProblem::assemble (const Equation &equation, constraints.clear (); dof->DoFHandler::make_hanging_node_constraints (constraints); constraints.close (); - dof->DoFHandler::make_sparsity_pattern (system_sparsity); + DoFTools::make_sparsity_pattern (*dof, system_sparsity); constraints.condense (system_sparsity); MGTransferPrebuilt p; diff --git a/deal.II/deal.II/Attic/examples/nonlinear/fixed-point-iteration/nonlinear.cc b/deal.II/deal.II/Attic/examples/nonlinear/fixed-point-iteration/nonlinear.cc index 0034eb8e9f..ea02510cb5 100644 --- a/deal.II/deal.II/Attic/examples/nonlinear/fixed-point-iteration/nonlinear.cc +++ b/deal.II/deal.II/Attic/examples/nonlinear/fixed-point-iteration/nonlinear.cc @@ -6,13 +6,13 @@ #include #include -#include +#include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/deal.II/deal.II/Attic/examples/poisson/poisson.h b/deal.II/deal.II/Attic/examples/poisson/poisson.h index 8e4e337f53..ece30b3451 100644 --- a/deal.II/deal.II/Attic/examples/poisson/poisson.h +++ b/deal.II/deal.II/Attic/examples/poisson/poisson.h @@ -7,20 +7,20 @@ #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/Attic/examples/poisson/problem.cc b/deal.II/deal.II/Attic/examples/poisson/problem.cc index b3a6b81192..f867e12661 100644 --- a/deal.II/deal.II/Attic/examples/poisson/problem.cc +++ b/deal.II/deal.II/Attic/examples/poisson/problem.cc @@ -7,7 +7,7 @@ #include #include #include -#include +#include template diff --git a/deal.II/deal.II/Attic/examples/step-by-step/step-1/step-1.cc b/deal.II/deal.II/Attic/examples/step-by-step/step-1/step-1.cc index 441c28cbe3..cff1bb3f70 100644 --- a/deal.II/deal.II/Attic/examples/step-by-step/step-1/step-1.cc +++ b/deal.II/deal.II/Attic/examples/step-by-step/step-1/step-1.cc @@ -17,7 +17,7 @@ #include // Output of grids in various // graphics formats: -#include +#include // This is needed for C++ output: #include diff --git a/deal.II/deal.II/Attic/examples/step-by-step/step-2/step-2.cc b/deal.II/deal.II/Attic/examples/step-by-step/step-2/step-2.cc index 5852593ba9..b8045ea877 100644 --- a/deal.II/deal.II/Attic/examples/step-by-step/step-2/step-2.cc +++ b/deal.II/deal.II/Attic/examples/step-by-step/step-2/step-2.cc @@ -13,7 +13,7 @@ // association of degrees of freedom // ("DoF"s) to vertices, lines, and // cells. -#include +#include // The following include contains the // description of the bilinear finite // element, including the facts that @@ -33,14 +33,14 @@ // In the following file, several // tools for manipulating degrees of // freedom can be found: -#include +#include // We will use a sparse matrix to // visualize the pattern of nonzero // entries resulting from the // distribution of degrees of freedom // on the grid. That class can be // found here: -#include +#include // We will want to use a special // algorithm to renumber degrees of // freedom. It is declared here: diff --git a/deal.II/examples/step-1/step-1.cc b/deal.II/examples/step-1/step-1.cc index 441c28cbe3..cff1bb3f70 100644 --- a/deal.II/examples/step-1/step-1.cc +++ b/deal.II/examples/step-1/step-1.cc @@ -17,7 +17,7 @@ #include // Output of grids in various // graphics formats: -#include +#include // This is needed for C++ output: #include diff --git a/deal.II/examples/step-2/step-2.cc b/deal.II/examples/step-2/step-2.cc index 5852593ba9..b8045ea877 100644 --- a/deal.II/examples/step-2/step-2.cc +++ b/deal.II/examples/step-2/step-2.cc @@ -13,7 +13,7 @@ // association of degrees of freedom // ("DoF"s) to vertices, lines, and // cells. -#include +#include // The following include contains the // description of the bilinear finite // element, including the facts that @@ -33,14 +33,14 @@ // In the following file, several // tools for manipulating degrees of // freedom can be found: -#include +#include // We will use a sparse matrix to // visualize the pattern of nonzero // entries resulting from the // distribution of degrees of freedom // on the grid. That class can be // found here: -#include +#include // We will want to use a special // algorithm to renumber degrees of // freedom. It is declared here: diff --git a/tests/big-tests/convergence/convergence.cc b/tests/big-tests/convergence/convergence.cc index 82df0ccc72..b95a2e8dc6 100644 --- a/tests/big-tests/convergence/convergence.cc +++ b/tests/big-tests/convergence/convergence.cc @@ -3,15 +3,15 @@ #include -#include +#include #include -#include +#include #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/tests/big-tests/dof/dof_test.cc b/tests/big-tests/dof/dof_test.cc index 011b95ca10..594c1c0842 100644 --- a/tests/big-tests/dof/dof_test.cc +++ b/tests/big-tests/dof/dof_test.cc @@ -3,18 +3,18 @@ -#include -#include -#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/tests/big-tests/error-estimation/error-estimation.cc b/tests/big-tests/error-estimation/error-estimation.cc index 7fa9eaf784..308df10603 100644 --- a/tests/big-tests/error-estimation/error-estimation.cc +++ b/tests/big-tests/error-estimation/error-estimation.cc @@ -3,16 +3,16 @@ #include -#include +#include #include -#include +#include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/big-tests/grid/grid_test.cc b/tests/big-tests/grid/grid_test.cc index 8af569d929..c5d4c0800a 100644 --- a/tests/big-tests/grid/grid_test.cc +++ b/tests/big-tests/grid/grid_test.cc @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/big-tests/multigrid/multigrid.cc b/tests/big-tests/multigrid/multigrid.cc index 49ec01502e..9e13e94fd2 100644 --- a/tests/big-tests/multigrid/multigrid.cc +++ b/tests/big-tests/multigrid/multigrid.cc @@ -3,15 +3,16 @@ #include -#include +#include #include -#include +#include #include #include -#include +#include +#include #include #include -#include +#include #include #include #include @@ -23,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -354,7 +355,7 @@ void PoissonProblem::assemble (const Equation &equation, constraints.clear (); dof->DoFHandler::make_hanging_node_constraints (constraints); constraints.close (); - dof->DoFHandler::make_sparsity_pattern (system_sparsity); + DoFTools::make_sparsity_pattern (*dof, system_sparsity); constraints.condense (system_sparsity); MGTransferPrebuilt p; diff --git a/tests/big-tests/nonlinear/fixed-point-iteration/nonlinear.cc b/tests/big-tests/nonlinear/fixed-point-iteration/nonlinear.cc index 0034eb8e9f..ea02510cb5 100644 --- a/tests/big-tests/nonlinear/fixed-point-iteration/nonlinear.cc +++ b/tests/big-tests/nonlinear/fixed-point-iteration/nonlinear.cc @@ -6,13 +6,13 @@ #include #include -#include +#include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/tests/big-tests/poisson/poisson.h b/tests/big-tests/poisson/poisson.h index 8e4e337f53..ece30b3451 100644 --- a/tests/big-tests/poisson/poisson.h +++ b/tests/big-tests/poisson/poisson.h @@ -7,20 +7,20 @@ #include -#include +#include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include #include #include #include -#include +#include #include diff --git a/tests/big-tests/poisson/problem.cc b/tests/big-tests/poisson/problem.cc index b3a6b81192..f867e12661 100644 --- a/tests/big-tests/poisson/problem.cc +++ b/tests/big-tests/poisson/problem.cc @@ -7,7 +7,7 @@ #include #include #include -#include +#include template -- 2.39.5