test results fixed

old code was wrong, new code is hopefully better

git-svn-id: https://svn.dealii.org/trunk@32168 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/integrators/assembler_simple_mgmatrix_04.cc b/tests/integrators/assembler_simple_mgmatrix_04.cc
index 6a13e32d4bf3d85b9791b14dba27db47ba209a8b..2ae2acb9dfccf9954292656345dd35668cb3fce7 100644 (file)
--- a/tests/integrators/assembler_simple_mgmatrix_04.cc
+++ b/tests/integrators/assembler_simple_mgmatrix_04.cc
@@ -201,11 +201,11 @@ int main()
   FE_RaviartThomas<2> rt1(1);
   FE_Q<2> q2(2);
 
-  FESystem<2> sys1(p0, 2, p1, 1);
-  FESystem<2> sys2(p0, 2, rt0, 1);
-  FESystem<2> sys3(rt0, 1, p0, 2);
-  FESystem<2> sys4(p1, 2, q2, 2);
-  FESystem<2> sys5(q2, 2, p1, 2);
+  // FESystem<2> sys1(p0, 2, p1, 1);
+  // FESystem<2> sys2(p0, 2, rt0, 1);
+  // FESystem<2> sys3(rt0, 1, p0, 2);
+  // FESystem<2> sys4(p1, 2, q2, 2);
+  // FESystem<2> sys5(q2, 2, p1, 2);
 
   test(rt0);
   test(rt1);

diff --git a/tests/integrators/assembler_simple_mgmatrix_04.output b/tests/integrators/assembler_simple_mgmatrix_04.output
index 802bc35e1631c18436081675a885419856046600..0c198c3427a9f5d0c4609feebe416cda5d0c4c96 100644 (file)
--- a/tests/integrators/assembler_simple_mgmatrix_04.output
+++ b/tests/integrators/assembler_simple_mgmatrix_04.output
@@ -16,13 +16,13 @@ DEAL::mg
 0.000000 0.000000 22.000000 8.000000 0.000000 -5.333333 -2.666667 0.000000 0.000000 0.000000 0.    0.    
 0.000000 0.000000 8.000000 36.000000 0.000000 -2.666667 -10.666667 0.000000 0.000000 8.000000 0.000000 -2.666667 
 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.    0.000000 0.    0.000000 0.000000 
-0.000000 0.000000 -5.333333 -2.666667 0.000000 11.333333 2.666667 0.    0.000000 0.    0.000000 0.000000 
-0.000000 0.000000 -2.666667 -10.666667 0.000000 2.666667 14.666667 0.000000 0.000000 -2.666667 0.000000 2.666667 
+0.000000 0.000000 -5.333333 -2.666667 0.000000 15.333333 4.666667 0.    0.000000 0.    0.000000 0.000000 
+0.000000 0.000000 -2.666667 -10.666667 0.000000 4.666667 22.666667 0.000000 0.000000 -2.666667 0.000000 4.666667 
 -0.333333 -0.166667 0.000000 0.000000 0.    0.    0.000000 7.000000 0.500000 0.000000 0.000000 0.000000 
 -0.166667 -0.666667 0.000000 0.000000 0.000000 0.000000 0.000000 0.500000 6.000000 0.000000 0.000000 0.000000 
 0.000000 0.000000 0.000000 8.000000 0.    0.    -2.666667 0.000000 0.000000 22.000000 0.000000 -5.333333 
 0.    0.000000 0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 
-0.    0.000000 0.    -2.666667 0.000000 0.000000 2.666667 0.000000 0.000000 -5.333333 0.000000 11.333333 
+0.    0.000000 0.    -2.666667 0.000000 0.000000 4.666667 0.000000 0.000000 -5.333333 0.000000 15.333333 
 DEAL::in
 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.    0.    
 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
@@ -106,14 +106,14 @@ DEAL::mg
 0.000000 0.000000 0.000000 0.000000 6.928203 -38.400000 6.928203 -50.400000 0.000000 -83.138439 0.000000 484.800000 0.000000 0.000000 6.928203 -9.600000 6.928203 -9.600000 0.000000 -83.138439 0.000000 115.200000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.    0.    0.    0.    0.    0.    0.    0.    
 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.000000 0.000000 0.000000 0.000000 -6.400000 -9.237604 1.600000 2.309401 0.000000 4.800000 0.000000 6.928203 0.000000 0.000000 22.400000 -9.237604 -1.600000 2.309401 0.000000 -4.800000 0.000000 6.928203 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.000000 0.000000 0.000000 0.000000 9.237604 12.800000 -2.309401 -3.200000 0.000000 -6.928203 0.000000 -9.600000 0.000000 0.000000 -9.237604 41.600000 2.309401 -6.400000 0.000000 6.928203 0.000000 -19.200000 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.000000 0.000000 0.000000 0.000000 1.600000 2.309401 -12.800000 -18.475209 0.000000 4.800000 0.000000 6.928203 0.000000 0.000000 -1.600000 2.309401 28.800000 -18.475209 0.000000 -16.800000 0.000000 6.928203 0.000000 0.000000 0.000000 0.000000 1.600000 2.309401 0.000000 4.800000 0.000000 6.928203 0.000000 0.000000 -1.600000 2.309401 0.000000 -16.800000 0.000000 6.928203 
