From 602962a9fc1007e1e8dd946c68203ee54b4d63ac Mon Sep 17 00:00:00 2001
From: Guido Kanschat <dr.guido.kanschat@gmail.com>
Date: Thu, 20 Apr 2000 14:42:12 +0000
Subject: [PATCH] local mg works for Q1

git-svn-id: https://svn.dealii.org/trunk@2761 0785d39b-7218-0410-832d-ea1e28bc413d
---
 .../include/multigrid/mg_smoother.templates.h       |  1 +
 deal.II/deal.II/include/multigrid/multigrid.h       |  2 +-
 .../deal.II/include/multigrid/multigrid.templates.h | 13 +++++++++----
 deal.II/deal.II/source/multigrid/multigrid.cc       |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/deal.II/deal.II/include/multigrid/mg_smoother.templates.h b/deal.II/deal.II/include/multigrid/mg_smoother.templates.h
index cc98583b82..b786b24add 100644
--- a/deal.II/deal.II/include/multigrid/mg_smoother.templates.h
+++ b/deal.II/deal.II/include/multigrid/mg_smoother.templates.h
@@ -27,6 +27,7 @@ MGSmootherRelaxation<number>::smooth (const unsigned int   level,
   for(unsigned i=0;i<get_steps();++i)
     {
       (*matrix)[level].residual(h1, u, rhs);
+      set_zero_interior_boundary(level,h1);
       ((*matrix)[level].*relaxation)(h2,h1,omega);
       set_zero_interior_boundary(level,h2);
       u.add(h2);
diff --git a/deal.II/deal.II/include/multigrid/multigrid.h b/deal.II/deal.II/include/multigrid/multigrid.h
index cd98244072..7cfa21e1ae 100644
--- a/deal.II/deal.II/include/multigrid/multigrid.h
+++ b/deal.II/deal.II/include/multigrid/multigrid.h
@@ -221,7 +221,7 @@ class MGTransferPrebuilt : public MGTransferBase
 					  * while row indices belong to the
 					  * child cell, i.e. the fine level.
 					  */
-    vector<SparseMatrix<float> > prolongation_matrices;
+    vector<SparseMatrix<double> > prolongation_matrices;
 };
 
 
diff --git a/deal.II/deal.II/include/multigrid/multigrid.templates.h b/deal.II/deal.II/include/multigrid/multigrid.templates.h
index 820d2bdc7d..77d7be4f8b 100644
--- a/deal.II/deal.II/include/multigrid/multigrid.templates.h
+++ b/deal.II/deal.II/include/multigrid/multigrid.templates.h
@@ -38,15 +38,18 @@ Multigrid<dim>::copy_to_mg (const Vector<number>&)
 template <int dim>
 template <typename number>
 void
-Multigrid<dim>::copy_to_mg (const Vector<number>& src)
+Multigrid<dim>::copy_to_mg (const Vector<number>& osrc)
 {
+				   // Make src a real finite element function
+  Vector<number> src = osrc;
+//  constraints->distribute(src);
+
   const unsigned int dofs_per_cell = mg_dof_handler->get_fe().dofs_per_cell;
   const unsigned int dofs_per_face = mg_dof_handler->get_fe().dofs_per_face;
 
 				   // set the elements of the vectors
 				   // on all levels to zero
   defect.clear();
-//  constraints->condense(src);
   
   vector<unsigned int> global_dof_indices (dofs_per_cell);
   vector<unsigned int> level_dof_indices  (dofs_per_cell);
@@ -102,14 +105,16 @@ Multigrid<dim>::copy_to_mg (const Vector<number>& src)
 	  for (unsigned int i=0; i<dofs_per_cell; ++i)
 	    defect[level](level_dof_indices[i]) = src(global_dof_indices[i]);
 
-					   // Delete values on refinement edge,
-					   // since restriction will add them again.
 	  for (unsigned int face_n=0; face_n<GeometryInfo<dim>::faces_per_cell; ++face_n)
 	    {
 	      const MGDoFHandler<dim>::face_iterator face = level_cell->face(face_n);
 	      if (face->has_children())
 		{
 		  face->get_mg_dof_indices(level_face_indices);
+
+
+						   // Delete values on refinement edge,
+						   // since restriction will add them again.
 		  for (unsigned int i=0; i<dofs_per_face; ++i)
 		    defect[level](level_face_indices[i]) = 0.;
 		};
diff --git a/deal.II/deal.II/source/multigrid/multigrid.cc b/deal.II/deal.II/source/multigrid/multigrid.cc
index 4a7c0442af..a6878404c0 100644
--- a/deal.II/deal.II/source/multigrid/multigrid.cc
+++ b/deal.II/deal.II/source/multigrid/multigrid.cc
@@ -131,7 +131,7 @@ void MGTransferPrebuilt::build_matrices (const MGDoFHandler<dim> &mg_dof)
 	  };
       prolongation_sparsities[level].compress ();
 
-      prolongation_matrices.push_back (SparseMatrix<float>());
+      prolongation_matrices.push_back (SparseMatrix<double>());
       prolongation_matrices[level].reinit (prolongation_sparsities[level]);
 
 
-- 
2.39.5