]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix a test for icc: Stop for polynomial degree 4 as soon as EPS is reached.
authorMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 28 Nov 2013 13:54:34 +0000 (13:54 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 28 Nov 2013 13:54:34 +0000 (13:54 +0000)
git-svn-id: https://svn.dealii.org/trunk@31816 0785d39b-7218-0410-832d-ea1e28bc413d

tests/bits/step-10.cc
tests/bits/step-10.output

index d46fbf3034c7f206f9ce7313f290d0834e518f6b..2e855f4f6d713bffcaf0887ea315db8207aa3c4e 100644 (file)
@@ -113,7 +113,8 @@ void compute_pi_by_area ()
 
       ConvergenceTable table;
 
-      for (unsigned int refinement=0; refinement<6;
+
+      for (unsigned int refinement=0; refinement < (degree != 4 ? 6 : 4);
            ++refinement, triangulation.refine_global (1))
         {
           table.add_value("cells", triangulation.n_active_cells());
@@ -177,7 +178,7 @@ void compute_pi_by_perimeter ()
                                           update_JxW_values);
       ConvergenceTable table;
 
-      for (unsigned int refinement=0; refinement<6;
+      for (unsigned int refinement=0; refinement < (degree != 4 ? 6 : 4);
            ++refinement, triangulation.refine_global (1))
         {
           table.add_value("cells", triangulation.n_active_cells());
index 15e31e92734d4707b39ff9039a60ea9621504036..6674355cbf831fdc0077330245aa5a004c4fa0b5 100644 (file)
@@ -1975,8 +1975,6 @@ cells      eval.pi            error
 20    3.1415926314742437 2.2116e-08 7.95  
 80    3.1415926535026228 8.7170e-11 7.99  
 320   3.1415926535894529 3.4036e-13 8.00  
-1280  3.1415926535897927 2.9187e-16 10.19 
-5120  3.1415926535897944 1.3509e-15 -2.21 
 DEAL::
 DEAL::Computation of Pi by the perimeter:
 DEAL::===================================
@@ -2013,6 +2011,4 @@ cells      eval.pi            error
 20    3.1415926513737600 2.2160e-09 7.96 
 80    3.1415926535810712 8.7218e-12 7.99 
 320   3.1415926535897594 3.3668e-14 8.02 
-1280  3.1415926535897922 1.0617e-15 4.99 
-5120  3.1415926535897931 1.0061e-16 3.40 
 DEAL::

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.