From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 2 Mar 2004 21:31:09 +0000 (+0000)
Subject: Reflect the change restrict->get_restriction_matrix and similar for prolongate.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a90365abd576662533b8651177d950435f38eb79;p=dealii-svn.git

Reflect the change restrict->get_restriction_matrix and similar for prolongate.


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

diff --git a/tests/deal.II/wave-test-3.cc b/tests/deal.II/wave-test-3.cc
index 27a976bff8..3d5e8d5867 100644
--- a/tests/deal.II/wave-test-3.cc
+++ b/tests/deal.II/wave-test-3.cc
@@ -5439,8 +5439,8 @@ TimeStep_Dual<dim>::collect_from_children (const typename DoFHandler<dim>::cell_
 			  local_A_v);
 	};
       
-      this->fe.prolongate(c).Tvmult (rhs1, child_rhs1, true);
-      this->fe.prolongate(c).Tvmult (rhs2, child_rhs2, true);
+      this->fe.get_prolongation_matrix(c).Tvmult (rhs1, child_rhs1, true);
+      this->fe.get_prolongation_matrix(c).Tvmult (rhs2, child_rhs2, true);
     };
 
   return level_difference;
@@ -5479,9 +5479,9 @@ TimeStep_Dual<dim>::distribute_to_children (const typename DoFHandler<dim>::cell
     {
       const typename DoFHandler<dim>::cell_iterator new_child = new_cell->child(c);
 
-      this->fe.prolongate(c).vmult (local_old_dof_values_u,
+      this->fe.get_prolongation_matrix(c).vmult (local_old_dof_values_u,
 				   old_dof_values_u);
-      this->fe.prolongate(c).vmult (local_old_dof_values_v,
+      this->fe.get_prolongation_matrix(c).vmult (local_old_dof_values_v,
 				   old_dof_values_v);
 
       if (new_child->has_children())
@@ -5947,10 +5947,10 @@ for (unsigned int child=0; child<GeometryInfo<dim>::children_per_cell; ++child)
       Vector<double> child_u_old(dofs_per_cell_dual), child_v_old(dofs_per_cell_dual);
       Vector<double> child_u_bar_old(dofs_per_cell_dual), child_v_bar_old(dofs_per_cell_dual);
 
-      dual_fe.prolongate(child).vmult (child_u_old, local_u_old);
-      dual_fe.prolongate(child).vmult (child_v_old, local_v_old);
-      dual_fe.prolongate(child).vmult (child_u_bar_old, local_u_bar_old);
-      dual_fe.prolongate(child).vmult (child_v_bar_old, local_v_bar_old);
+      dual_fe.get_prolongation_matrix(child).vmult (child_u_old, local_u_old);
+      dual_fe.get_prolongation_matrix(child).vmult (child_v_old, local_v_old);
+      dual_fe.get_prolongation_matrix(child).vmult (child_u_bar_old, local_u_bar_old);
+      dual_fe.get_prolongation_matrix(child).vmult (child_v_bar_old, local_v_bar_old);
 
       const typename DoFHandler<dim>::cell_iterator
 	new_primal_child = primal_cell->child(child),
@@ -6024,14 +6024,14 @@ TimeStep_ErrorEstimation<dim>::collect_error_from_children (const typename DoFHa
       Vector<double> child_Ih_u_bar(dofs_per_cell_dual), child_Ih_v_bar(dofs_per_cell_dual);
       Vector<double> child_Ih_u_bar_old(dofs_per_cell_dual), child_Ih_v_bar_old(dofs_per_cell_dual);      
 
-      dual_fe.prolongate(child).vmult (child_u, local_u);
-      dual_fe.prolongate(child).vmult (child_v, local_v);
-      dual_fe.prolongate(child).vmult (child_u_bar, local_u_bar);
-      dual_fe.prolongate(child).vmult (child_v_bar, local_v_bar);
-      dual_fe.prolongate(child).vmult (child_Ih_u_bar, local_Ih_u_bar);
-      dual_fe.prolongate(child).vmult (child_Ih_v_bar, local_Ih_v_bar);
-      dual_fe.prolongate(child).vmult (child_Ih_u_bar_old, local_Ih_u_bar_old);
-      dual_fe.prolongate(child).vmult (child_Ih_v_bar_old, local_Ih_v_bar_old);
+      dual_fe.get_prolongation_matrix(child).vmult (child_u, local_u);
+      dual_fe.get_prolongation_matrix(child).vmult (child_v, local_v);
+      dual_fe.get_prolongation_matrix(child).vmult (child_u_bar, local_u_bar);
+      dual_fe.get_prolongation_matrix(child).vmult (child_v_bar, local_v_bar);
+      dual_fe.get_prolongation_matrix(child).vmult (child_Ih_u_bar, local_Ih_u_bar);
+      dual_fe.get_prolongation_matrix(child).vmult (child_Ih_v_bar, local_Ih_v_bar);
+      dual_fe.get_prolongation_matrix(child).vmult (child_Ih_u_bar_old, local_Ih_u_bar_old);
+      dual_fe.get_prolongation_matrix(child).vmult (child_Ih_v_bar_old, local_Ih_v_bar_old);
 
       const typename DoFHandler<dim>::cell_iterator
 	old_primal_child = primal_cell_old->child(child),
@@ -7194,8 +7194,8 @@ FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
 			  local_A_u);
 	};
       
-      this->fe.prolongate(c).Tvmult (rhs1, child_rhs1, true);
-      this->fe.prolongate(c).Tvmult (rhs2, child_rhs2, true);
+      this->fe.get_prolongation_matrix(c).Tvmult (rhs1, child_rhs1, true);
+      this->fe.get_prolongation_matrix(c).Tvmult (rhs2, child_rhs2, true);
     };
 
   return level_difference;
@@ -7234,9 +7234,9 @@ TimeStep_Primal<dim>::distribute_to_children (const typename DoFHandler<dim>::ce
     {
       const typename DoFHandler<dim>::cell_iterator new_child = new_cell->child(c);
 
-      this->fe.prolongate(c).vmult (local_old_dof_values_u,
+      this->fe.get_prolongation_matrix(c).vmult (local_old_dof_values_u,
 			      old_dof_values_u);
-      this->fe.prolongate(c).vmult (local_old_dof_values_v,
+      this->fe.get_prolongation_matrix(c).vmult (local_old_dof_values_v,
 			      old_dof_values_v);
 
       if (new_child->has_children())
diff --git a/tests/fe/internals.cc b/tests/fe/internals.cc
index 7e698aa1c4..ec03f0e6f5 100644
--- a/tests/fe/internals.cc
+++ b/tests/fe/internals.cc
@@ -91,9 +91,9 @@ check_matrices (FiniteElement<dim>& fe, const char* name)
   for (unsigned int i=0;i<GeometryInfo<dim>::children_per_cell;++i)
     {
       deallog << name << '<' << dim << '>' << " restriction " << i << std::endl;
-      print_formatted (fe.restrict(i), 3, 6);
+      print_formatted (fe.get_restriction_matrix(i), 3, 6);
       deallog << name << '<' << dim << '>' << " embedding " << i << std::endl;
-      print_formatted (fe.prolongate(i), 3, 6);
+      print_formatted (fe.get_prolongation_matrix(i), 3, 6);
     }
 }
 
diff --git a/tests/fe/nedelec_3.cc b/tests/fe/nedelec_3.cc
index 85a1252916..e2456e1891 100644
--- a/tests/fe/nedelec_3.cc
+++ b/tests/fe/nedelec_3.cc
@@ -60,7 +60,7 @@ check ()
        c!=dof.end(); ++c)
     {
       Vector<double> tmp (fe_ned.dofs_per_cell);
-      fe_ned.prolongate (c->index()).vmult (tmp, coarse_grid_values);
+      fe_ned.get_prolongation_matrix (c->index()).vmult (tmp, coarse_grid_values);
       c->set_dof_values (tmp, values);
     };
   
diff --git a/tests/fe/q_2.cc b/tests/fe/q_2.cc
index dd6a3239ed..4216914a99 100644
--- a/tests/fe/q_2.cc
+++ b/tests/fe/q_2.cc
@@ -2,7 +2,7 @@
 //    q_2.cc,v 1.1 2003/05/05 13:49:41 wolf Exp
 //    Version: 
 //
-//    Copyright (C) 2003 by the deal.II authors
+//    Copyright (C) 2003, 2004 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -39,7 +39,7 @@ test(const unsigned int degree)
 
   for (unsigned int c=0; c<GeometryInfo<dim>::children_per_cell; ++c)
     {
-      const FullMatrix<double> & m = fe_q.prolongate(c);
+      const FullMatrix<double> & m = fe_q.get_prolongation_matrix(c);
 
       for (unsigned int i=0; i<m.m(); ++i)
 	{
diff --git a/tests/fe/q_3.cc b/tests/fe/q_3.cc
index 97a08d6b2a..8b2de29b41 100644
--- a/tests/fe/q_3.cc
+++ b/tests/fe/q_3.cc
@@ -2,7 +2,7 @@
 //    q_3.cc,v 1.1 2003/05/05 13:49:41 wolf Exp
 //    Version: 
 //
-//    Copyright (C) 2003 by the deal.II authors
+//    Copyright (C) 2003, 2004 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -39,7 +39,7 @@ test(const unsigned int degree)
 
   for (unsigned int c=0; c<GeometryInfo<dim>::children_per_cell; ++c)
     {
-      const FullMatrix<double> & m = fe_q.restrict(c);
+      const FullMatrix<double> & m = fe_q.get_restriction_matrix(c);
 
       for (unsigned int i=0; i<m.m(); ++i)
         for (unsigned int j=0; j<m.n(); ++j)
diff --git a/tests/fe/rt_4.cc b/tests/fe/rt_4.cc
index 23a3f35526..c513bed207 100644
--- a/tests/fe/rt_4.cc
+++ b/tests/fe/rt_4.cc
@@ -2,7 +2,7 @@
 //    rt_4.cc,v 1.3 2003/06/09 16:00:38 wolf Exp
 //    Version: 
 //
-//    Copyright (C) 2003 by the deal.II authors
+//    Copyright (C) 2003, 2004 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -36,7 +36,7 @@ test(const unsigned int degree)
 
   for (unsigned int c=0; c<GeometryInfo<dim>::children_per_cell; ++c)
     {
-      const FullMatrix<double> & m = fe_rt.prolongate(c);
+      const FullMatrix<double> & m = fe_rt.get_prolongation_matrix(c);
 
       for (unsigned int i=0; i<m.m(); ++i)
 	{
diff --git a/tests/fe/rt_5.cc b/tests/fe/rt_5.cc
index 26251d1221..db4407de7c 100644
--- a/tests/fe/rt_5.cc
+++ b/tests/fe/rt_5.cc
@@ -2,7 +2,7 @@
 //    rt_5.cc,v 1.1 2003/06/09 15:59:07 wolf Exp
 //    Version: 
 //
-//    Copyright (C) 2003 by the deal.II authors
+//    Copyright (C) 2003, 2004 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -36,7 +36,7 @@ test(const unsigned int degree)
 
   for (unsigned int c=0; c<GeometryInfo<dim>::children_per_cell; ++c)
     {
-      const FullMatrix<double> & m = fe_rt.restrict(c);
+      const FullMatrix<double> & m = fe_rt.get_restriction_matrix(c);
 
       for (unsigned int i=0; i<m.m(); ++i)
 	{