remove deprecated warninngs and prepare a new test

still waiting for boundary lists to be fixed

git-svn-id: https://svn.dealii.org/trunk@29583 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/multigrid/mg_output.cc b/tests/multigrid/mg_output.cc
index 1aa5a40c10157b4bd75255f73c200cb708d380d7..b161ebd6104c7ef01939df7609d0cdf201f4fcc4 100644 (file)
--- a/tests/multigrid/mg_output.cc
+++ b/tests/multigrid/mg_output.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -51,8 +51,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_level();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/mg_renumbered_01.cc b/tests/multigrid/mg_renumbered_01.cc
index e35e9cb19b4b21fba6e9ac3865b317c0a38724d7..1f91024e64dc9b7a24dcc437338d08eec215bd78 100644 (file)
--- a/tests/multigrid/mg_renumbered_01.cc
+++ b/tests/multigrid/mg_renumbered_01.cc
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
 //    $Id$
 //
-//    Copyright (C) 2010 by the deal.II authors
+//    Copyright (C) 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -64,8 +64,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_level();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);
@@ -322,17 +322,14 @@ void LaplaceProblem<dim>::test ()
   ZeroFunction<dim>                    dirichlet_bc(fe.n_components());
   dirichlet_boundary[0] =             &dirichlet_bc;
 
-  const unsigned int min_l = mg_matrices.get_minlevel();
-  const unsigned int max_l = mg_matrices.get_maxlevel();
+  const unsigned int min_l = mg_matrices.min_level();
+  const unsigned int max_l = mg_matrices.max_level();
   for(unsigned int l=min_l; l<max_l; ++l)
   {
     mg_matrices[l] = IdentityMatrix(mg_dof_handler.n_dofs(l));
     mg_matrices_renumbered[l] = IdentityMatrix(mg_dof_handler.n_dofs(l));
   }
 
-  GrowingVectorMemory<>   vector_memory;
-  GrowingVectorMemory<>   vector_memory_renumbered;
-
   MGConstrainedDoFs mg_constrained_dofs;
   mg_constrained_dofs.initialize(mg_dof_handler, dirichlet_boundary);
   MGConstrainedDoFs mg_constrained_dofs_renumbered;
@@ -358,10 +355,10 @@ void LaplaceProblem<dim>::test ()
 
   typedef PreconditionIdentity RELAXATION;
   MGSmootherPrecondition<SparseMatrix<double>, RELAXATION, Vector<double> >
-    mg_smoother(vector_memory);
+    mg_smoother;
 
   MGSmootherPrecondition<SparseMatrix<double>, RELAXATION, Vector<double> >
-    mg_smoother_renumbered(vector_memory_renumbered);
+    mg_smoother_renumbered;
 
   RELAXATION::AdditionalData smoother_data;
   mg_smoother.initialize(mg_matrices, smoother_data);

