From 086f6c8d46a41c666510e834703f12c79bfe8d83 Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Thu, 25 Jan 2001 17:38:40 +0000 Subject: [PATCH] embedding and constraint matrices git-svn-id: https://svn.dealii.org/trunk@3800 0785d39b-7218-0410-832d-ea1e28bc413d --- .../lac/include/lac/full_matrix.templates.h | 2 +- tests/deal.II/block_matrices.cc | 3 +- tests/deal.II/constraints.cc | 8 +-- tests/deal.II/data_out.cc | 8 +-- tests/lac/solver.checked | 54 +++++++++---------- 5 files changed, 40 insertions(+), 35 deletions(-) diff --git a/deal.II/lac/include/lac/full_matrix.templates.h b/deal.II/lac/include/lac/full_matrix.templates.h index 68e6a34693..b766135510 100644 --- a/deal.II/lac/include/lac/full_matrix.templates.h +++ b/deal.II/lac/include/lac/full_matrix.templates.h @@ -462,7 +462,7 @@ template void FullMatrix::fill (const number2* entries) { if (dim_range*dim_image != 0) - std::copy (entries, entries+dim_image*dim_range, val); + std::copy (entries, entries+dim_image*dim_range, val); } diff --git a/tests/deal.II/block_matrices.cc b/tests/deal.II/block_matrices.cc index 064dddb83b..7b73254fb9 100644 --- a/tests/deal.II/block_matrices.cc +++ b/tests/deal.II/block_matrices.cc @@ -25,7 +25,8 @@ #include #include -#include +#include +#include #include diff --git a/tests/deal.II/constraints.cc b/tests/deal.II/constraints.cc index 5f326c2f91..c8e8073e1b 100644 --- a/tests/deal.II/constraints.cc +++ b/tests/deal.II/constraints.cc @@ -14,12 +14,14 @@ #include #include -#include +#include +#include #include #include #include #include #include +#include #include #include #include @@ -242,10 +244,10 @@ int main () switch (element) { case 0: - fe = new FEQ1<3>(); + fe = new FE_Q<3>(1); break; case 1: - fe = new FEQ2<3>(); + fe = new FE_Q<3>(2); break; }; diff --git a/tests/deal.II/data_out.cc b/tests/deal.II/data_out.cc index 4c735aa071..572e5391c5 100644 --- a/tests/deal.II/data_out.cc +++ b/tests/deal.II/data_out.cc @@ -22,7 +22,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -60,7 +61,7 @@ class LaplaceProblem void output_results () const; Triangulation triangulation; - FEQ1 fe; + FE_Q fe; DoFHandler dof_handler; SparsityPattern sparsity_pattern; @@ -116,7 +117,8 @@ double BoundaryValues::value (const Point &p, template LaplaceProblem::LaplaceProblem () : - dof_handler (triangulation) + dof_handler (triangulation), + fe(1) {}; diff --git a/tests/lac/solver.checked b/tests/lac/solver.checked index e12e98fc49..d71d6dd314 100644 --- a/tests/lac/solver.checked +++ b/tests/lac/solver.checked @@ -10,17 +10,17 @@ DEAL:no:GMRES::Convergence step 3 DEAL:no:QMRS::Starting DEAL:no:QMRS::Convergence step 3 DEAL:ssor:Richardson::Starting -DEAL:ssor:Richardson::Convergence step 15 +DEAL:ssor:Richardson::Convergence step 10 DEAL:ssor:cg::Starting -DEAL:ssor:cg::Convergence step 5 +DEAL:ssor:cg::Convergence step 4 DEAL:ssor:Bicgstab::Starting -DEAL:ssor:Bicgstab::Convergence step 3 +DEAL:ssor:Bicgstab::Convergence step 2 DEAL:ssor:GMRES::Starting -DEAL:ssor:GMRES::Convergence step 4 +DEAL:ssor:GMRES::Convergence step 3 DEAL:ssor:QMRS::Starting -DEAL:ssor:QMRS::Convergence step 5 +DEAL:ssor:QMRS::Convergence step 4 DEAL:sor:Richardson::Starting -DEAL:sor:Richardson::Convergence step 10 +DEAL:sor:Richardson::Convergence step 7 DEAL:sor:cg::Starting DEAL:sor:cg::Failure step 100 DEAL:sor:Bicgstab::Starting @@ -32,61 +32,61 @@ DEAL:sor:QMRS::Failure step 100 DEAL::Size 12 Unknowns 121 DEAL::SOR-diff:0.000 DEAL:no:cg::Starting -DEAL:no:cg::Convergence step 17 +DEAL:no:cg::Convergence step 15 DEAL:no:Bicgstab::Starting -DEAL:no:Bicgstab::Convergence step 13 +DEAL:no:Bicgstab::Convergence step 11 DEAL:no:GMRES::Starting -DEAL:no:GMRES::Convergence step 17 +DEAL:no:GMRES::Convergence step 15 DEAL:no:QMRS::Starting -DEAL:no:QMRS::Convergence step 18 +DEAL:no:QMRS::Convergence step 16 DEAL:ssor:Richardson::Starting -DEAL:ssor:Richardson::Convergence step 88 +DEAL:ssor:Richardson::Convergence step 59 DEAL:ssor:cg::Starting -DEAL:ssor:cg::Convergence step 11 +DEAL:ssor:cg::Convergence step 8 DEAL:ssor:Bicgstab::Starting -DEAL:ssor:Bicgstab::Convergence step 6 +DEAL:ssor:Bicgstab::Convergence step 5 DEAL:ssor:GMRES::Starting -DEAL:ssor:GMRES::Convergence step 10 +DEAL:ssor:GMRES::Convergence step 7 DEAL:ssor:QMRS::Starting -DEAL:ssor:QMRS::Convergence step 12 +DEAL:ssor:QMRS::Convergence step 9 DEAL:sor:Richardson::Starting -DEAL:sor:Richardson::Failure step 100 +DEAL:sor:Richardson::Convergence step 88 DEAL:sor:cg::Starting DEAL:sor:cg::Failure step 100 DEAL:sor:Bicgstab::Starting -DEAL:sor:Bicgstab::Convergence step 19 +DEAL:sor:Bicgstab::Convergence step 14 DEAL:sor:GMRES::Starting -DEAL:sor:GMRES::Convergence step 25 +DEAL:sor:GMRES::Convergence step 20 DEAL:sor:QMRS::Starting DEAL:sor:QMRS::Failure step 100 DEAL::Size 36 Unknowns 1225 DEAL::SOR-diff:0.000 DEAL:no:cg::Starting -DEAL:no:cg::Convergence step 59 +DEAL:no:cg::Convergence step 49 DEAL:no:Bicgstab::Starting -DEAL:no:Bicgstab::Convergence step 44 +DEAL:no:Bicgstab::Convergence step 39 DEAL:no:GMRES::Starting DEAL:no:GMRES::Failure step 100 DEAL:no:QMRS::Starting -DEAL:no:QMRS::Convergence step 63 +DEAL:no:QMRS::Convergence step 53 DEAL:ssor:Richardson::Starting DEAL:ssor:Richardson::Failure step 100 DEAL:ssor:cg::Starting -DEAL:ssor:cg::Convergence step 27 +DEAL:ssor:cg::Convergence step 19 DEAL:ssor:Bicgstab::Starting -DEAL:ssor:Bicgstab::Convergence step 18 +DEAL:ssor:Bicgstab::Convergence step 15 DEAL:ssor:GMRES::Starting -DEAL:ssor:GMRES::Convergence step 26 +DEAL:ssor:GMRES::Convergence step 18 DEAL:ssor:QMRS::Starting -DEAL:ssor:QMRS::Convergence step 28 +DEAL:ssor:QMRS::Convergence step 21 DEAL:sor:Richardson::Starting DEAL:sor:Richardson::Failure step 100 DEAL:sor:cg::Starting DEAL:sor:cg::Failure step 100 DEAL:sor:Bicgstab::Starting -DEAL:sor:Bicgstab::Convergence step 60 +DEAL:sor:Bicgstab::Convergence step 44 DEAL:sor:GMRES::Starting -DEAL:sor:GMRES::Failure step 100 +DEAL:sor:GMRES::Convergence step 99 DEAL:sor:QMRS::Starting DEAL:sor:QMRS::Failure step 100 DEAL::GrowingVectorMemory:Overall allocated vectors: 345 -- 2.39.5