From: deal Date: Mon, 6 Feb 2006 16:45:59 +0000 (+0000) Subject: Don't add .5 to integers and the round to integer -- this is unstable X-Git-Tag: v8.0.0~12439 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53c3700803260b2a7b66e42f56df765f880aacc1;p=dealii.git Don't add .5 to integers and the round to integer -- this is unstable git-svn-id: https://svn.dealii.org/trunk@12240 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/multigrid/transfer.cc b/tests/multigrid/transfer.cc index 382db5397f..08fea9cb4d 100644 --- a/tests/multigrid/transfer.cc +++ b/tests/multigrid/transfer.cc @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- -// $Id$ -// Version: $Name$ +// transfer.cc,v 1.13 2005/12/30 16:07:03 guido Exp +// Version: // // Copyright (C) 2000 - 2005 by the deal.II authors // @@ -62,16 +62,16 @@ void check_simple(const FiniteElement& fe) u0 = 1; transfer.prolongate(1,u1,u0); transfer.prolongate(2,u2,u1); - deallog << "u0\t" << (int) (u0*u0+.5) << std::endl - << "u1\t" << (int) (u1*u1+.5) << std::endl - << "u2\t" << (int) (u2*u2+.5) << std::endl; + deallog << "u0\t" << (u0*u0+.5) << std::endl + << "u1\t" << (u1*u1+.5) << std::endl + << "u2\t" << (u2*u2+.5) << std::endl; // Now restrict the same vectors. u1 = 0.; u0 = 0.; transfer.restrict_and_add(2,u1,u2); transfer.restrict_and_add(1,u0,u1); - deallog << "u1\t" << (int) (u1*u1+.5) << std::endl - << "u0\t" << (int) (u0*u0+.5) << std::endl; + deallog << "u1\t" << (u1*u1+.5) << std::endl + << "u0\t" << (u0*u0+.5) << std::endl; // Now the same for a non-constant // vector @@ -79,16 +79,16 @@ void check_simple(const FiniteElement& fe) u0(i) = i; transfer.prolongate(1,u1,u0); transfer.prolongate(2,u2,u1); - deallog << "u0\t" << (int) (u0*u0+.5) << std::endl - << "u1\t" << (int) (u1*u1+.5) << std::endl - << "u2\t" << (int) (u2*u2+.5) << std::endl; + deallog << "u0\t" << (u0*u0+.5) << std::endl + << "u1\t" << (u1*u1+.5) << std::endl + << "u2\t" << (u2*u2+.5) << std::endl; // Now restrict the same vectors. u1 = 0.; u0 = 0.; transfer.restrict_and_add(2,u1,u2); transfer.restrict_and_add(1,u0,u1); - deallog << "u1\t" << (int) (u1*u1+.5) << std::endl - << "u0\t" << (int) (u0*u0+.5) << std::endl; + deallog << "u1\t" << (u1*u1+.5) << std::endl + << "u0\t" << (u0*u0+.5) << std::endl; } diff --git a/tests/multigrid/transfer/cmp/generic b/tests/multigrid/transfer/cmp/generic index 4278e02aeb..e23f0ab40b 100644 --- a/tests/multigrid/transfer/cmp/generic +++ b/tests/multigrid/transfer/cmp/generic @@ -1,133 +1,133 @@ DEAL::FE_DGP<2>(0) -DEAL::u0 1 -DEAL::u1 4 -DEAL::u2 16 -DEAL::u1 64 -DEAL::u0 256 -DEAL::u0 0 -DEAL::u1 0 -DEAL::u2 0 -DEAL::u1 0 -DEAL::u0 0 +DEAL::u0 1.50 +DEAL::u1 4.50 +DEAL::u2 16.5 +DEAL::u1 64.5 +DEAL::u0 257. +DEAL::u0 0.500 +DEAL::u1 0.500 +DEAL::u2 0.500 +DEAL::u1 0.500 +DEAL::u0 0.500 DEAL::FE_DGP<2>(1) -DEAL::u0 3 -DEAL::u1 12 -DEAL::u2 48 -DEAL::u1 192 -DEAL::u0 768 -DEAL::u0 5 -DEAL::u1 20 -DEAL::u2 80 -DEAL::u1 320 -DEAL::u0 1280 +DEAL::u0 3.50 +DEAL::u1 12.5 +DEAL::u2 48.5 +DEAL::u1 192. +DEAL::u0 768. +DEAL::u0 5.50 +DEAL::u1 20.5 +DEAL::u2 80.5 +DEAL::u1 320. +DEAL::u0 1.28e+03 DEAL::FE_DGQ<2>(1) -DEAL::u0 4 -DEAL::u1 16 -DEAL::u2 64 -DEAL::u1 256 -DEAL::u0 1024 -DEAL::u0 14 -DEAL::u1 46 -DEAL::u2 174 -DEAL::u1 676 -DEAL::u0 2484 +DEAL::u0 4.50 +DEAL::u1 16.5 +DEAL::u2 64.5 +DEAL::u1 256. +DEAL::u0 1.02e+03 +DEAL::u0 14.5 +DEAL::u1 46.5 +DEAL::u2 174. +DEAL::u1 676. +DEAL::u0 2.48e+03 DEAL::FE_DGQ<2>(2) -DEAL::u0 9 -DEAL::u1 36 -DEAL::u2 144 -DEAL::u1 946 -DEAL::u0 4774 -DEAL::u0 204 -DEAL::u1 726 -DEAL::u2 2814 -DEAL::u1 17973 -DEAL::u0 82623 +DEAL::u0 9.50 +DEAL::u1 36.5 +DEAL::u2 144. +DEAL::u1 946. +DEAL::u0 4.77e+03 +DEAL::u0 204. +DEAL::u1 726. +DEAL::u2 2.81e+03 +DEAL::u1 1.80e+04 +DEAL::u0 8.26e+04 DEAL::FE_Q<2>(1) -DEAL::u0 4 -DEAL::u1 9 -DEAL::u2 25 -DEAL::u1 72 -DEAL::u0 156 -DEAL::u0 14 -DEAL::u1 28 -DEAL::u2 72 -DEAL::u1 196 -DEAL::u0 400 +DEAL::u0 4.50 +DEAL::u1 9.50 +DEAL::u2 25.5 +DEAL::u1 72.8 +DEAL::u0 157. +DEAL::u0 14.5 +DEAL::u1 28.2 +DEAL::u2 72.4 +DEAL::u1 196. +DEAL::u0 401. DEAL::FE_Q<2>(2) -DEAL::u0 9 -DEAL::u1 25 -DEAL::u2 81 -DEAL::u1 320 -DEAL::u0 1197 -DEAL::u0 204 -DEAL::u1 770 -DEAL::u2 2854 -DEAL::u1 12165 -DEAL::u0 49857 +DEAL::u0 9.50 +DEAL::u1 25.5 +DEAL::u2 81.5 +DEAL::u1 320. +DEAL::u0 1.20e+03 +DEAL::u0 204. +DEAL::u1 771. +DEAL::u2 2.85e+03 +DEAL::u1 1.22e+04 +DEAL::u0 4.99e+04 DEAL::FESystem<2>[FE_DGQ<2>(1)^2] -DEAL::u0 8 -DEAL::u1 32 -DEAL::u2 128 -DEAL::u1 512 -DEAL::u0 2048 -DEAL::u0 140 -DEAL::u1 540 -DEAL::u2 2140 -DEAL::u1 8520 -DEAL::u0 33640 +DEAL::u0 8.50 +DEAL::u1 32.5 +DEAL::u2 128. +DEAL::u1 512. +DEAL::u0 2.05e+03 +DEAL::u0 140. +DEAL::u1 540. +DEAL::u2 2.14e+03 +DEAL::u1 8.52e+03 +DEAL::u0 3.36e+04 DEAL::FESystem<2>[FE_DGP<2>(1)^2-FE_DGQ<2>(1)^3] -DEAL::u0 18 -DEAL::u1 72 -DEAL::u2 288 -DEAL::u1 1152 -DEAL::u0 4608 -DEAL::u0 1785 -DEAL::u1 7110 -DEAL::u2 28410 -DEAL::u1 113580 -DEAL::u0 453660 +DEAL::u0 18.5 +DEAL::u1 72.5 +DEAL::u2 288. +DEAL::u1 1.15e+03 +DEAL::u0 4.61e+03 +DEAL::u0 1.79e+03 +DEAL::u1 7.11e+03 +DEAL::u2 2.84e+04 +DEAL::u1 1.14e+05 +DEAL::u0 4.54e+05 DEAL::FE_RaviartThomas<2>(2) -DEAL::u0 24 -DEAL::u1 89 -DEAL::u2 478 -DEAL::u1 3694 -DEAL::u0 17545 -DEAL::u0 4324 -DEAL::u1 23657 -DEAL::u2 151013 -DEAL::u1 1257057 -DEAL::u0 6305285 +DEAL::u0 24.5 +DEAL::u1 89.0 +DEAL::u2 478. +DEAL::u1 3.69e+03 +DEAL::u0 1.75e+04 +DEAL::u0 4.32e+03 +DEAL::u1 2.37e+04 +DEAL::u2 1.51e+05 +DEAL::u1 1.26e+06 +DEAL::u0 6.31e+06 DEAL::FESystem<2>[FE_RaviartThomas<2>(1)-FE_DGQ<2>(0)^2] -DEAL::u0 14 -DEAL::u1 48 -DEAL::u2 176 -DEAL::u1 956 -DEAL::u0 4406 -DEAL::u0 819 -DEAL::u1 4263 -DEAL::u2 17726 -DEAL::u1 100217 -DEAL::u0 529912 +DEAL::u0 14.5 +DEAL::u1 48.5 +DEAL::u2 176. +DEAL::u1 956. +DEAL::u0 4.41e+03 +DEAL::u0 820. +DEAL::u1 4.26e+03 +DEAL::u2 1.77e+04 +DEAL::u1 1.00e+05 +DEAL::u0 5.30e+05 DEAL::FE_DGQ<3>(1) -DEAL::u0 8 -DEAL::u1 64 -DEAL::u2 512 -DEAL::u1 4096 -DEAL::u0 32768 -DEAL::u0 140 -DEAL::u1 952 -DEAL::u2 7280 -DEAL::u1 56896 -DEAL::u0 425600 +DEAL::u0 8.50 +DEAL::u1 64.5 +DEAL::u2 512. +DEAL::u1 4.10e+03 +DEAL::u0 3.28e+04 +DEAL::u0 140. +DEAL::u1 952. +DEAL::u2 7.28e+03 +DEAL::u1 5.69e+04 +DEAL::u0 4.26e+05 DEAL::FE_Q<3>(2) -DEAL::u0 27 -DEAL::u1 125 -DEAL::u2 729 -DEAL::u1 5711 -DEAL::u0 41399 -DEAL::u0 6201 -DEAL::u1 41649 -DEAL::u2 283614 -DEAL::u1 2428884 -DEAL::u0 19420365 +DEAL::u0 27.5 +DEAL::u1 126. +DEAL::u2 730. +DEAL::u1 5.71e+03 +DEAL::u0 4.14e+04 +DEAL::u0 6.20e+03 +DEAL::u1 4.16e+04 +DEAL::u2 2.84e+05 +DEAL::u1 2.43e+06 +DEAL::u0 1.94e+07