diff --git a/tests/multigrid/mg_renumbered_02.cc b/tests/multigrid/mg_renumbered_02.cc
index 971cda159b1590209b62f6bc38e8188ab7eded4a..e0538cc2d000e29fe12de93f766d0a2fb5597633 100644 (file)
--- a/tests/multigrid/mg_renumbered_02.cc
+++ b/tests/multigrid/mg_renumbered_02.cc
@@ -56,8 +56,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_level();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);
@@ -246,7 +246,7 @@ LaplaceProblem<dim>::output_gpl(const MGDoFHandler<dim> &dof,
   for(unsigned int l=0; l<triangulation.n_levels(); ++l)
   {
     OutputCreator<dim> matrix_integrator;
-    MeshWorker::integration_loop<dim, dim> (
+    MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> > (
       dof.begin(l), dof.end(l),
       dof_info, info_box,
       std_cxx1x::bind(&OutputCreator<dim>::cell, &matrix_integrator, std_cxx1x::_1, std_cxx1x::_2),

diff --git a/tests/multigrid/mg_renumbered_03.cc b/tests/multigrid/mg_renumbered_03.cc
index 59d001f6149bcabe05aeb41a1af3ba70f641a681..da4212d87deaff731737eaab33bc43ef4c758e6d 100644 (file)
--- a/tests/multigrid/mg_renumbered_03.cc
+++ b/tests/multigrid/mg_renumbered_03.cc
@@ -56,8 +56,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_level();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);
@@ -293,7 +293,7 @@ LaplaceProblem<dim>::output_gpl(const MGDoFHandler<dim> &dof,
   for(unsigned int l=0; l<triangulation.n_levels(); ++l)
   {
     OutputCreator<dim> matrix_integrator;
-    MeshWorker::integration_loop<dim, dim> (
+    MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> > (
       dof.begin(l), dof.end(l),
       dof_info, info_box,
       std_cxx1x::bind(&OutputCreator<dim>::cell, &matrix_integrator, std_cxx1x::_1, std_cxx1x::_2),

diff --git a/tests/multigrid/renumbering_02.cc b/tests/multigrid/renumbering_02.cc
index d08e53b73891789be91b87133c04f1e148407248..6bffac6f83b36511f4db5eaf57efe325348dd483 100644 (file)
--- a/tests/multigrid/renumbering_02.cc
+++ b/tests/multigrid/renumbering_02.cc
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
 //    $Id$
 //
-//    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 by the deal.II authors
+//    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -54,7 +54,7 @@ void check()
   Point<dim> a;
   a(0)=1;
   for (unsigned int level=0; level<tria.n_levels(); ++level)
-    DoFRenumbering::downstream_dg(mg_dof_handler, level, a);
+    DoFRenumbering::downstream(mg_dof_handler, level, a);
 }
 
 

diff --git a/tests/multigrid/smoother_block.cc b/tests/multigrid/smoother_block.cc
index 02003e9d17726e3573260b07b804cb466bfb5e97..bdcf1797896f4dc4673fb0dfff6ad4e35a6ca1fc 100644 (file)
--- a/tests/multigrid/smoother_block.cc
+++ b/tests/multigrid/smoother_block.cc
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 2000 - 2006 by the deal.II authors
+//    Copyright (C) 2000 - 2006, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -127,7 +127,7 @@ void check_smoother(const MGLevelObject<MATRIX>& m,
   
   smoother.initialize(m, r);
 
-  for (unsigned int l=m.get_minlevel(); l<= m.get_maxlevel();++l)
+  for (unsigned int l=m.min_level(); l<= m.max_level();++l)
     {
       deallog << "Level " << l << std::endl;
       
@@ -187,10 +187,10 @@ void check()
   MGLevelObject<BlockMatrixArray<double> > A (2,4);
   MGLevelObject<BlockTrianglePrecondition<double> > P(2,4);
   
-  for (unsigned int l=A.get_minlevel(); l<= A.get_maxlevel();++l)
+  for (unsigned int l=A.min_level(); l<= A.max_level();++l)
     {
-      A[l].initialize(3, 3, mem);
-      P[l].initialize(3, mem);
+      A[l].initialize(3, 3);
+      P[l].reinit(3);
       for (unsigned int b=0;b<A[l].n_block_rows();++b)
        {
          P[l].enter(s2, b, b, A[l].n_block_rows()-b);

diff --git a/tests/multigrid/transfer_01.cc b/tests/multigrid/transfer_01.cc
index 367b0a0e0337ea58c9b026470a1663142bde0b2d..8cf7b494905a1aae27cafad950713104026bca1e 100644 (file)
--- a/tests/multigrid/transfer_01.cc
+++ b/tests/multigrid/transfer_01.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -43,8 +43,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_level();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_02.cc b/tests/multigrid/transfer_02.cc
index 4825b63f021467c8517f32a2ff74c82d18cca847..499806c15a92fcffc9d3f2fe71db97fd24eddc05 100644 (file)
--- a/tests/multigrid/transfer_02.cc
+++ b/tests/multigrid/transfer_02.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -47,8 +47,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_level();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_03.cc b/tests/multigrid/transfer_03.cc
index c4f80d7e0659779f886b83040faf037a12df5f40..cacdb0236714fa51f8b100eb53fa036699b41144 100644 (file)
--- a/tests/multigrid/transfer_03.cc
+++ b/tests/multigrid/transfer_03.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -49,8 +49,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_level();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_block.cc b/tests/multigrid/transfer_block.cc
index 058df01d6323752180f96a8934268914f370f37d..1f1985db781873e149015651596ee2d22dd1195f 100644 (file)
--- a/tests/multigrid/transfer_block.cc
+++ b/tests/multigrid/transfer_block.cc
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 2000 - 2007, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -62,8 +62,8 @@ reinit_vector_by_blocks (
       MGTools::count_dofs_per_block (mg_dof, ndofs);
     }
 
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_level();++level)
     {
       v[level].reinit(n_selected, 0);
       unsigned int k=0;

diff --git a/tests/multigrid/transfer_block_select.cc b/tests/multigrid/transfer_block_select.cc
index 733f91a6bd3b8344aa10b69ccd3e632e9f6fb403..e4e9015058391ea0fad358dfa49227abe398a230 100644 (file)
--- a/tests/multigrid/transfer_block_select.cc
+++ b/tests/multigrid/transfer_block_select.cc
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 2000 - 2007, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -61,8 +61,8 @@ reinit_vector_by_blocks (
       MGTools::count_dofs_per_block (mg_dof, ndofs);
     }
 
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_level();++level)
     {
       v[level].reinit(ndofs[level][selected_block]);
     }

diff --git a/tests/multigrid/transfer_compare_01.cc b/tests/multigrid/transfer_compare_01.cc
index efdfc7819885d6289330b59feb32dab313f38069..f971d9687754401d42ef410fc861435d24c2bef1 100644 (file)
--- a/tests/multigrid/transfer_compare_01.cc
+++ b/tests/multigrid/transfer_compare_01.cc
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 2000 - 2007, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -64,8 +64,8 @@ reinit_vector_by_blocks (
       MGTools::count_dofs_per_block (mg_dof, ndofs);
     }
 
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_level();++level)
     {
       v[level].reinit(ndofs[level][selected_block]);
     }
@@ -96,8 +96,8 @@ reinit_vector_by_blocks (
       MGTools::count_dofs_per_block (mg_dof, ndofs);
     }
 
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_level();++level)
     {
       v[level].reinit(n_selected, 0);
       unsigned int k=0;

diff --git a/tests/multigrid/transfer_prebuilt_01.cc b/tests/multigrid/transfer_prebuilt_01.cc
new file mode 100644 (file)
index 0000000..c153e00
--- /dev/null
+++ b/tests/multigrid/transfer_prebuilt_01.cc
@@ -0,0 +1,86 @@
+//----------------------------------------------------------------------------
+//    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
+//    Version:
+//
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
+//
+//    This file is subject to QPL and may not be  distributed
+//    without copyright and license information. Please refer
+//    to the file deal.II/doc/license.html for the  text  and
+//    further information on this license.
+//
+//----------------------------------------------------------------------------
+
+//TODO:[GK] Add checks for RT again!
+
+#include "../tests.h"
+#include <deal.II/base/logstream.h>
+#include <deal.II/base/mg_level_object.h>
+#include <deal.II/lac/vector.h>
+#include <deal.II/lac/block_vector.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/dofs/dof_renumbering.h>
+#include <deal.II/dofs/dof_tools.h>
+#include <deal.II/fe/fe_dgp.h>
+#include <deal.II/fe/fe_dgq.h>
+#include <deal.II/fe/fe_raviart_thomas.h>
+#include <deal.II/fe/fe_q.h>
+#include <deal.II/fe/fe_system.h>
+#include <deal.II/multigrid/mg_dof_handler.h>
+#include <deal.II/multigrid/mg_transfer.h>
+#include <deal.II/multigrid/mg_tools.h>
+
+#include <fstream>
+#include <iomanip>
+#include <iomanip>
+#include <algorithm>
+
+using namespace std;
+
+template <int dim>
+void check_simple(const FiniteElement<dim>& fe, std::ostream& os)
+{
+  deallog << fe.get_name() << std::endl;
+
+  Triangulation<dim> tr;
+  GridGenerator::hyper_cube(tr);
+  tr.refine_global(1);
+  tr.begin_active()->set_refine_flag();
+  tr.execute_coarsening_and_refinement();
+  tr.begin(2)->set_refine_flag();
+  tr.execute_coarsening_and_refinement();
+
+  MGDoFHandler<dim> mgdof(tr);
+  mgdof.distribute_dofs(fe);
+
+  MGTransferPrebuilt<Vector<double> > transfer;
+  transfer.build_matrices(mgdof);
+  
+  transfer.print_matrices(os);
+}
+
+
+int main()
+{
+  std::ofstream logfile("transfer_01/output");
+  deallog << std::setprecision(6);
+  deallog.attach(logfile);
+  deallog.depth_console(0);
+  deallog.threshold_double(1.e-10);
+
+  check_simple (FE_DGP<2>(0), logfile);
+  check_simple (FE_DGP<2>(1), logfile);
+  check_simple (FE_DGQ<2>(1), logfile);
+  check_simple (FE_DGQ<2>(2), logfile);
+  check_simple (FE_Q<2>(1), logfile);
+  check_simple (FE_Q<2>(2), logfile);
+  check_simple (FESystem<2>(FE_DGQ<2>(1), 2), logfile);
+  check_simple (FESystem<2>(FE_DGP<2>(1), 2, FE_DGQ<2>(1), 3), logfile);
+
+  check_simple (FE_RaviartThomasNodal<2>(1), logfile);
+//  check_simple (FESystem<2>(FE_RaviartThomas<2>(1),1,FE_DGQ<2>(0),2), logfile);
+
+  check_simple (FE_DGQ<3>(1), logfile);
+  check_simple (FE_Q<3>(2), logfile);
+}

diff --git a/tests/multigrid/transfer_prebuilt_01/cmp/generic b/tests/multigrid/transfer_prebuilt_01/cmp/generic
new file mode 100644 (file)
index 0000000..57ed8fd
--- /dev/null
+++ b/tests/multigrid/transfer_prebuilt_01/cmp/generic
@@ -0,0 +1,155 @@
+
+DEAL::FE_DGP<2>(0)
+DEAL::u0       1.50000
+DEAL::u1       4.50000
+DEAL::u2       16.5000
+DEAL::u1       64.5000
+DEAL::u0       256.500
+DEAL::u0       0.500000
+DEAL::u1       0.500000
+DEAL::u2       0.500000
+DEAL::u1       0.500000
+DEAL::u0       0.500000
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
+DEAL::diff 0
+DEAL::FE_DGP<2>(1)
+DEAL::u0       3.50000
+DEAL::u1       12.5000
+DEAL::u2       48.5000
+DEAL::u1       192.500
+DEAL::u0       768.500
+DEAL::u0       5.50000
+DEAL::u1       20.5000
+DEAL::u2       80.5000
+DEAL::u1       320.500
+DEAL::u0       1280.50
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
+DEAL::diff 0
+DEAL::FE_DGQ<2>(1)
+DEAL::u0       4.50000
+DEAL::u1       16.5000
+DEAL::u2       64.5000
+DEAL::u1       256.500
+DEAL::u0       1024.50
+DEAL::u0       14.5000
+DEAL::u1       46.5000
+DEAL::u2       174.500
+DEAL::u1       676.500
+DEAL::u0       2484.50
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
+DEAL::diff 0
+DEAL::FE_DGQ<2>(2)
+DEAL::u0       9.50000
+DEAL::u1       36.5000
+DEAL::u2       144.500
+DEAL::u1       946.062
+DEAL::u0       4774.45
+DEAL::u0       204.500
+DEAL::u1       726.500
+DEAL::u2       2814.50
+DEAL::u1       17973.9
+DEAL::u0       82623.7
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144
+DEAL::diff 0
+DEAL::FE_Q<2>(1)
+DEAL::u0       4.50000
+DEAL::u1       9.50000
+DEAL::u2       25.5000
+DEAL::u1       72.7500
+DEAL::u0       156.750
+DEAL::u0       14.5000
+DEAL::u1       28.2500
+DEAL::u2       72.3750
+DEAL::u1       196.266
+DEAL::u0       400.891
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25
+DEAL::diff 0
+DEAL::FE_Q<2>(2)
+DEAL::u0       9.50000
+DEAL::u1       25.5000
+DEAL::u2       81.5000
+DEAL::u1       320.016
+DEAL::u0       1197.23
+DEAL::u0       204.500
+DEAL::u1       770.738
+DEAL::u2       2854.85
+DEAL::u1       12165.9
+DEAL::u0       49857.5
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
+DEAL::diff 0
+DEAL::FESystem<2>[FE_DGQ<2>(1)^2]
+DEAL::u0       8.50000
+DEAL::u1       32.5000
+DEAL::u2       128.500
+DEAL::u1       512.500
+DEAL::u0       2048.50
+DEAL::u0       140.500
+DEAL::u1       540.500
+DEAL::u2       2140.50
+DEAL::u1       8520.50
+DEAL::u0       33640.5
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128
+DEAL::diff 0
+DEAL::FESystem<2>[FE_DGP<2>(1)^2-FE_DGQ<2>(1)^3]
+DEAL::u0       18.5000
+DEAL::u1       72.5000
+DEAL::u2       288.500
+DEAL::u1       1152.50
+DEAL::u0       4608.50
+DEAL::u0       1785.50
+DEAL::u1       7110.50
+DEAL::u2       28410.5
+DEAL::u1       113581.
+DEAL::u0       453661.
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288
+DEAL::diff 0
+DEAL::FE_RaviartThomasNodal<2>(1)
+DEAL::u0       12.5000
+DEAL::u1       10.5000
+DEAL::u2       9.50000
+DEAL::u1       9.43750
+DEAL::u0       9.14844
+DEAL::u0       506.500
+DEAL::u1       517.750
+DEAL::u2       510.078
+DEAL::u1       532.428
+DEAL::u0       548.030
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144
+DEAL::diff 0
+DEAL::FE_DGQ<3>(1)
+DEAL::u0       8.50000
+DEAL::u1       64.5000
+DEAL::u2       512.500
+DEAL::u1       4096.50
+DEAL::u0       32768.5
+DEAL::u0       140.500
+DEAL::u1       952.500
+DEAL::u2       7280.50
+DEAL::u1       56896.5
+DEAL::u0       425600.
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512
+DEAL::diff 0
+DEAL::FE_Q<3>(2)
+DEAL::u0       27.5000
+DEAL::u1       125.500
+DEAL::u2       729.500
+DEAL::u1       5711.84
+DEAL::u0       41399.8
+DEAL::u0       6201.50
+DEAL::u1       41649.9
+DEAL::u2       283615.
+DEAL::u1       2.42888e+06
+DEAL::u0       1.94204e+07
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729
+DEAL:: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729
+DEAL::diff 0

diff --git a/tests/multigrid/transfer_system_01.cc b/tests/multigrid/transfer_system_01.cc
index b8e9fd0351e156bb4368e8b29fded769bb015f5d..852daee8aebc8b371bd92c0f27a710cf16992ef9 100644 (file)
--- a/tests/multigrid/transfer_system_01.cc
+++ b/tests/multigrid/transfer_system_01.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -40,8 +40,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_leve();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_system_02.cc b/tests/multigrid/transfer_system_02.cc
index 8650263d95dd22816b838f6567b038ea88c7e403..6ff7c6a1f0d54ea6ff6953cdb1e0a7d68304ed94 100644 (file)
--- a/tests/multigrid/transfer_system_02.cc
+++ b/tests/multigrid/transfer_system_02.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -41,8 +41,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_leve();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_system_03.cc b/tests/multigrid/transfer_system_03.cc
index 2a3d414ac40111c1a684111be5421bf3437215c0..beb73d26e45898677cb95b6dcf72df7767a5cc4d 100644 (file)
--- a/tests/multigrid/transfer_system_03.cc
+++ b/tests/multigrid/transfer_system_03.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -41,8 +41,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_leve();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_system_04.cc b/tests/multigrid/transfer_system_04.cc
index 85889511b381e1068974765c03a3f5402dd17158..6dcaef004369c4dcb34ac05228401ffcab2b0d19 100644 (file)
--- a/tests/multigrid/transfer_system_04.cc
+++ b/tests/multigrid/transfer_system_04.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -41,8 +41,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_leve();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_system_adaptive_01.cc b/tests/multigrid/transfer_system_adaptive_01.cc
index ae20a37b1b9ec2e3814a35f566a84e23ac8d1d1d..319a3ebff258092173470d758beea49a16370ef7 100644 (file)
--- a/tests/multigrid/transfer_system_adaptive_01.cc
+++ b/tests/multigrid/transfer_system_adaptive_01.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -43,8 +43,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_leve();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_system_adaptive_02.cc b/tests/multigrid/transfer_system_adaptive_02.cc
index 530ee1483bb767abcbf021846ed7f108062b661a..caefa700b9a5146326d52e511167d9edd4a0c0da 100644 (file)
--- a/tests/multigrid/transfer_system_adaptive_02.cc
+++ b/tests/multigrid/transfer_system_adaptive_02.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -43,8 +43,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_leve();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_system_adaptive_03.cc b/tests/multigrid/transfer_system_adaptive_03.cc
index 10bb663a48b5a87260dfe5b9fc2015fd89e8a0a6..e5adaa192ba41d9bba7d66dd1d9b156df259ef5b 100644 (file)
--- a/tests/multigrid/transfer_system_adaptive_03.cc
+++ b/tests/multigrid/transfer_system_adaptive_03.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -44,8 +44,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_leve();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_system_adaptive_04.cc b/tests/multigrid/transfer_system_adaptive_04.cc
index 596f8503f9d3dd8231e09bc4e5b726dceb30ecfd..977316b1c6c80bab92242672779306b12d15d5bb 100644 (file)
--- a/tests/multigrid/transfer_system_adaptive_04.cc
+++ b/tests/multigrid/transfer_system_adaptive_04.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -43,8 +43,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_leve();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_system_adaptive_05.cc b/tests/multigrid/transfer_system_adaptive_05.cc
index 9a1950748192932d8ba71568b7d42ecf37c7302d..5c0c34e2e0b9240460192ebeebf3f4805ab4f562 100644 (file)
--- a/tests/multigrid/transfer_system_adaptive_05.cc
+++ b/tests/multigrid/transfer_system_adaptive_05.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -44,8 +44,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_leve();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_system_adaptive_06.cc b/tests/multigrid/transfer_system_adaptive_06.cc
index 9a1cea4cfee9ead91d57a077dd754e24a9ac6dfc..f0b1c589140f173fb293ce97f7df4349ebd66f6a 100644 (file)
--- a/tests/multigrid/transfer_system_adaptive_06.cc
+++ b/tests/multigrid/transfer_system_adaptive_06.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -43,8 +43,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_leve();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_system_adaptive_07.cc b/tests/multigrid/transfer_system_adaptive_07.cc
index b218b7055bd3067745a2bb4fc81dfb9d9eee9523..12b6671ff69ba80a457d8f6fb4ffae13c0df4a5b 100644 (file)
--- a/tests/multigrid/transfer_system_adaptive_07.cc
+++ b/tests/multigrid/transfer_system_adaptive_07.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -45,8 +45,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_leve();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);

diff --git a/tests/multigrid/transfer_system_adaptive_08.cc b/tests/multigrid/transfer_system_adaptive_08.cc
index 4075fde99456ed88b8f4c643edb0a70f2de97f9f..65681f6f015b04c5d2b79380598e03b8430d4610 100644 (file)
--- a/tests/multigrid/transfer_system_adaptive_08.cc
+++ b/tests/multigrid/transfer_system_adaptive_08.cc
@@ -2,7 +2,7 @@
 //    transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp
 //    Version:
 //
-//    Copyright (C) 2000 - 2007, 2009, 2010 by the deal.II authors
+//    Copyright (C) 2000 - 2007, 2009, 2010, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -44,8 +44,8 @@ void
 reinit_vector (const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
               MGLevelObject<dealii::Vector<number> > &v)
 {
-  for (unsigned int level=v.get_minlevel();
-       level<=v.get_maxlevel();++level)
+  for (unsigned int level=v.min_level();
+       level<=v.max_leve();++level)
     {
       unsigned int n = mg_dof.n_dofs (level);
       v[level].reinit(n);