From: Matthias Maier Date: Thu, 21 Aug 2014 09:04:09 +0000 (+0200) Subject: Fix memory_consumption_01 for icc X-Git-Tag: v8.2.0-rc1~190^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F102%2Fhead;p=dealii.git Fix memory_consumption_01 for icc The comparison file for compiler=Intel=yes was just invalid. Current icc does not miscompile the test in release mode anymore. So remove all special comparison files. --- diff --git a/tests/deal.II/memory_consumption_01.compiler=Intel=yes.with_64bit_indices=off.release.output b/tests/deal.II/memory_consumption_01.compiler=Intel=yes.with_64bit_indices=off.release.output deleted file mode 100644 index 5969e6f20d..0000000000 --- a/tests/deal.II/memory_consumption_01.compiler=Intel=yes.with_64bit_indices=off.release.output +++ /dev/null @@ -1,163 +0,0 @@ - -DEAL::1d -DEAL::Cycle 0: -DEAL:: Number of active cells: 8 -DEAL:: Number of degrees of freedom: 17 -DEAL:cg::Starting value 0.261041 -DEAL:cg::Convergence step 13 value 0 -DEAL::Memory consumption -- Triangulation: 2889 -DEAL::Memory consumption -- DoFHandler: 976 -DEAL::Memory consumption -- FE: 1488 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 448 -DEAL::Memory consumption -- Matrix: 632 -DEAL::Memory consumption -- Solution: 224 -DEAL::Memory consumption -- Rhs: 224 -DEAL::Cycle 1: -DEAL:: Number of active cells: 11 -DEAL:: Number of degrees of freedom: 23 -DEAL:cg::Starting value 0.235472 -DEAL:cg::Convergence step 16 value 0 -DEAL::Memory consumption -- Triangulation: 3759 -DEAL::Memory consumption -- DoFHandler: 1164 -DEAL::Memory consumption -- FE: 1488 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 568 -DEAL::Memory consumption -- Matrix: 824 -DEAL::Memory consumption -- Solution: 272 -DEAL::Memory consumption -- Rhs: 272 -DEAL::Cycle 2: -DEAL:: Number of active cells: 15 -DEAL:: Number of degrees of freedom: 31 -DEAL:cg::Starting value 0.226008 -DEAL:cg::Convergence step 21 value 0 -DEAL::Memory consumption -- Triangulation: 4599 -DEAL::Memory consumption -- DoFHandler: 1356 -DEAL::Memory consumption -- FE: 1488 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 728 -DEAL::Memory consumption -- Matrix: 1080 -DEAL::Memory consumption -- Solution: 336 -DEAL::Memory consumption -- Rhs: 336 -DEAL::Cycle 3: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 41 -DEAL:cg::Starting value 0.204506 -DEAL:cg::Convergence step 27 value 0 -DEAL::Memory consumption -- Triangulation: 5649 -DEAL::Memory consumption -- DoFHandler: 1584 -DEAL::Memory consumption -- FE: 1488 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 928 -DEAL::Memory consumption -- Matrix: 1400 -DEAL::Memory consumption -- Solution: 416 -DEAL::Memory consumption -- Rhs: 416 -DEAL::Memory consumption -- DataOut: 3329 -DEAL::2d -DEAL::Cycle 0: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 89 -DEAL:cg::Starting value 0.351647 -DEAL:cg::Convergence step 22 value 0 -DEAL::Memory consumption -- Triangulation: 5040 -DEAL::Memory consumption -- DoFHandler: 1936 -DEAL::Memory consumption -- FE: 3904 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 5728 -DEAL::Memory consumption -- Matrix: 10616 -DEAL::Memory consumption -- Solution: 800 -DEAL::Memory consumption -- Rhs: 800 -DEAL::Cycle 1: -DEAL:: Number of active cells: 44 -DEAL:: Number of degrees of freedom: 209 -DEAL:cg::Starting value 0.271387 -DEAL:cg::Convergence step 30 value 0 -DEAL::Memory consumption -- Triangulation: 10336 -DEAL::Memory consumption -- DoFHandler: 3728 -DEAL::Memory consumption -- FE: 3904 -DEAL::Memory consumption -- Constraints: 3102 -DEAL::Memory consumption -- Sparsity: 13984 -DEAL::Memory consumption -- Matrix: 26168 -DEAL::Memory consumption -- Solution: 1760 -DEAL::Memory consumption -- Rhs: 1760 -DEAL::Cycle 2: -DEAL:: Number of active cells: 92 -DEAL:: Number of degrees of freedom: 449 -DEAL:cg::Starting value 0.203851 -DEAL:cg::Convergence step 51 value 0 -DEAL::Memory consumption -- Triangulation: 20120 -DEAL::Memory consumption -- DoFHandler: 7184 -DEAL::Memory consumption -- FE: 3904 -DEAL::Memory consumption -- Constraints: 10734 -DEAL::Memory consumption -- Sparsity: 31232 -DEAL::Memory consumption -- Matrix: 58744 -DEAL::Memory consumption -- Solution: 3680 -DEAL::Memory consumption -- Rhs: 3680 -DEAL::Cycle 3: -DEAL:: Number of active cells: 200 -DEAL:: Number of degrees of freedom: 921 -DEAL:cg::Starting value 0.151971 -DEAL:cg::Convergence step 71 value 0 -DEAL::Memory consumption -- Triangulation: 40304 -DEAL::Memory consumption -- DoFHandler: 14672 -DEAL::Memory consumption -- FE: 3904 -DEAL::Memory consumption -- Constraints: 19966 -DEAL::Memory consumption -- Sparsity: 64160 -DEAL::Memory consumption -- Matrix: 120824 -DEAL::Memory consumption -- Solution: 7456 -DEAL::Memory consumption -- Rhs: 7456 -DEAL::Memory consumption -- DataOut: 42789 -DEAL::3d -DEAL::Cycle 0: -DEAL:: Number of active cells: 56 -DEAL:: Number of degrees of freedom: 517 -DEAL:cg::Starting value 0.206362 -DEAL:cg::Convergence step 29 value 0 -DEAL::Memory consumption -- Triangulation: 23240 -DEAL::Memory consumption -- DoFHandler: 9760 -DEAL::Memory consumption -- FE: 12280 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 120272 -DEAL::Memory consumption -- Matrix: 236280 -DEAL::Memory consumption -- Solution: 4224 -DEAL::Memory consumption -- Rhs: 4224 -DEAL::Cycle 1: -DEAL:: Number of active cells: 217 -DEAL:: Number of degrees of freedom: 2217 -DEAL:cg::Starting value 0.116541 -DEAL:cg::Convergence step 31 value 0 -DEAL::Memory consumption -- Triangulation: 91120 -DEAL::Memory consumption -- DoFHandler: 37996 -DEAL::Memory consumption -- FE: 12280 -DEAL::Memory consumption -- Constraints: 55262 -DEAL::Memory consumption -- Sparsity: 567144 -DEAL::Memory consumption -- Matrix: 1116424 -DEAL::Memory consumption -- Solution: 17824 -DEAL::Memory consumption -- Rhs: 17824 -DEAL::Cycle 2: -DEAL:: Number of active cells: 896 -DEAL:: Number of degrees of freedom: 9373 -DEAL:cg::Starting value 0.0978429 -DEAL:cg::Convergence step 55 value 0 -DEAL::Memory consumption -- Triangulation: 364776 -DEAL::Memory consumption -- DoFHandler: 151280 -DEAL::Memory consumption -- FE: 12280 -DEAL::Memory consumption -- Constraints: 367086 -DEAL::Memory consumption -- Sparsity: 2517200 -DEAL::Memory consumption -- Matrix: 4959288 -DEAL::Memory consumption -- Solution: 75072 -DEAL::Memory consumption -- Rhs: 75072 -DEAL::Cycle 3: -DEAL:: Number of active cells: 3248 -DEAL:: Number of degrees of freedom: 32433 -DEAL:cg::Starting value 0.0425276 -DEAL:cg::Convergence step 82 value 0 -DEAL::Memory consumption -- Triangulation: 1283544 -DEAL::Memory consumption -- DoFHandler: 542008 -DEAL::Memory consumption -- FE: 12280 -DEAL::Memory consumption -- Constraints: 1307806 -DEAL::Memory consumption -- Sparsity: 8321760 -DEAL::Memory consumption -- Matrix: 16383928 -DEAL::Memory consumption -- Solution: 259552 -DEAL::Memory consumption -- Rhs: 259552 -DEAL::Memory consumption -- DataOut: 1159725 diff --git a/tests/deal.II/memory_consumption_01.with_64bit_indices=off.debug.output b/tests/deal.II/memory_consumption_01.with_64bit_indices=off.debug.output deleted file mode 100644 index a7081dce0c..0000000000 --- a/tests/deal.II/memory_consumption_01.with_64bit_indices=off.debug.output +++ /dev/null @@ -1,163 +0,0 @@ - -DEAL::1d -DEAL::Cycle 0: -DEAL:: Number of active cells: 8 -DEAL:: Number of degrees of freedom: 17 -DEAL:cg::Starting value 0.261041 -DEAL:cg::Convergence step 13 value 0 -DEAL::Memory consumption -- Triangulation: 2934 -DEAL::Memory consumption -- DoFHandler: 976 -DEAL::Memory consumption -- FE: 1488 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 448 -DEAL::Memory consumption -- Matrix: 632 -DEAL::Memory consumption -- Solution: 224 -DEAL::Memory consumption -- Rhs: 224 -DEAL::Cycle 1: -DEAL:: Number of active cells: 11 -DEAL:: Number of degrees of freedom: 23 -DEAL:cg::Starting value 0.235472 -DEAL:cg::Convergence step 16 value 0 -DEAL::Memory consumption -- Triangulation: 3822 -DEAL::Memory consumption -- DoFHandler: 1164 -DEAL::Memory consumption -- FE: 1488 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 568 -DEAL::Memory consumption -- Matrix: 824 -DEAL::Memory consumption -- Solution: 272 -DEAL::Memory consumption -- Rhs: 272 -DEAL::Cycle 2: -DEAL:: Number of active cells: 15 -DEAL:: Number of degrees of freedom: 31 -DEAL:cg::Starting value 0.226008 -DEAL:cg::Convergence step 21 value 0 -DEAL::Memory consumption -- Triangulation: 4686 -DEAL::Memory consumption -- DoFHandler: 1356 -DEAL::Memory consumption -- FE: 1488 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 728 -DEAL::Memory consumption -- Matrix: 1080 -DEAL::Memory consumption -- Solution: 336 -DEAL::Memory consumption -- Rhs: 336 -DEAL::Cycle 3: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 41 -DEAL:cg::Starting value 0.204506 -DEAL:cg::Convergence step 27 value 0 -DEAL::Memory consumption -- Triangulation: 5766 -DEAL::Memory consumption -- DoFHandler: 1584 -DEAL::Memory consumption -- FE: 1488 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 928 -DEAL::Memory consumption -- Matrix: 1400 -DEAL::Memory consumption -- Solution: 416 -DEAL::Memory consumption -- Rhs: 416 -DEAL::Memory consumption -- DataOut: 3329 -DEAL::2d -DEAL::Cycle 0: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 89 -DEAL:cg::Starting value 0.351647 -DEAL:cg::Convergence step 22 value 0 -DEAL::Memory consumption -- Triangulation: 5283 -DEAL::Memory consumption -- DoFHandler: 1936 -DEAL::Memory consumption -- FE: 3904 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 5728 -DEAL::Memory consumption -- Matrix: 10616 -DEAL::Memory consumption -- Solution: 800 -DEAL::Memory consumption -- Rhs: 800 -DEAL::Cycle 1: -DEAL:: Number of active cells: 44 -DEAL:: Number of degrees of freedom: 209 -DEAL:cg::Starting value 0.271387 -DEAL:cg::Convergence step 30 value 0 -DEAL::Memory consumption -- Triangulation: 10915 -DEAL::Memory consumption -- DoFHandler: 3728 -DEAL::Memory consumption -- FE: 3904 -DEAL::Memory consumption -- Constraints: 3102 -DEAL::Memory consumption -- Sparsity: 13984 -DEAL::Memory consumption -- Matrix: 26168 -DEAL::Memory consumption -- Solution: 1760 -DEAL::Memory consumption -- Rhs: 1760 -DEAL::Cycle 2: -DEAL:: Number of active cells: 92 -DEAL:: Number of degrees of freedom: 449 -DEAL:cg::Starting value 0.203851 -DEAL:cg::Convergence step 51 value 0 -DEAL::Memory consumption -- Triangulation: 21347 -DEAL::Memory consumption -- DoFHandler: 7184 -DEAL::Memory consumption -- FE: 3904 -DEAL::Memory consumption -- Constraints: 10734 -DEAL::Memory consumption -- Sparsity: 31232 -DEAL::Memory consumption -- Matrix: 58744 -DEAL::Memory consumption -- Solution: 3680 -DEAL::Memory consumption -- Rhs: 3680 -DEAL::Cycle 3: -DEAL:: Number of active cells: 200 -DEAL:: Number of degrees of freedom: 921 -DEAL:cg::Starting value 0.151971 -DEAL:cg::Convergence step 71 value 0 -DEAL::Memory consumption -- Triangulation: 42899 -DEAL::Memory consumption -- DoFHandler: 14672 -DEAL::Memory consumption -- FE: 3904 -DEAL::Memory consumption -- Constraints: 19966 -DEAL::Memory consumption -- Sparsity: 64160 -DEAL::Memory consumption -- Matrix: 120824 -DEAL::Memory consumption -- Solution: 7456 -DEAL::Memory consumption -- Rhs: 7456 -DEAL::Memory consumption -- DataOut: 42789 -DEAL::3d -DEAL::Cycle 0: -DEAL:: Number of active cells: 56 -DEAL:: Number of degrees of freedom: 517 -DEAL:cg::Starting value 0.206362 -DEAL:cg::Convergence step 29 value 0 -DEAL::Memory consumption -- Triangulation: 24743 -DEAL::Memory consumption -- DoFHandler: 9760 -DEAL::Memory consumption -- FE: 12280 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 120272 -DEAL::Memory consumption -- Matrix: 236280 -DEAL::Memory consumption -- Solution: 4224 -DEAL::Memory consumption -- Rhs: 4224 -DEAL::Cycle 1: -DEAL:: Number of active cells: 217 -DEAL:: Number of degrees of freedom: 2217 -DEAL:cg::Starting value 0.116541 -DEAL:cg::Convergence step 31 value 0 -DEAL::Memory consumption -- Triangulation: 97477 -DEAL::Memory consumption -- DoFHandler: 37996 -DEAL::Memory consumption -- FE: 12280 -DEAL::Memory consumption -- Constraints: 55262 -DEAL::Memory consumption -- Sparsity: 567144 -DEAL::Memory consumption -- Matrix: 1116424 -DEAL::Memory consumption -- Solution: 17824 -DEAL::Memory consumption -- Rhs: 17824 -DEAL::Cycle 2: -DEAL:: Number of active cells: 896 -DEAL:: Number of degrees of freedom: 9373 -DEAL:cg::Starting value 0.0978429 -DEAL:cg::Convergence step 55 value 0 -DEAL::Memory consumption -- Triangulation: 390903 -DEAL::Memory consumption -- DoFHandler: 151280 -DEAL::Memory consumption -- FE: 12280 -DEAL::Memory consumption -- Constraints: 367086 -DEAL::Memory consumption -- Sparsity: 2517200 -DEAL::Memory consumption -- Matrix: 4959288 -DEAL::Memory consumption -- Solution: 75072 -DEAL::Memory consumption -- Rhs: 75072 -DEAL::Cycle 3: -DEAL:: Number of active cells: 3248 -DEAL:: Number of degrees of freedom: 32433 -DEAL:cg::Starting value 0.0425276 -DEAL:cg::Convergence step 82 value 0 -DEAL::Memory consumption -- Triangulation: 1375395 -DEAL::Memory consumption -- DoFHandler: 542008 -DEAL::Memory consumption -- FE: 12280 -DEAL::Memory consumption -- Constraints: 1307806 -DEAL::Memory consumption -- Sparsity: 8321760 -DEAL::Memory consumption -- Matrix: 16383928 -DEAL::Memory consumption -- Solution: 259552 -DEAL::Memory consumption -- Rhs: 259552 -DEAL::Memory consumption -- DataOut: 1159725 diff --git a/tests/deal.II/memory_consumption_01.compiler=Intel=no.with_64bit_indices=off.release.output b/tests/deal.II/memory_consumption_01.with_64bit_indices=off.output similarity index 100% rename from tests/deal.II/memory_consumption_01.compiler=Intel=no.with_64bit_indices=off.release.output rename to tests/deal.II/memory_consumption_01.with_64bit_indices=off.output