From: guido Date: Thu, 24 Mar 2005 16:57:15 +0000 (+0000) Subject: F-cycle and eliminated solve X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e61fa5575170401170f55837ca69167e611d10be;p=dealii-svn.git F-cycle and eliminated solve git-svn-id: https://svn.dealii.org/trunk@10232 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/multigrid/cycles.cc b/tests/multigrid/cycles.cc index 15b330a5fa..9a290128fd 100644 --- a/tests/multigrid/cycles.cc +++ b/tests/multigrid/cycles.cc @@ -75,6 +75,10 @@ void test_cycles(unsigned int minlevel, unsigned int maxlevel) mg1.set_cycle(Multigrid::w_cycle); mg1.cycle(); + deallog << std::endl; + + mg1.set_cycle(Multigrid::f_cycle); + mg1.cycle(); } int main() diff --git a/tests/results/i686-pc-linux-gnu+gcc3.2/multigrid/cycles.output b/tests/results/i686-pc-linux-gnu+gcc3.2/multigrid/cycles.output index c6311fc877..d7f7d5cdcc 100644 --- a/tests/results/i686-pc-linux-gnu+gcc3.2/multigrid/cycles.output +++ b/tests/results/i686-pc-linux-gnu+gcc3.2/multigrid/cycles.output @@ -34,14 +34,12 @@ DEAL::W-cycle entering level 1 DEAL::Smoothing on level 1 DEAL::Residual on level 1 DEAL::W-cycle solving level 0 -DEAL::W-cycle solving level 0 DEAL::Smoothing on level 1 DEAL::W-cycle leaving level 1 DEAL::W-cycle entering level 1 DEAL::Smoothing on level 1 DEAL::Residual on level 1 DEAL::W-cycle solving level 0 -DEAL::W-cycle solving level 0 DEAL::Smoothing on level 1 DEAL::W-cycle leaving level 1 DEAL::Smoothing on level 2 @@ -53,14 +51,12 @@ DEAL::W-cycle entering level 1 DEAL::Smoothing on level 1 DEAL::Residual on level 1 DEAL::W-cycle solving level 0 -DEAL::W-cycle solving level 0 DEAL::Smoothing on level 1 DEAL::W-cycle leaving level 1 DEAL::W-cycle entering level 1 DEAL::Smoothing on level 1 DEAL::Residual on level 1 DEAL::W-cycle solving level 0 -DEAL::W-cycle solving level 0 DEAL::Smoothing on level 1 DEAL::W-cycle leaving level 1 DEAL::Smoothing on level 2 @@ -77,14 +73,12 @@ DEAL::W-cycle entering level 1 DEAL::Smoothing on level 1 DEAL::Residual on level 1 DEAL::W-cycle solving level 0 -DEAL::W-cycle solving level 0 DEAL::Smoothing on level 1 DEAL::W-cycle leaving level 1 DEAL::W-cycle entering level 1 DEAL::Smoothing on level 1 DEAL::Residual on level 1 DEAL::W-cycle solving level 0 -DEAL::W-cycle solving level 0 DEAL::Smoothing on level 1 DEAL::W-cycle leaving level 1 DEAL::Smoothing on level 2 @@ -96,14 +90,12 @@ DEAL::W-cycle entering level 1 DEAL::Smoothing on level 1 DEAL::Residual on level 1 DEAL::W-cycle solving level 0 -DEAL::W-cycle solving level 0 DEAL::Smoothing on level 1 DEAL::W-cycle leaving level 1 DEAL::W-cycle entering level 1 DEAL::Smoothing on level 1 DEAL::Residual on level 1 DEAL::W-cycle solving level 0 -DEAL::W-cycle solving level 0 DEAL::Smoothing on level 1 DEAL::W-cycle leaving level 1 DEAL::Smoothing on level 2 @@ -112,6 +104,61 @@ DEAL::Smoothing on level 3 DEAL::W-cycle leaving level 3 DEAL::Smoothing on level 4 DEAL::W-cycle leaving level 4 +DEAL:: +DEAL::F-cycle entering level 4 +DEAL::Smoothing on level 4 +DEAL::Residual on level 4 +DEAL::F-cycle entering level 3 +DEAL::Smoothing on level 3 +DEAL::Residual on level 3 +DEAL::F-cycle entering level 2 +DEAL::Smoothing on level 2 +DEAL::Residual on level 2 +DEAL::F-cycle entering level 1 +DEAL::Smoothing on level 1 +DEAL::Residual on level 1 +DEAL::F-cycle solving level 0 +DEAL::Smoothing on level 1 +DEAL::F-cycle leaving level 1 +DEAL::V-cycle entering level 1 +DEAL::Smoothing on level 1 +DEAL::Residual on level 1 +DEAL::V-cycle solving level 0 +DEAL::Smoothing on level 1 +DEAL::V-cycle leaving level 1 +DEAL::Smoothing on level 2 +DEAL::F-cycle leaving level 2 +DEAL::V-cycle entering level 2 +DEAL::Smoothing on level 2 +DEAL::Residual on level 2 +DEAL::V-cycle entering level 1 +DEAL::Smoothing on level 1 +DEAL::Residual on level 1 +DEAL::V-cycle solving level 0 +DEAL::Smoothing on level 1 +DEAL::V-cycle leaving level 1 +DEAL::Smoothing on level 2 +DEAL::V-cycle leaving level 2 +DEAL::Smoothing on level 3 +DEAL::F-cycle leaving level 3 +DEAL::V-cycle entering level 3 +DEAL::Smoothing on level 3 +DEAL::Residual on level 3 +DEAL::V-cycle entering level 2 +DEAL::Smoothing on level 2 +DEAL::Residual on level 2 +DEAL::V-cycle entering level 1 +DEAL::Smoothing on level 1 +DEAL::Residual on level 1 +DEAL::V-cycle solving level 0 +DEAL::Smoothing on level 1 +DEAL::V-cycle leaving level 1 +DEAL::Smoothing on level 2 +DEAL::V-cycle leaving level 2 +DEAL::Smoothing on level 3 +DEAL::V-cycle leaving level 3 +DEAL::Smoothing on level 4 +DEAL::F-cycle leaving level 4 DEAL::V-cycle entering level 5 DEAL::Smoothing on level 5 DEAL::Residual on level 5 @@ -139,14 +186,12 @@ DEAL::W-cycle entering level 3 DEAL::Smoothing on level 3 DEAL::Residual on level 3 DEAL::W-cycle solving level 2 -DEAL::W-cycle solving level 2 DEAL::Smoothing on level 3 DEAL::W-cycle leaving level 3 DEAL::W-cycle entering level 3 DEAL::Smoothing on level 3 DEAL::Residual on level 3 DEAL::W-cycle solving level 2 -DEAL::W-cycle solving level 2 DEAL::Smoothing on level 3 DEAL::W-cycle leaving level 3 DEAL::Smoothing on level 4 @@ -158,17 +203,49 @@ DEAL::W-cycle entering level 3 DEAL::Smoothing on level 3 DEAL::Residual on level 3 DEAL::W-cycle solving level 2 -DEAL::W-cycle solving level 2 DEAL::Smoothing on level 3 DEAL::W-cycle leaving level 3 DEAL::W-cycle entering level 3 DEAL::Smoothing on level 3 DEAL::Residual on level 3 DEAL::W-cycle solving level 2 -DEAL::W-cycle solving level 2 DEAL::Smoothing on level 3 DEAL::W-cycle leaving level 3 DEAL::Smoothing on level 4 DEAL::W-cycle leaving level 4 DEAL::Smoothing on level 5 DEAL::W-cycle leaving level 5 +DEAL:: +DEAL::F-cycle entering level 5 +DEAL::Smoothing on level 5 +DEAL::Residual on level 5 +DEAL::F-cycle entering level 4 +DEAL::Smoothing on level 4 +DEAL::Residual on level 4 +DEAL::F-cycle entering level 3 +DEAL::Smoothing on level 3 +DEAL::Residual on level 3 +DEAL::F-cycle solving level 2 +DEAL::Smoothing on level 3 +DEAL::F-cycle leaving level 3 +DEAL::V-cycle entering level 3 +DEAL::Smoothing on level 3 +DEAL::Residual on level 3 +DEAL::V-cycle solving level 2 +DEAL::Smoothing on level 3 +DEAL::V-cycle leaving level 3 +DEAL::Smoothing on level 4 +DEAL::F-cycle leaving level 4 +DEAL::V-cycle entering level 4 +DEAL::Smoothing on level 4 +DEAL::Residual on level 4 +DEAL::V-cycle entering level 3 +DEAL::Smoothing on level 3 +DEAL::Residual on level 3 +DEAL::V-cycle solving level 2 +DEAL::Smoothing on level 3 +DEAL::V-cycle leaving level 3 +DEAL::Smoothing on level 4 +DEAL::V-cycle leaving level 4 +DEAL::Smoothing on level 5 +DEAL::F-cycle leaving level 5