From 5f97535af4bf039cc90f9a4c1c9b77bea5dd7c19 Mon Sep 17 00:00:00 2001 From: guido Date: Thu, 25 Jul 2002 14:12:22 +0000 Subject: [PATCH] output files fixed; sparse_matrices does not produce significant output git-svn-id: https://svn.dealii.org/trunk@6283 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/lac/matrix_out.checked | 8 ++--- tests/lac/sparse_matrices.cc | 6 ++-- tests/lac/sparse_matrices.checked | 56 +++++++++++++++---------------- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/tests/lac/matrix_out.checked b/tests/lac/matrix_out.checked index 750ee57a28..fba9a8006f 100644 --- a/tests/lac/matrix_out.checked +++ b/tests/lac/matrix_out.checked @@ -83,13 +83,13 @@ %%EndProlog 0.50 setlinewidth -0.00000 0.00000 0.00000 s 59.50667 81.28762 m 39.67111 98.46571 l 74.02730 54.19175 l 93.86286 105.72603 lf +0.00000 sg 59.50667 81.28762 m 39.67111 98.46571 l 74.02730 54.19175 l 93.86286 105.72603 lf 0 sg 59.50667 81.28762 m 39.67111 98.46571 l 74.02730 54.19175 l 93.86286 105.72603 lx 0.00000 0.00000 0.36364 s 93.86286 105.72603 m 74.02730 54.19175 l 108.38349 78.63016 l 128.21905 130.16444 lf 0 sg 93.86286 105.72603 m 74.02730 54.19175 l 108.38349 78.63016 l 128.21905 130.16444 lx 0.00000 0.00000 0.36364 s 39.67111 98.46571 m 19.83556 115.64381 l 54.19175 71.36984 l 74.02730 54.19175 lf 0 sg 39.67111 98.46571 m 19.83556 115.64381 l 54.19175 71.36984 l 74.02730 54.19175 lx -0.00000 0.00000 0.00000 s 74.02730 54.19175 m 54.19175 71.36984 l 88.54794 27.09587 l 108.38349 78.63016 lf +0.00000 sg 74.02730 54.19175 m 54.19175 71.36984 l 88.54794 27.09587 l 108.38349 78.63016 lf 0 sg 74.02730 54.19175 m 54.19175 71.36984 l 88.54794 27.09587 l 108.38349 78.63016 lx 0.00000 0.09091 0.90909 s 128.21905 130.16444 m 108.38349 78.63016 l 142.73968 103.06857 l 162.57524 154.60286 lf 0 sg 128.21905 130.16444 m 108.38349 78.63016 l 142.73968 103.06857 l 162.57524 154.60286 lx @@ -99,7 +99,7 @@ 0 sg 54.19175 71.36984 m 34.35619 88.54794 l 68.71238 44.27397 l 88.54794 27.09587 lx 0.00000 0.09091 0.90909 s 19.83556 115.64381 m 0.00000 132.82190 l 34.35619 88.54794 l 54.19175 71.36984 lf 0 sg 19.83556 115.64381 m 0.00000 132.82190 l 34.35619 88.54794 l 54.19175 71.36984 lx -0.00000 0.00000 0.00000 s 88.54794 27.09587 m 68.71238 44.27397 l 103.06857 0.00000 l 122.90413 51.53429 lf +0.00000 sg 88.54794 27.09587 m 68.71238 44.27397 l 103.06857 0.00000 l 122.90413 51.53429 lf 0 sg 88.54794 27.09587 m 68.71238 44.27397 l 103.06857 0.00000 l 122.90413 51.53429 lx 0.00000 0.81818 0.18182 s 162.57524 154.60286 m 142.73968 103.06857 l 177.09587 127.50698 l 196.93143 179.04127 lf 0 sg 162.57524 154.60286 m 142.73968 103.06857 l 177.09587 127.50698 l 196.93143 179.04127 lx @@ -119,7 +119,7 @@ 0 sg 211.45206 151.94540 m 191.61651 100.41111 l 225.97270 124.84952 l 245.80825 176.38381 lx 0.00000 0.81818 0.18182 s 191.61651 100.41111 m 171.78095 48.87683 l 206.13714 73.31524 l 225.97270 124.84952 lf 0 sg 191.61651 100.41111 m 171.78095 48.87683 l 206.13714 73.31524 l 225.97270 124.84952 lx -1.00000 1.00000 1.00000 s 265.64381 227.91809 m 245.80825 176.38381 l 280.16444 200.82222 l 300.00000 252.35651 lf +1.00000 sg 265.64381 227.91809 m 245.80825 176.38381 l 280.16444 200.82222 l 300.00000 252.35651 lf 0 sg 265.64381 227.91809 m 245.80825 176.38381 l 280.16444 200.82222 l 300.00000 252.35651 lx 1.00000 0.27273 0.27273 s 245.80825 176.38381 m 225.97270 124.84952 l 260.32889 149.28794 l 280.16444 200.82222 lf 0 sg 245.80825 176.38381 m 225.97270 124.84952 l 260.32889 149.28794 l 280.16444 200.82222 lx diff --git a/tests/lac/sparse_matrices.cc b/tests/lac/sparse_matrices.cc index 77ccb2a326..3400b898a4 100644 --- a/tests/lac/sparse_matrices.cc +++ b/tests/lac/sparse_matrices.cc @@ -12,6 +12,8 @@ //---------------------------- testmatrix.cc --------------------------- +//TODO: [GK] Produce some useful output! + #include "testmatrix.h" #include #include @@ -71,11 +73,11 @@ int main() // and benchmark #ifdef DEBUG deallog.depth_console(0); + const unsigned int size = 100; +#else deallog.log_execution_time(true); deallog.log_time_differences(true); const unsigned int size = 1000; -#else - const unsigned int size = 100; #endif FDMatrix testproblem (size, size); diff --git a/tests/lac/sparse_matrices.checked b/tests/lac/sparse_matrices.checked index 85588b3763..2b52c9596b 100644 --- a/tests/lac/sparse_matrices.checked +++ b/tests/lac/sparse_matrices.checked @@ -1,29 +1,29 @@ -9.84 :DEAL:5-SparseMatrix:Richardson::Starting -52.82 :DEAL:5-SparseMatrix:Richardson::Failure step 50 -0.00 :DEAL:5-SparseMatrix::Transpose -1.56 :DEAL:5-SparseMatrix:RichardsonT::Starting -80.04 :DEAL:5-SparseMatrix:RichardsonT::Failure step 50 -0.00 :DEAL::GrowingVectorMemory:Overall allocated vectors: 4 -0.00 :DEAL::GrowingVectorMemory:Maximum allocated vectors: 2 -16.61 :DEAL:5-SparseMatrixEZ:Richardson::Starting -67.84 :DEAL:5-SparseMatrixEZ:Richardson::Failure step 50 -0.00 :DEAL:5-SparseMatrixEZ::Transpose -1.52 :DEAL:5-SparseMatrixEZ:RichardsonT::Starting -78.19 :DEAL:5-SparseMatrixEZ:RichardsonT::Failure step 50 -0.00 :DEAL::GrowingVectorMemory:Overall allocated vectors: 4 -0.00 :DEAL::GrowingVectorMemory:Maximum allocated vectors: 2 -13.09 :DEAL:9-SparseMatrix:Richardson::Starting -73.20 :DEAL:9-SparseMatrix:Richardson::Failure step 50 -0.00 :DEAL:9-SparseMatrix::Transpose -2.35 :DEAL:9-SparseMatrix:RichardsonT::Starting -119.03:DEAL:9-SparseMatrix:RichardsonT::Failure step 50 -0.00 :DEAL::GrowingVectorMemory:Overall allocated vectors: 4 -0.00 :DEAL::GrowingVectorMemory:Maximum allocated vectors: 2 -32.49 :DEAL:9-SparseMatrixEZ:Richardson::Starting -94.45 :DEAL:9-SparseMatrixEZ:Richardson::Failure step 50 -0.00 :DEAL:9-SparseMatrixEZ::Transpose -2.14 :DEAL:9-SparseMatrixEZ:RichardsonT::Starting -109.61:DEAL:9-SparseMatrixEZ:RichardsonT::Failure step 50 -0.00 :DEAL::GrowingVectorMemory:Overall allocated vectors: 4 -0.00 :DEAL::GrowingVectorMemory:Maximum allocated vectors: 2 +DEAL:5-SparseMatrix:Richardson::Starting +DEAL:5-SparseMatrix:Richardson::Failure step 50 +DEAL:5-SparseMatrix::Transpose +DEAL:5-SparseMatrix:RichardsonT::Starting +DEAL:5-SparseMatrix:RichardsonT::Failure step 50 +DEAL::GrowingVectorMemory:Overall allocated vectors: 4 +DEAL::GrowingVectorMemory:Maximum allocated vectors: 2 +DEAL:5-SparseMatrixEZ:Richardson::Starting +DEAL:5-SparseMatrixEZ:Richardson::Failure step 50 +DEAL:5-SparseMatrixEZ::Transpose +DEAL:5-SparseMatrixEZ:RichardsonT::Starting +DEAL:5-SparseMatrixEZ:RichardsonT::Failure step 50 +DEAL::GrowingVectorMemory:Overall allocated vectors: 4 +DEAL::GrowingVectorMemory:Maximum allocated vectors: 2 +DEAL:9-SparseMatrix:Richardson::Starting +DEAL:9-SparseMatrix:Richardson::Failure step 50 +DEAL:9-SparseMatrix::Transpose +DEAL:9-SparseMatrix:RichardsonT::Starting +DEAL:9-SparseMatrix:RichardsonT::Failure step 50 +DEAL::GrowingVectorMemory:Overall allocated vectors: 4 +DEAL::GrowingVectorMemory:Maximum allocated vectors: 2 +DEAL:9-SparseMatrixEZ:Richardson::Starting +DEAL:9-SparseMatrixEZ:Richardson::Failure step 50 +DEAL:9-SparseMatrixEZ::Transpose +DEAL:9-SparseMatrixEZ:RichardsonT::Starting +DEAL:9-SparseMatrixEZ:RichardsonT::Failure step 50 +DEAL::GrowingVectorMemory:Overall allocated vectors: 4 +DEAL::GrowingVectorMemory:Maximum allocated vectors: 2 -- 2.39.5