From: Baerbel Jannsen Date: Fri, 5 Feb 2010 16:19:23 +0000 (+0000) Subject: some output should only occur if debug>2 X-Git-Tag: v8.0.0~6536 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38a7f19b04cd0dc8c21a507a4afe83998e8abcd6;p=dealii.git some output should only occur if debug>2 git-svn-id: https://svn.dealii.org/trunk@20511 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/multigrid/multigrid.templates.h b/deal.II/deal.II/include/multigrid/multigrid.templates.h index 34562a2e90..99a99a3cb3 100644 --- a/deal.II/deal.II/include/multigrid/multigrid.templates.h +++ b/deal.II/deal.II/include/multigrid/multigrid.templates.h @@ -163,22 +163,25 @@ Multigrid::level_v_step(const unsigned int level) // contain the global defect, the // refined parts its restriction. for (unsigned int l = level;l>minlevel;--l) + { + t[l-1] = 0.; + if (l==level && edge_out != 0) { - t[l-1] = 0.; - if (l==level && edge_out != 0) - { - edge_out->vmult_add(level, t[level], solution[level]); + edge_out->vmult_add(level, t[level], solution[level]); + if(debug>2) deallog << "Norm t[" << level << "] " << t[level].l2_norm() << std::endl; - } + } + + if (l==level && edge_down != 0) + edge_down->vmult(level, t[level-1], solution[level]); - if (l==level && edge_down != 0) - edge_down->vmult(level, t[level-1], solution[level]); - - transfer->restrict_and_add (l, t[l-1], t[l]); + transfer->restrict_and_add (l, t[l-1], t[l]); + if(debug>2) deallog << "restrict t[" << l-1 << "] " << t[l-1].l2_norm() << std::endl; - defect[l-1] -= t[l-1]; + defect[l-1] -= t[l-1]; + if(debug>2) deallog << "defect d[" << l-1 << "] " << defect[l-1].l2_norm() << std::endl; - } + } // do recursion solution[level-1] = 0.;