-0.000000 0.000000 0.000000 0.000000 -2.309401 -3.200000 18.475209 25.600000 0.000000 -6.928203 0.000000 -9.600000 0.000000 0.000000 2.309401 -6.400000 -18.475209 67.200000 0.000000 6.928203 0.000000 -31.200000 0.000000 0.000000 0.000000 0.000000 -2.309401 -3.200000 0.000000 -6.928203 0.000000 -9.600000 0.000000 0.000000 2.309401 -6.400000 0.000000 6.928203 0.000000 -31.200000 
+0.000000 0.000000 0.000000 0.000000 -6.400000 -9.237604 1.600000 2.309401 0.000000 4.800000 0.000000 6.928203 0.000000 0.000000 27.200000 -2.771281 -2.800000 0.692820 0.000000 -8.400000 0.000000 2.078461 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.000000 0.000000 0.000000 0.000000 9.237604 12.800000 -2.309401 -3.200000 0.000000 -6.928203 0.000000 -9.600000 0.000000 0.000000 -2.771281 49.600000 0.692820 -8.400000 0.000000 2.078461 0.000000 -25.200000 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.000000 0.000000 0.000000 0.000000 1.600000 2.309401 -12.800000 -18.475209 0.000000 4.800000 0.000000 6.928203 0.000000 0.000000 -2.800000 0.692820 38.400000 -5.542563 0.000000 -20.400000 0.000000 2.078461 0.000000 0.000000 0.000000 0.000000 1.600000 2.309401 0.000000 4.800000 0.000000 6.928203 0.000000 0.000000 -2.800000 0.692820 0.000000 -20.400000 0.000000 2.078461 
+0.000000 0.000000 0.000000 0.000000 -2.309401 -3.200000 18.475209 25.600000 0.000000 -6.928203 0.000000 -9.600000 0.000000 0.000000 0.692820 -8.400000 -5.542563 83.200000 0.000000 2.078461 0.000000 -37.200000 0.000000 0.000000 0.000000 0.000000 -2.309401 -3.200000 0.000000 -6.928203 0.000000 -9.600000 0.000000 0.000000 0.692820 -8.400000 0.000000 2.078461 0.000000 -37.200000 
 0.000000 0.000000 -12.900000 0.433013 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 34.800000 0.000000 -5.196152 0.000000 0.    0.    0.300000 -0.433013 0.    0.    0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 -3.600000 0.000000 5.196152 0.000000 
-0.000000 0.000000 0.000000 0.000000 4.800000 6.928203 4.800000 6.928203 0.000000 -57.600000 0.000000 -83.138439 0.000000 0.000000 -4.800000 6.928203 -16.800000 6.928203 0.000000 81.600000 0.000000 -83.138439 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.000000 0.000000 0.000000 0.000000 4.800000 6.928203 4.800000 6.928203 0.000000 -57.600000 0.000000 -83.138439 0.000000 0.000000 -8.400000 2.078461 -20.400000 2.078461 0.000000 124.800000 0.000000 -24.941532 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
 0.000000 0.000000 0.433013 -14.400000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -5.196152 0.000000 52.800000 0.000000 0.    0.    0.433013 -0.600000 0.    0.    0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 -5.196152 0.000000 7.200000 0.000000 
