]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Final bits for today
authorMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 19 Aug 2013 21:18:01 +0000 (21:18 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 19 Aug 2013 21:18:01 +0000 (21:18 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30345 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/macros/macro_deal_ii_add_test.cmake
deal.II/cmake/scripts/run_test.cmake
tests/base/anisotropic_1.output [new file with mode: 0644]

index a8a106211e3a7280cfc78a95ce5d3e99d6fb55bb..b4eb78c6bf91b91daac7689872f2eb123c43a71b 100644 (file)
@@ -51,6 +51,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name)
         ${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX}
         )
 
+
       ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output
         COMMAND ${_test}
         DEPENDS ${_test}
@@ -60,6 +61,21 @@ MACRO(DEAL_II_ADD_TEST _category _test_name)
         DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output
         )
 
+
+      ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff
+        COMMAND numdiff 
+          ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output
+          ${CMAKE_CURRENT_SOURCE_DIR}/${_test_name}.output
+          > ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff
+        DEPENDS
+          ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output
+          ${CMAKE_CURRENT_SOURCE_DIR}/${_test_name}.output
+        )
+      ADD_CUSTOM_TARGET(${_test}.diff
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff
+        )
+
+
       ADD_TEST(NAME ${_test}
         COMMAND ${CMAKE_COMMAND}
           -DTEST=${_test}
index d05190d19d667bb65abc18886aea970a6700a60b..7763aa739cb4acd67fab48bfbec81045d15d3dd9 100644 (file)
@@ -32,7 +32,7 @@ CALLBACK(${TEST}.run
   "Run successful" "Running the test failed with the following error message"
   )
 
-CALLBACK(${TEST}.compare
-  "Run successful" "Running the test failed with the following error message"
+CALLBACK(${TEST}.diff
+  "Diff successful" "Diff failed:"
   )
 
diff --git a/tests/base/anisotropic_1.output b/tests/base/anisotropic_1.output
new file mode 100644 (file)
index 0000000..6be0679
--- /dev/null
@@ -0,0 +1,127 @@
+
+DEAL:Lagrange:1d::P0   = -0.62 gradient        1.2             2nd     4.5     
+DEAL:Lagrange:1d::P1   = 5.6   gradient        -34.            2nd     -4.5    
+DEAL:Lagrange:1d::P2   = 5.6   gradient        34.             2nd     -4.5    
+DEAL:Lagrange:1d::
+DEAL:Lagrange:2d::P0   = -1.4  gradient        2.8     15.             2nd     1.0     -0.30   -0.30   -0.79   
+DEAL:Lagrange:2d::P1   = 13.   gradient        -76.    -1.4e+02                2nd     -1.0    8.2     8.2     7.1     
+DEAL:Lagrange:2d::P2   = 13.   gradient        76.     -1.4e+02                2nd     -1.0    -8.2    -8.2    7.1     
+DEAL:Lagrange:2d::P3   = -6.3  gradient        13.     -10.            2nd     4.5     0.20    0.20    1.8     
+DEAL:Lagrange:2d::P4   = 57.   gradient        -3.4e+02        91.             2nd     -4.5    -5.5    -5.5    -16.    
+DEAL:Lagrange:2d::P5   = 57.   gradient        3.4e+02 91.             2nd     -4.5    5.5     5.5     -16.    
+DEAL:Lagrange:2d::P6   = 1.8   gradient        -3.6    -6.8            2nd     -1.3    0.14    0.14    -1.2    
+DEAL:Lagrange:2d::P7   = -16.  gradient        97.     61.             2nd     1.3     -3.6    -3.6    11.     
+DEAL:Lagrange:2d::P8   = -16.  gradient        -97.    61.             2nd     1.3     3.6     3.6     11.     
+DEAL:Lagrange:2d::
+DEAL:Lagrange:3d::P0   = -0.54 gradient        1.1     5.9     18.             2nd     0.039   -0.012  -0.037  -0.012  -0.030  -0.20   -0.037  -0.20   -0.14   
+DEAL:Lagrange:3d::P1   = 4.9   gradient        -29.    -53.    -1.7e+02                2nd     -0.039  0.32    0.99    0.32    0.27    1.8     0.99    1.8     1.2     
+DEAL:Lagrange:3d::P2   = 4.9   gradient        29.     -53.    -1.7e+02                2nd     -0.039  -0.32   -0.99   -0.32   0.27    1.8     -0.99   1.8     1.2     
+DEAL:Lagrange:3d::P3   = -2.4  gradient        4.9     -3.9    83.             2nd     0.17    0.0078  -0.17   0.0078  0.069   0.13    -0.17   0.13    -0.62   
+DEAL:Lagrange:3d::P4   = 22.   gradient        -1.3e+02        35.     -7.5e+02                2nd     -0.17   -0.21   4.5     -0.21   -0.62   -1.2    4.5     -1.2    5.6     
+DEAL:Lagrange:3d::P5   = 22.   gradient        1.3e+02 35.     -7.5e+02                2nd     -0.17   0.21    -4.5    0.21    -0.62   -1.2    -4.5    -1.2    5.6     
+DEAL:Lagrange:3d::P6   = 0.69  gradient        -1.4    -2.6    -24.            2nd     -0.050  0.0052  0.047   0.0052  -0.048  0.089   0.047   0.089   0.18    
+DEAL:Lagrange:3d::P7   = -6.2  gradient        37.     23.     2.1e+02         2nd     0.050   -0.14   -1.3    -0.14   0.43    -0.80   -1.3    -0.80   -1.6    
+DEAL:Lagrange:3d::P8   = -6.2  gradient        -37.    23.     2.1e+02         2nd     0.050   0.14    1.3     0.14    0.43    -0.80   1.3     -0.80   -1.6    
+DEAL:Lagrange:3d::P9   = -15.  gradient        29.     1.6e+02 12.             2nd     1.0     -0.32   -0.024  -0.32   -0.82   -0.13   -0.024  -0.13   0.29    
+DEAL:Lagrange:3d::P10  = 1.3e+02       gradient        -7.9e+02        -1.4e+03        -1.1e+02                2nd     -1.0    8.6     0.65    8.6     7.4     1.2     0.65    1.2     -2.6    
+DEAL:Lagrange:3d::P11  = 1.3e+02       gradient        7.9e+02 -1.4e+03        -1.1e+02                2nd     -1.0    -8.6    -0.65   -8.6    7.4     1.2     -0.65   1.2     -2.6    
+DEAL:Lagrange:3d::P12  = -65.  gradient        1.3e+02 -1.1e+02        54.             2nd     4.7     0.21    -0.11   0.21    1.9     0.087   -0.11   0.087   1.3     
+DEAL:Lagrange:3d::P13  = 5.9e+02       gradient        -3.5e+03        9.5e+02 -4.8e+02                2nd     -4.7    -5.7    2.9     -5.7    -17.    -0.78   2.9     -0.78   -12.    
+DEAL:Lagrange:3d::P14  = 5.9e+02       gradient        3.5e+03 9.5e+02 -4.8e+02                2nd     -4.7    5.7     -2.9    5.7     -17.    -0.78   -2.9    -0.78   -12.    
+DEAL:Lagrange:3d::P15  = 19.   gradient        -37.    -70.    -15.            2nd     -1.3    0.14    0.031   0.14    -1.3    0.058   0.031   0.058   -0.37   
+DEAL:Lagrange:3d::P16  = -1.7e+02      gradient        1.0e+03 6.3e+02 1.4e+02         2nd     1.3     -3.8    -0.83   -3.8    12.     -0.52   -0.83   -0.52   3.4     
+DEAL:Lagrange:3d::P17  = -1.7e+02      gradient        -1.0e+03        6.3e+02 1.4e+02         2nd     1.3     3.8     0.83    3.8     12.     -0.52   0.83    -0.52   3.4     
+DEAL:Lagrange:3d::P18  = 1.3   gradient        -2.6    -14.    -37.            2nd     -0.095  0.029   0.074   0.029   0.074   0.40    0.074   0.40    -0.16   
+DEAL:Lagrange:3d::P19  = -12.  gradient        71.     1.3e+02 3.3e+02         2nd     0.095   -0.78   -2.0    -0.78   -0.67   -3.6    -2.0    -3.6    1.5     
+DEAL:Lagrange:3d::P20  = -12.  gradient        -71.    1.3e+02 3.3e+02         2nd     0.095   0.78    2.0     0.78    -0.67   -3.6    2.0     -3.6    1.5     
+DEAL:Lagrange:3d::P21  = 6.0   gradient        -12.    9.6     -1.7e+02                2nd     -0.43   -0.019  0.33    -0.019  -0.17   -0.27   0.33    -0.27   -0.74   
+DEAL:Lagrange:3d::P22  = -54.  gradient        3.2e+02 -86.    1.5e+03         2nd     0.43    0.52    -9.0    0.52    1.5     2.4     -9.0    2.4     6.6     
+DEAL:Lagrange:3d::P23  = -54.  gradient        -3.2e+02        -86.    1.5e+03         2nd     0.43    -0.52   9.0     -0.52   1.5     2.4     9.0     2.4     6.6     
+DEAL:Lagrange:3d::P24  = -1.7  gradient        3.4     6.4     48.             2nd     0.12    -0.013  -0.096  -0.013  0.12    -0.18   -0.096  -0.18   0.21    
+DEAL:Lagrange:3d::P25  = 15.   gradient        -92.    -57.    -4.3e+02                2nd     -0.12   0.34    2.6     0.34    -1.1    1.6     2.6     1.6     -1.9    
+DEAL:Lagrange:3d::P26  = 15.   gradient        92.     -57.    -4.3e+02                2nd     -0.12   -0.34   -2.6    -0.34   -1.1    1.6     -2.6    1.6     -1.9    
+DEAL:Lagrange:3d::
+DEAL:Legendre:1d::P0   = 10.   gradient        0               2nd     0       
+DEAL:Legendre:1d::P1   = 0     gradient        35.             2nd     0       
+DEAL:Legendre:1d::P2   = -11.  gradient        0               2nd     27.     
+DEAL:Legendre:1d::
+DEAL:Legendre:2d::P0   = 1.0e+02       gradient        0       0               2nd     0       0       0       0       
+DEAL:Legendre:2d::P1   = 0     gradient        3.5e+02 0               2nd     0       0       0       0       
+DEAL:Legendre:2d::P2   = -1.1e+02      gradient        0       0               2nd     27.     0       0       0       
+DEAL:Legendre:2d::P3   = -1.0e+02      gradient        0       3.5e+02         2nd     0       0       0       0       
+DEAL:Legendre:2d::P4   = 0     gradient        -3.6e+02        0               2nd     0       12.     12.     0       
+DEAL:Legendre:2d::P5   = 1.2e+02       gradient        0       -3.9e+02                2nd     -28.    0       0       0       
+DEAL:Legendre:2d::P6   = 8.9   gradient        0       -8.0e+02                2nd     0       0       0       27.     
+DEAL:Legendre:2d::P7   = 0     gradient        31.     0               2nd     0       -28.    -28.    0       
+DEAL:Legendre:2d::P8   = -10.  gradient        0       9.0e+02         2nd     2.4     0       0       -30.    
+DEAL:Legendre:2d::
+DEAL:Legendre:3d::P0   = 1.0e+03       gradient        0       0       0               2nd     0       0       0       0       0       0       0       0       0       
+DEAL:Legendre:3d::P1   = 0     gradient        3.5e+03 0       0               2nd     0       0       0       0       0       0       0       0       0       
+DEAL:Legendre:3d::P2   = -1.1e+03      gradient        0       0       0               2nd     27.     0       0       0       0       0       0       0       0       
+DEAL:Legendre:3d::P3   = -1.0e+03      gradient        0       3.5e+03 0               2nd     0       0       0       0       0       0       0       0       0       
+DEAL:Legendre:3d::P4   = 0     gradient        -3.6e+03        0       0               2nd     0       12.     0       12.     0       0       0       0       0       
+DEAL:Legendre:3d::P5   = 1.2e+03       gradient        0       -3.9e+03        0               2nd     -28.    0       0       0       0       0       0       0       0       
+DEAL:Legendre:3d::P6   = 89.   gradient        0       -8.0e+03        0               2nd     0       0       0       0       27.     0       0       0       0       
+DEAL:Legendre:3d::P7   = 0     gradient        3.1e+02 0       0               2nd     0       -28.    0       -28.    0       0       0       0       0       
+DEAL:Legendre:3d::P8   = -1.e+02       gradient        0       9.0e+03 0               2nd     2.4     0       0       0       -30.    0       0       0       0       
+DEAL:Legendre:3d::P9   = -6.9e+02      gradient        0       0       3.5e+03         2nd     0       0       0       0       0       0       0       0       0       
+DEAL:Legendre:3d::P10  = 0     gradient        -2.4e+03        0       0               2nd     0       0       12.     0       0       0       12.     0       0       
+DEAL:Legendre:3d::P11  = 7.7e+02       gradient        0       0       -3.9e+03                2nd     -19.    0       0       0       0       0       0       0       0       
+DEAL:Legendre:3d::P12  = 7.2e+02       gradient        0       -2.4e+03        -3.6e+03                2nd     0       0       0       0       0       12.     0       12.     0       
+DEAL:Legendre:3d::P13  = 0     gradient        2.5e+03 0       0               2nd     0       -8.3    -12.    -8.3    0       0       -12.    0       0       
+DEAL:Legendre:3d::P14  = -8.0e+02      gradient        0       2.7e+03 4.0e+03         2nd     19.     0       0       0       0       -13.    0       -13.    0       
+DEAL:Legendre:3d::P15  = -62.  gradient        0       5.6e+03 3.1e+02         2nd     0       0       0       0       -19.    -28.    0       -28.    0       
+DEAL:Legendre:3d::P16  = 0     gradient        -2.1e+02        0       0               2nd     0       19.     1.1     19.     0       0       1.1     0       0       
+DEAL:Legendre:3d::P17  = 69.   gradient        0       -6.2e+03        -3.5e+02                2nd     -1.7    0       0       0       21.     31.     0       31.     0       
+DEAL:Legendre:3d::P18  = -5.8e+02      gradient        0       0       -5.4e+03                2nd     0       0       0       0       0       0       0       0       27.     
+DEAL:Legendre:3d::P19  = 0     gradient        -2.0e+03        0       0               2nd     0       0       -19.    0       0       0       -19.    0       0       
+DEAL:Legendre:3d::P20  = 6.5e+02       gradient        0       0       6.0e+03         2nd     -16.    0       0       0       0       0       0       0       -30.    
+DEAL:Legendre:3d::P21  = 6.0e+02       gradient        0       -2.0e+03        5.6e+03         2nd     0       0       0       0       0       -19.    0       -19.    -28.    
+DEAL:Legendre:3d::P22  = 0     gradient        2.1e+03 0       0               2nd     0       -7.0    19.     -7.0    0       0       19.     0       0       
+DEAL:Legendre:3d::P23  = -6.8e+02      gradient        0       2.3e+03 -6.2e+03                2nd     16.     0       0       0       0       21.     0       21.     31.     
+DEAL:Legendre:3d::P24  = -52.  gradient        0       4.7e+03 -4.8e+02                2nd     0       0       0       0       -16.    43.     0       43.     2.4     
+DEAL:Legendre:3d::P25  = 0     gradient        -1.8e+02        0       0               2nd     0       16.     -1.7    16.     0       0       -1.7    0       0       
+DEAL:Legendre:3d::P26  = 58.   gradient        0       -5.2e+03        5.4e+02         2nd     -1.4    0       0       0       17.     -48.    0       -48.    -2.7    
+DEAL:Legendre:3d::
+DEAL:Hierarchical:1d::P0       = 5.0   gradient        -10.            2nd     0       
+DEAL:Hierarchical:1d::P1       = 5.0   gradient        10.             2nd     0       
+DEAL:Hierarchical:1d::P2       = -10.  gradient        0               2nd     8.0     
+DEAL:Hierarchical:1d::
+DEAL:Hierarchical:2d::P0       = 40.   gradient        -80.    -50.            2nd     0       1.0     1.0     0       
+DEAL:Hierarchical:2d::P1       = 40.   gradient        80.     -50.            2nd     0       -1.0    -1.0    0       
+DEAL:Hierarchical:2d::P2       = -80.  gradient        0       1.0e+02         2nd     6.4     0       0       0       
+DEAL:Hierarchical:2d::P3       = 10.   gradient        -20.    50.             2nd     0       -1.0    -1.0    0       
+DEAL:Hierarchical:2d::P4       = 10.   gradient        20.     50.             2nd     0       1.0     1.0     0       
+DEAL:Hierarchical:2d::P5       = -20.  gradient        0       -1.0e+02                2nd     1.6     0       0       0       
+DEAL:Hierarchical:2d::P6       = -32.  gradient        64.     -1.2e+02                2nd     0       2.4     2.4     4.0     
+DEAL:Hierarchical:2d::P7       = -32.  gradient        -64.    -1.2e+02                2nd     0       -2.4    -2.4    4.0     
+DEAL:Hierarchical:2d::P8       = 64.   gradient        0       2.4e+02         2nd     -5.1    0       0       -8.0    
+DEAL:Hierarchical:2d::
+DEAL:Hierarchical:3d::P0       = 2.8e+02       gradient        -5.6e+02        -3.5e+02        -4.0e+02                2nd     0       0.70    0.80    0.70    0       0.50    0.80    0.50    0       
+DEAL:Hierarchical:3d::P1       = 2.8e+02       gradient        5.6e+02 -3.5e+02        -4.0e+02                2nd     0       -0.70   -0.80   -0.70   0       0.50    -0.80   0.50    0       
+DEAL:Hierarchical:3d::P2       = -5.6e+02      gradient        0       7.0e+02 8.0e+02         2nd     4.5     0       0       0       0       -1.0    0       -1.0    0       
+DEAL:Hierarchical:3d::P3       = 70.   gradient        -1.4e+02        3.5e+02 -1.0e+02                2nd     0       -0.70   0.20    -0.70   0       -0.50   0.20    -0.50   0       
+DEAL:Hierarchical:3d::P4       = 70.   gradient        1.4e+02 3.5e+02 -1.0e+02                2nd     0       0.70    -0.20   0.70    0       -0.50   -0.20   -0.50   0       
+DEAL:Hierarchical:3d::P5       = -1.4e+02      gradient        0       -7.0e+02        2.0e+02         2nd     1.1     0       0       0       0       1.0     0       1.0     0       
+DEAL:Hierarchical:3d::P6       = -2.2e+02      gradient        4.5e+02 -8.4e+02        3.2e+02         2nd     0       1.7     -0.64   1.7     2.8     1.2     -0.64   1.2     0       
+DEAL:Hierarchical:3d::P7       = -2.2e+02      gradient        -4.5e+02        -8.4e+02        3.2e+02         2nd     0       -1.7    0.64    -1.7    2.8     1.2     0.64    1.2     0       
+DEAL:Hierarchical:3d::P8       = 4.5e+02       gradient        0       1.7e+03 -6.4e+02                2nd     -3.6    0       0       0       -5.6    -2.4    0       -2.4    0       
+DEAL:Hierarchical:3d::P9       = 1.2e+02       gradient        -2.4e+02        -1.5e+02        4.0e+02         2nd     0       0.30    -0.80   0.30    0       -0.50   -0.80   -0.50   0       
+DEAL:Hierarchical:3d::P10      = 1.2e+02       gradient        2.4e+02 -1.5e+02        4.0e+02         2nd     0       -0.30   0.80    -0.30   0       -0.50   0.80    -0.50   0       
+DEAL:Hierarchical:3d::P11      = -2.4e+02      gradient        0       3.0e+02 -8.0e+02                2nd     1.9     0       0       0       0       1.0     0       1.0     0       
+DEAL:Hierarchical:3d::P12      = 30.   gradient        -60.    1.5e+02 1.0e+02         2nd     0       -0.30   -0.20   -0.30   0       0.50    -0.20   0.50    0       
+DEAL:Hierarchical:3d::P13      = 30.   gradient        60.     1.5e+02 1.0e+02         2nd     0       0.30    0.20    0.30    0       0.50    0.20    0.50    0       
+DEAL:Hierarchical:3d::P14      = -60.  gradient        0       -3.0e+02        -2.0e+02                2nd     0.48    0       0       0       0       -1.0    0       -1.0    0       
+DEAL:Hierarchical:3d::P15      = -96.  gradient        1.9e+02 -3.6e+02        -3.2e+02                2nd     0       0.72    0.64    0.72    1.2     -1.2    0.64    -1.2    0       
+DEAL:Hierarchical:3d::P16      = -96.  gradient        -1.9e+02        -3.6e+02        -3.2e+02                2nd     0       -0.72   -0.64   -0.72   1.2     -1.2    -0.64   -1.2    0       
+DEAL:Hierarchical:3d::P17      = 1.9e+02       gradient        0       7.2e+02 6.4e+02         2nd     -1.5    0       0       0       -2.4    2.4     0       2.4     0       
+DEAL:Hierarchical:3d::P18      = -3.4e+02      gradient        6.7e+02 4.2e+02 -6.4e+02                2nd     0       -0.84   1.3     -0.84   0       0.80    1.3     0.80    3.2     
+DEAL:Hierarchical:3d::P19      = -3.4e+02      gradient        -6.7e+02        4.2e+02 -6.4e+02                2nd     0       0.84    -1.3    0.84    0       0.80    -1.3    0.80    3.2     
+DEAL:Hierarchical:3d::P20      = 6.7e+02       gradient        0       -8.4e+02        1.3e+03         2nd     -5.4    0       0       0       0       -1.6    0       -1.6    -6.4    
+DEAL:Hierarchical:3d::P21      = -84.  gradient        1.7e+02 -4.2e+02        -1.6e+02                2nd     0       0.84    0.32    0.84    0       -0.80   0.32    -0.80   0.80    
+DEAL:Hierarchical:3d::P22      = -84.  gradient        -1.7e+02        -4.2e+02        -1.6e+02                2nd     0       -0.84   -0.32   -0.84   0       -0.80   -0.32   -0.80   0.80    
+DEAL:Hierarchical:3d::P23      = 1.7e+02       gradient        0       8.4e+02 3.2e+02         2nd     -1.3    0       0       0       0       1.6     0       1.6     -1.6    
+DEAL:Hierarchical:3d::P24      = 2.7e+02       gradient        -5.4e+02        1.0e+03 5.1e+02         2nd     0       -2.0    -1.0    -2.0    -3.4    1.9     -1.0    1.9     -2.6    
+DEAL:Hierarchical:3d::P25      = 2.7e+02       gradient        5.4e+02 1.0e+03 5.1e+02         2nd     0       2.0     1.0     2.0     -3.4    1.9     1.0     1.9     -2.6    
+DEAL:Hierarchical:3d::P26      = -5.4e+02      gradient        0       -2.0e+03        -1.0e+03                2nd     4.3     0       0       0       6.7     -3.8    0       -3.8    5.1     
+DEAL:Hierarchical:3d::

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.