From: Guido Kanschat Date: Sun, 6 Mar 2005 03:00:26 +0000 (+0000) Subject: rename level_mgstep to level_v_step X-Git-Tag: v8.0.0~14517 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=568e39bd1f5b8b513c13dea33522991b36bf29fd;p=dealii.git rename level_mgstep to level_v_step git-svn-id: https://svn.dealii.org/trunk@10011 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/multigrid/multigrid.h b/deal.II/deal.II/include/multigrid/multigrid.h index 8460bf5cc6..ad5746611c 100644 --- a/deal.II/deal.II/include/multigrid/multigrid.h +++ b/deal.II/deal.II/include/multigrid/multigrid.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 by the deal.II authors +// Copyright (C) 1998 - 2005 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -39,8 +39,8 @@ * continuous elements with hanging nodes; in fact, most people you * meet on conferences seem to deny this. * - * The function actually performing a multi-level cycle, - * @p level_mgstep, as well as the function @p vcycle, calling it, + * The function actually performing a multi-level V-cycle, + * @p level_v_step, as well as the function @p vcycle, calling it, * require several helper classes handed over as template parameters. * These classes have to meet the following requirements: * @@ -133,7 +133,7 @@ class Multigrid : public Subscriptor * * The actual work for this * function is done in - * @p level_mgstep. + * @p level_v_step. */ void vcycle(); @@ -161,7 +161,7 @@ class Multigrid : public Subscriptor * is used to solve the matrix of * this level. */ - void level_mgstep (const unsigned int level); + void level_v_step (const unsigned int level); /** * Level for coarse grid solution. diff --git a/deal.II/deal.II/include/multigrid/multigrid.templates.h b/deal.II/deal.II/include/multigrid/multigrid.templates.h index 183f6df844..810421da40 100644 --- a/deal.II/deal.II/include/multigrid/multigrid.templates.h +++ b/deal.II/deal.II/include/multigrid/multigrid.templates.h @@ -1,15 +1,15 @@ -//---------------------------- multigrid.templates.h --------------------------- +//--------------------------------------------------------------------------- // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 by the deal.II authors +// Copyright (C) 1998 - 2005 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. // -//---------------------------- multigrid.templates.h --------------------------- +//--------------------------------------------------------------------------- #ifndef __deal2__multigrid_templates_h #define __deal2__multigrid_templates_h #include @@ -34,7 +34,7 @@ Multigrid::set_edge_matrices (const MGMatrixBase& down, template void -Multigrid::level_mgstep(const unsigned int level) +Multigrid::level_v_step(const unsigned int level) { solution[level] = 0.; @@ -73,12 +73,12 @@ Multigrid::level_mgstep(const unsigned int level) // deallog << "recursion " << level << endl; // do recursion - level_mgstep(level-1); + level_v_step(level-1); // reset size of the auxiliary // vector, since it has been // resized in the recursive call to - // level_mgstep directly above + // level_v_step directly above t[level] = 0.; // do coarse grid correction @@ -115,7 +115,7 @@ Multigrid::vcycle() t[level].reinit(defect[level]); } - level_mgstep (maxlevel); + level_v_step (maxlevel); // abort (); }