-0.000000 0.000000 0.000000 0.000000 -6.928203 -9.600000 -6.928203 -9.600000 0.000000 83.138439 0.000000 115.200000 0.000000 0.000000 6.928203 -19.200000 6.928203 -31.200000 0.000000 -83.138439 0.000000 254.400000 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
+0.000000 0.000000 0.000000 0.000000 -6.928203 -9.600000 -6.928203 -9.600000 0.000000 83.138439 0.000000 115.200000 0.000000 0.000000 2.078461 -25.200000 2.078461 -37.200000 0.000000 -24.941532 0.000000 326.400000 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
 -0.400000 -0.577350 0.100000 0.144338 0.000000 0.000000 0.000000 0.000000 0.300000 0.000000 0.433013 0.000000 0.    0.    0.    0.    0.000000 0.000000 0.    0.    0.    0.    17.200000 0.577350 -0.300000 -0.144338 0.000000 0.000000 -0.900000 0.000000 -0.433013 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
 0.577350 0.800000 -0.144338 -0.200000 0.000000 0.000000 0.000000 0.000000 -0.433013 0.000000 -0.600000 0.000000 0.    0.    0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.577350 19.200000 -0.144338 -0.800000 0.000000 0.000000 -0.433013 0.000000 -2.400000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
 0.100000 0.144338 -0.800000 -1.154701 0.000000 0.000000 0.000000 0.000000 0.300000 0.000000 0.433013 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.300000 0.000000 0.433013 0.000000 -0.300000 -0.144338 18.400000 1.154701 0.000000 0.000000 -12.900000 0.000000 -0.433013 0.000000 0.000000 0.000000 0.000000 0.000000 -12.900000 0.000000 -0.433013 0.000000 
@@ -126,12 +126,12 @@ DEAL::mg
 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 6.928203 -50.400000 0.000000 0.000000 0.000000 0.000000 0.    0.    0.    0.    6.928203 -9.600000 0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 6.928203 -38.400000 0.000000 -83.138439 0.000000 484.800000 0.000000 0.000000 6.928203 -9.600000 0.000000 -83.138439 0.000000 115.200000 
 0.    0.    0.000000 0.000000 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
 0.    0.    0.000000 0.000000 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 
-0.    0.    0.000000 0.000000 0.    0.    1.600000 2.309401 0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 -1.600000 2.309401 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -6.400000 -9.237604 0.000000 4.800000 0.000000 6.928203 0.000000 0.000000 22.400000 -9.237604 0.000000 -4.800000 0.000000 6.928203 
-0.    0.    0.000000 0.000000 0.    0.    -2.309401 -3.200000 0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 2.309401 -6.400000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 9.237604 12.800000 0.000000 -6.928203 0.000000 -9.600000 0.000000 0.000000 -9.237604 41.600000 0.000000 6.928203 0.000000 -19.200000 
+0.    0.    0.000000 0.000000 0.    0.    1.600000 2.309401 0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 -2.800000 0.692820 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -6.400000 -9.237604 0.000000 4.800000 0.000000 6.928203 0.000000 0.000000 27.200000 -2.771281 0.000000 -8.400000 0.000000 2.078461 
+0.    0.    0.000000 0.000000 0.    0.    -2.309401 -3.200000 0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.692820 -8.400000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 9.237604 12.800000 0.000000 -6.928203 0.000000 -9.600000 0.000000 0.000000 -2.771281 49.600000 0.000000 2.078461 0.000000 -25.200000 
 0.    0.    0.300000 0.433013 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -3.600000 0.000000 -5.196152 0.000000 0.000000 0.000000 -12.900000 -0.433013 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 34.800000 0.000000 5.196152 0.000000 
-0.    0.    0.000000 0.000000 0.    0.    4.800000 6.928203 0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 -16.800000 6.928203 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 4.800000 6.928203 0.000000 -57.600000 0.000000 -83.138439 0.000000 0.000000 -4.800000 6.928203 0.000000 81.600000 0.000000 -83.138439 
+0.    0.    0.000000 0.000000 0.    0.    4.800000 6.928203 0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 -20.400000 2.078461 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 4.800000 6.928203 0.000000 -57.600000 0.000000 -83.138439 0.000000 0.000000 -8.400000 2.078461 0.000000 124.800000 0.000000 -24.941532 
 0.    0.    -0.433013 -0.600000 0.    0.    0.000000 0.000000 0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 5.196152 0.000000 7.200000 0.000000 0.000000 0.000000 -0.433013 -14.400000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 5.196152 0.000000 52.800000 0.000000 
-0.    0.    0.000000 0.000000 0.    0.    -6.928203 -9.600000 0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 6.928203 -31.200000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -6.928203 -9.600000 0.000000 83.138439 0.000000 115.200000 0.000000 0.000000 6.928203 -19.200000 0.000000 -83.138439 0.000000 254.400000 
+0.    0.    0.000000 0.000000 0.    0.    -6.928203 -9.600000 0.    0.    0.    0.    0.000000 0.000000 0.000000 0.000000 2.078461 -37.200000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -6.928203 -9.600000 0.000000 83.138439 0.000000 115.200000 0.000000 0.000000 2.078461 -25.200000 0.000000 -24.941532 0.000000 326.400000 
 DEAL::in
 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.    0.    0.    0.    0.    0.    0.    0.    
 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.    0.    0.    0.    0.    0.    0.    0.