From af85e37daaceadd11cfd9cdb27c9839ccf39109e Mon Sep 17 00:00:00 2001 From: David Wells Date: Fri, 16 Mar 2018 13:25:22 -0400 Subject: [PATCH] Update tests with new output. Since the default test matrix is rectangular, most FullMatrix tests now have different output. --- .../complex_complex_full_matrix_10.output | 20 +- .../complex_complex_full_matrix_14.cc | 5 +- .../complex_complex_full_matrix_14.output | 4 +- .../complex_complex_full_matrix_15.output | 4 +- .../complex_complex_full_matrix_16.output | 4 +- .../complex_complex_full_matrix_17.output | 4 +- .../complex_complex_full_matrix_21.output | 20 +- .../complex_complex_full_matrix_27.output | 12 +- .../complex_complex_full_matrix_28.output | 12 +- .../complex_complex_full_matrix_31.cc | 3 +- .../complex_complex_full_matrix_31.output | 30 +- .../complex_complex_full_matrix_32.cc | 3 +- .../complex_complex_full_matrix_32.output | 30 +- .../complex_complex_full_matrix_34.cc | 3 +- .../complex_complex_full_matrix_34.output | 50 +-- .../complex_complex_full_matrix_45.output | 44 +- .../complex_complex_full_matrix_46.cc | 5 +- .../complex_complex_full_matrix_46.output | 22 +- .../complex_complex_full_matrix_47.cc | 5 +- .../complex_complex_full_matrix_48.cc | 5 +- .../complex_complex_full_matrix_49.cc | 7 +- .../complex_complex_full_matrix_50.cc | 7 +- .../complex_complex_full_matrix_50.output | 22 +- .../complex_real_full_matrix_10.output | 20 +- .../complex_real_full_matrix_14.cc | 5 +- .../complex_real_full_matrix_14.output | 4 +- .../complex_real_full_matrix_15.output | 4 +- .../complex_real_full_matrix_16.output | 4 +- .../complex_real_full_matrix_17.output | 4 +- .../complex_real_full_matrix_21.output | 20 +- .../complex_real_full_matrix_27.output | 12 +- .../complex_real_full_matrix_28.output | 12 +- .../complex_real_full_matrix_31.cc | 3 +- .../complex_real_full_matrix_31.output | 30 +- .../complex_real_full_matrix_32.cc | 3 +- .../complex_real_full_matrix_32.output | 30 +- .../complex_real_full_matrix_34.cc | 3 +- .../complex_real_full_matrix_34.output | 50 +-- .../complex_real_full_matrix_45.cc | 5 +- .../complex_real_full_matrix_45.output | 44 +- .../complex_real_full_matrix_46.cc | 5 +- .../complex_real_full_matrix_46.output | 22 +- .../complex_real_full_matrix_50.cc | 7 +- .../complex_real_full_matrix_50.output | 22 +- .../complex_real_full_matrix_51.cc | 5 +- .../complex_real_full_matrix_51.output | 6 +- .../complex_real_full_matrix_52.cc | 7 +- .../complex_real_full_matrix_52.output | 34 +- tests/full_matrix/full_matrix_15.output | 4 +- tests/full_matrix/full_matrix_16.output | 4 +- tests/full_matrix/full_matrix_17.output | 4 +- tests/full_matrix/full_matrix_21.output | 20 +- tests/full_matrix/full_matrix_27.output | 388 +++++++++--------- tests/full_matrix/full_matrix_28.output | 388 +++++++++--------- tests/full_matrix/full_matrix_31.cc | 3 +- tests/full_matrix/full_matrix_31.output | 30 +- tests/full_matrix/full_matrix_32.cc | 3 +- tests/full_matrix/full_matrix_32.output | 30 +- tests/full_matrix/full_matrix_34.cc | 3 +- tests/full_matrix/full_matrix_34.output | 50 +-- tests/full_matrix/full_matrix_45.cc | 5 +- tests/full_matrix/full_matrix_45.output | 44 +- tests/full_matrix/full_matrix_46.cc | 5 +- tests/full_matrix/full_matrix_46.output | 22 +- tests/full_matrix/full_matrix_50.cc | 7 +- tests/full_matrix/full_matrix_50.output | 22 +- tests/full_matrix/full_matrix_67.output | 320 +++++++-------- 67 files changed, 947 insertions(+), 1087 deletions(-) diff --git a/tests/full_matrix/complex_complex_full_matrix_10.output b/tests/full_matrix/complex_complex_full_matrix_10.output index 184403999a..120987d49e 100644 --- a/tests/full_matrix/complex_complex_full_matrix_10.output +++ b/tests/full_matrix/complex_complex_full_matrix_10.output @@ -37,7 +37,7 @@ DEAL::3 4 (2.0,12.) DEAL::3 5 (3.0,15.) DEAL::3 6 (4.0,18.) DEAL::3 7 (5.0,21.) -DEAL::3 8 (6.0,24.) +DEAL::3 8 (0.0,0.0) DEAL::3 9 (0.0,0.0) DEAL::4 0 (0.0,0.0) DEAL::4 1 (0.0,0.0) @@ -47,7 +47,7 @@ DEAL::4 4 (4.0,16.) DEAL::4 5 (6.0,20.) DEAL::4 6 (8.0,24.) DEAL::4 7 (10.,28.) -DEAL::4 8 (12.,32.) +DEAL::4 8 (0.0,0.0) DEAL::4 9 (0.0,0.0) DEAL::5 0 (0.0,0.0) DEAL::5 1 (0.0,0.0) @@ -57,7 +57,7 @@ DEAL::5 4 (6.0,20.) DEAL::5 5 (9.0,25.) DEAL::5 6 (12.,30.) DEAL::5 7 (15.,35.) -DEAL::5 8 (18.,40.) +DEAL::5 8 (0.0,0.0) DEAL::5 9 (0.0,0.0) DEAL::6 0 (0.0,0.0) DEAL::6 1 (0.0,0.0) @@ -67,7 +67,7 @@ DEAL::6 4 (8.0,24.) DEAL::6 5 (12.,30.) DEAL::6 6 (16.,36.) DEAL::6 7 (20.,42.) -DEAL::6 8 (24.,48.) +DEAL::6 8 (0.0,0.0) DEAL::6 9 (0.0,0.0) DEAL::7 0 (0.0,0.0) DEAL::7 1 (0.0,0.0) @@ -77,7 +77,7 @@ DEAL::7 4 (10.,28.) DEAL::7 5 (15.,35.) DEAL::7 6 (20.,42.) DEAL::7 7 (25.,49.) -DEAL::7 8 (30.,56.) +DEAL::7 8 (0.0,0.0) DEAL::7 9 (0.0,0.0) DEAL::8 0 (0.0,0.0) DEAL::8 1 (0.0,0.0) @@ -137,7 +137,7 @@ DEAL::3 4 (2.0,12.) DEAL::3 5 (3.0,15.) DEAL::3 6 (4.0,18.) DEAL::3 7 (5.0,21.) -DEAL::3 8 (6.0,24.) +DEAL::3 8 (0.0,0.0) DEAL::3 9 (0.0,0.0) DEAL::4 0 (0.0,0.0) DEAL::4 1 (0.0,0.0) @@ -147,7 +147,7 @@ DEAL::4 4 (4.0,16.) DEAL::4 5 (6.0,20.) DEAL::4 6 (8.0,24.) DEAL::4 7 (10.,28.) -DEAL::4 8 (12.,32.) +DEAL::4 8 (0.0,0.0) DEAL::4 9 (0.0,0.0) DEAL::5 0 (0.0,0.0) DEAL::5 1 (0.0,0.0) @@ -157,7 +157,7 @@ DEAL::5 4 (6.0,20.) DEAL::5 5 (9.0,25.) DEAL::5 6 (12.,30.) DEAL::5 7 (15.,35.) -DEAL::5 8 (18.,40.) +DEAL::5 8 (0.0,0.0) DEAL::5 9 (0.0,0.0) DEAL::6 0 (0.0,0.0) DEAL::6 1 (0.0,0.0) @@ -167,7 +167,7 @@ DEAL::6 4 (8.0,24.) DEAL::6 5 (12.,30.) DEAL::6 6 (16.,36.) DEAL::6 7 (20.,42.) -DEAL::6 8 (24.,48.) +DEAL::6 8 (0.0,0.0) DEAL::6 9 (0.0,0.0) DEAL::7 0 (0.0,0.0) DEAL::7 1 (0.0,0.0) @@ -177,7 +177,7 @@ DEAL::7 4 (10.,28.) DEAL::7 5 (15.,35.) DEAL::7 6 (20.,42.) DEAL::7 7 (25.,49.) -DEAL::7 8 (30.,56.) +DEAL::7 8 (0.0,0.0) DEAL::7 9 (0.0,0.0) DEAL::8 0 (0.0,0.0) DEAL::8 1 (0.0,0.0) diff --git a/tests/full_matrix/complex_complex_full_matrix_14.cc b/tests/full_matrix/complex_complex_full_matrix_14.cc index c238bbaff2..3b6c576647 100644 --- a/tests/full_matrix/complex_complex_full_matrix_14.cc +++ b/tests/full_matrix/complex_complex_full_matrix_14.cc @@ -33,11 +33,10 @@ check () FullMatrix > m; make_complex_matrix (m); Vector > v,w; - make_complex_vector (v); - make_complex_vector (w); + make_complex_range_vector (v); + make_complex_domain_vector (w); for (unsigned int i=0; i(1.); deallog << m.matrix_scalar_product (v,w) << std::endl; } - diff --git a/tests/full_matrix/complex_complex_full_matrix_14.output b/tests/full_matrix/complex_complex_full_matrix_14.output index 4289f0caa7..72107b7875 100644 --- a/tests/full_matrix/complex_complex_full_matrix_14.output +++ b/tests/full_matrix/complex_complex_full_matrix_14.output @@ -1,3 +1,3 @@ -DEAL::(-3.6e+04,3.2e+03) -DEAL::(-3.6e+04,3.2e+03) +DEAL::(-2.3e+04,1.3e+03) +DEAL::(-2.3e+04,1.3e+03) diff --git a/tests/full_matrix/complex_complex_full_matrix_15.output b/tests/full_matrix/complex_complex_full_matrix_15.output index 37e590a8e0..666c175f22 100644 --- a/tests/full_matrix/complex_complex_full_matrix_15.output +++ b/tests/full_matrix/complex_complex_full_matrix_15.output @@ -1,3 +1,3 @@ -DEAL::2.2e+02 -DEAL::2.2e+02 +DEAL::1.9e+02 +DEAL::1.9e+02 diff --git a/tests/full_matrix/complex_complex_full_matrix_16.output b/tests/full_matrix/complex_complex_full_matrix_16.output index a70842070c..6e2a22e7b5 100644 --- a/tests/full_matrix/complex_complex_full_matrix_16.output +++ b/tests/full_matrix/complex_complex_full_matrix_16.output @@ -1,3 +1,3 @@ -DEAL::2.3e+02 -DEAL::2.3e+02 +DEAL::1.7e+02 +DEAL::1.7e+02 diff --git a/tests/full_matrix/complex_complex_full_matrix_17.output b/tests/full_matrix/complex_complex_full_matrix_17.output index 6e2a22e7b5..eac29a093d 100644 --- a/tests/full_matrix/complex_complex_full_matrix_17.output +++ b/tests/full_matrix/complex_complex_full_matrix_17.output @@ -1,3 +1,3 @@ -DEAL::1.7e+02 -DEAL::1.7e+02 +DEAL::1.4e+02 +DEAL::1.4e+02 diff --git a/tests/full_matrix/complex_complex_full_matrix_21.output b/tests/full_matrix/complex_complex_full_matrix_21.output index 16bdf08f56..a563d5b9f0 100644 --- a/tests/full_matrix/complex_complex_full_matrix_21.output +++ b/tests/full_matrix/complex_complex_full_matrix_21.output @@ -1,11 +1,11 @@ -(2.0,12.)(3.0,15.)(4.0,18.)(5.0,21.)(6.0,24.) -(4.0,16.)(6.0,20.)(8.0,24.)(10.,28.)(12.,32.) -(6.0,20.)(9.0,25.)(12.,30.)(15.,35.)(18.,40.) -(8.0,24.)(12.,30.)(16.,36.)(20.,42.)(24.,48.) -(10.,28.)(15.,35.)(20.,42.)(25.,49.)(30.,56.) -(2.0,12.)(3.0,15.)(4.0,18.)(5.0,21.)(6.0,24.) -(4.0,16.)(6.0,20.)(8.0,24.)(10.,28.)(12.,32.) -(6.0,20.)(9.0,25.)(12.,30.)(15.,35.)(18.,40.) -(8.0,24.)(12.,30.)(16.,36.)(20.,42.)(24.,48.) -(10.,28.)(15.,35.)(20.,42.)(25.,49.)(30.,56.) +(2.0,12.)(3.0,15.)(4.0,18.)(5.0,21.) +(4.0,16.)(6.0,20.)(8.0,24.)(10.,28.) +(6.0,20.)(9.0,25.)(12.,30.)(15.,35.) +(8.0,24.)(12.,30.)(16.,36.)(20.,42.) +(10.,28.)(15.,35.)(20.,42.)(25.,49.) +(2.0,12.)(3.0,15.)(4.0,18.)(5.0,21.) +(4.0,16.)(6.0,20.)(8.0,24.)(10.,28.) +(6.0,20.)(9.0,25.)(12.,30.)(15.,35.) +(8.0,24.)(12.,30.)(16.,36.)(20.,42.) +(10.,28.)(15.,35.)(20.,42.)(25.,49.) diff --git a/tests/full_matrix/complex_complex_full_matrix_27.output b/tests/full_matrix/complex_complex_full_matrix_27.output index af6eac0d0e..0607c30f74 100644 --- a/tests/full_matrix/complex_complex_full_matrix_27.output +++ b/tests/full_matrix/complex_complex_full_matrix_27.output @@ -34,7 +34,7 @@ DEAL::3 1 (0.0,0.0) DEAL::3 2 (0.0,0.0) DEAL::3 3 (0.0,0.0) DEAL::3 4 (30.,70.) -DEAL::3 5 (36.,80.) +DEAL::3 5 (0.0,0.0) DEAL::3 6 (0.0,0.0) DEAL::3 7 (0.0,0.0) DEAL::3 8 (0.0,0.0) @@ -44,7 +44,7 @@ DEAL::4 1 (0.0,0.0) DEAL::4 2 (0.0,0.0) DEAL::4 3 (0.0,0.0) DEAL::4 4 (40.,84.) -DEAL::4 5 (48.,96.) +DEAL::4 5 (0.0,0.0) DEAL::4 6 (0.0,0.0) DEAL::4 7 (0.0,0.0) DEAL::4 8 (0.0,0.0) @@ -54,7 +54,7 @@ DEAL::5 1 (0.0,0.0) DEAL::5 2 (0.0,0.0) DEAL::5 3 (0.0,0.0) DEAL::5 4 (50.,98.) -DEAL::5 5 (60.,1.1e+02) +DEAL::5 5 (0.0,0.0) DEAL::5 6 (0.0,0.0) DEAL::5 7 (0.0,0.0) DEAL::5 8 (0.0,0.0) @@ -134,7 +134,7 @@ DEAL::3 1 (0.0,0.0) DEAL::3 2 (0.0,0.0) DEAL::3 3 (0.0,0.0) DEAL::3 4 (30.,70.) -DEAL::3 5 (36.,80.) +DEAL::3 5 (0.0,0.0) DEAL::3 6 (0.0,0.0) DEAL::3 7 (0.0,0.0) DEAL::3 8 (0.0,0.0) @@ -144,7 +144,7 @@ DEAL::4 1 (0.0,0.0) DEAL::4 2 (0.0,0.0) DEAL::4 3 (0.0,0.0) DEAL::4 4 (40.,84.) -DEAL::4 5 (48.,96.) +DEAL::4 5 (0.0,0.0) DEAL::4 6 (0.0,0.0) DEAL::4 7 (0.0,0.0) DEAL::4 8 (0.0,0.0) @@ -154,7 +154,7 @@ DEAL::5 1 (0.0,0.0) DEAL::5 2 (0.0,0.0) DEAL::5 3 (0.0,0.0) DEAL::5 4 (50.,98.) -DEAL::5 5 (60.,1.1e+02) +DEAL::5 5 (0.0,0.0) DEAL::5 6 (0.0,0.0) DEAL::5 7 (0.0,0.0) DEAL::5 8 (0.0,0.0) diff --git a/tests/full_matrix/complex_complex_full_matrix_28.output b/tests/full_matrix/complex_complex_full_matrix_28.output index 83e9a512e8..1ac2452213 100644 --- a/tests/full_matrix/complex_complex_full_matrix_28.output +++ b/tests/full_matrix/complex_complex_full_matrix_28.output @@ -43,9 +43,9 @@ DEAL::4 0 (0.0,0.0) DEAL::4 1 (0.0,0.0) DEAL::4 2 (0.0,0.0) DEAL::4 3 (0.0,0.0) -DEAL::4 4 (36.,80.) -DEAL::4 5 (48.,96.) -DEAL::4 6 (60.,1.1e+02) +DEAL::4 4 (0.0,0.0) +DEAL::4 5 (0.0,0.0) +DEAL::4 6 (0.0,0.0) DEAL::4 7 (0.0,0.0) DEAL::4 8 (0.0,0.0) DEAL::4 9 (0.0,0.0) @@ -143,9 +143,9 @@ DEAL::4 0 (0.0,0.0) DEAL::4 1 (0.0,0.0) DEAL::4 2 (0.0,0.0) DEAL::4 3 (0.0,0.0) -DEAL::4 4 (36.,80.) -DEAL::4 5 (48.,96.) -DEAL::4 6 (60.,1.1e+02) +DEAL::4 4 (0.0,0.0) +DEAL::4 5 (0.0,0.0) +DEAL::4 6 (0.0,0.0) DEAL::4 7 (0.0,0.0) DEAL::4 8 (0.0,0.0) DEAL::4 9 (0.0,0.0) diff --git a/tests/full_matrix/complex_complex_full_matrix_31.cc b/tests/full_matrix/complex_complex_full_matrix_31.cc index d260ab9bd6..9159387f3a 100644 --- a/tests/full_matrix/complex_complex_full_matrix_31.cc +++ b/tests/full_matrix/complex_complex_full_matrix_31.cc @@ -32,7 +32,6 @@ check () { FullMatrix > m; make_complex_matrix (m); - m.add_col (2, 3.141, 4); + m.add_col (2, 3.141, 3); print_matrix (m); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_31.output b/tests/full_matrix/complex_complex_full_matrix_31.output index e631f5bbf9..2fc1bb7368 100644 --- a/tests/full_matrix/complex_complex_full_matrix_31.output +++ b/tests/full_matrix/complex_complex_full_matrix_31.output @@ -1,51 +1,41 @@ DEAL::0 0 (2.0,12.) DEAL::0 1 (3.0,15.) -DEAL::0 2 (23.,93.) +DEAL::0 2 (20.,84.) DEAL::0 3 (5.0,21.) -DEAL::0 4 (6.0,24.) DEAL::1 0 (4.0,16.) DEAL::1 1 (6.0,20.) -DEAL::1 2 (46.,1.2e+02) +DEAL::1 2 (39.,1.1e+02) DEAL::1 3 (10.,28.) -DEAL::1 4 (12.,32.) DEAL::2 0 (6.0,20.) DEAL::2 1 (9.0,25.) -DEAL::2 2 (69.,1.6e+02) +DEAL::2 2 (59.,1.4e+02) DEAL::2 3 (15.,35.) -DEAL::2 4 (18.,40.) DEAL::3 0 (8.0,24.) DEAL::3 1 (12.,30.) -DEAL::3 2 (91.,1.9e+02) +DEAL::3 2 (79.,1.7e+02) DEAL::3 3 (20.,42.) -DEAL::3 4 (24.,48.) DEAL::4 0 (10.,28.) DEAL::4 1 (15.,35.) -DEAL::4 2 (1.1e+02,2.2e+02) +DEAL::4 2 (99.,2.0e+02) DEAL::4 3 (25.,49.) -DEAL::4 4 (30.,56.) DEAL::0 0 (2.0,12.) DEAL::0 1 (3.0,15.) -DEAL::0 2 (23.,93.) +DEAL::0 2 (20.,84.) DEAL::0 3 (5.0,21.) -DEAL::0 4 (6.0,24.) DEAL::1 0 (4.0,16.) DEAL::1 1 (6.0,20.) -DEAL::1 2 (46.,1.2e+02) +DEAL::1 2 (39.,1.1e+02) DEAL::1 3 (10.,28.) -DEAL::1 4 (12.,32.) DEAL::2 0 (6.0,20.) DEAL::2 1 (9.0,25.) -DEAL::2 2 (69.,1.6e+02) +DEAL::2 2 (59.,1.4e+02) DEAL::2 3 (15.,35.) -DEAL::2 4 (18.,40.) DEAL::3 0 (8.0,24.) DEAL::3 1 (12.,30.) -DEAL::3 2 (91.,1.9e+02) +DEAL::3 2 (79.,1.7e+02) DEAL::3 3 (20.,42.) -DEAL::3 4 (24.,48.) DEAL::4 0 (10.,28.) DEAL::4 1 (15.,35.) -DEAL::4 2 (1.1e+02,2.2e+02) +DEAL::4 2 (99.,2.0e+02) DEAL::4 3 (25.,49.) -DEAL::4 4 (30.,56.) diff --git a/tests/full_matrix/complex_complex_full_matrix_32.cc b/tests/full_matrix/complex_complex_full_matrix_32.cc index 5979f9c045..3b83556035 100644 --- a/tests/full_matrix/complex_complex_full_matrix_32.cc +++ b/tests/full_matrix/complex_complex_full_matrix_32.cc @@ -32,7 +32,6 @@ check () { FullMatrix > m; make_complex_matrix (m); - m.add_col (2, 3.141, 4, 2.718, 3); + m.add_col (2, 3.141, 1, 2.718, 3); print_matrix (m); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_32.output b/tests/full_matrix/complex_complex_full_matrix_32.output index 3bb4ab8838..c811a419eb 100644 --- a/tests/full_matrix/complex_complex_full_matrix_32.output +++ b/tests/full_matrix/complex_complex_full_matrix_32.output @@ -1,51 +1,41 @@ DEAL::0 0 (2.0,12.) DEAL::0 1 (3.0,15.) -DEAL::0 2 (36.,1.5e+02) +DEAL::0 2 (27.,1.2e+02) DEAL::0 3 (5.0,21.) -DEAL::0 4 (6.0,24.) DEAL::1 0 (4.0,16.) DEAL::1 1 (6.0,20.) -DEAL::1 2 (73.,2.0e+02) +DEAL::1 2 (54.,1.6e+02) DEAL::1 3 (10.,28.) -DEAL::1 4 (12.,32.) DEAL::2 0 (6.0,20.) DEAL::2 1 (9.0,25.) -DEAL::2 2 (1.1e+02,2.5e+02) +DEAL::2 2 (81.,2.0e+02) DEAL::2 3 (15.,35.) -DEAL::2 4 (18.,40.) DEAL::3 0 (8.0,24.) DEAL::3 1 (12.,30.) -DEAL::3 2 (1.5e+02,3.0e+02) +DEAL::3 2 (1.1e+02,2.4e+02) DEAL::3 3 (20.,42.) -DEAL::3 4 (24.,48.) DEAL::4 0 (10.,28.) DEAL::4 1 (15.,35.) -DEAL::4 2 (1.8e+02,3.5e+02) +DEAL::4 2 (1.4e+02,2.9e+02) DEAL::4 3 (25.,49.) -DEAL::4 4 (30.,56.) DEAL::0 0 (2.0,12.) DEAL::0 1 (3.0,15.) -DEAL::0 2 (36.,1.5e+02) +DEAL::0 2 (27.,1.2e+02) DEAL::0 3 (5.0,21.) -DEAL::0 4 (6.0,24.) DEAL::1 0 (4.0,16.) DEAL::1 1 (6.0,20.) -DEAL::1 2 (73.,2.0e+02) +DEAL::1 2 (54.,1.6e+02) DEAL::1 3 (10.,28.) -DEAL::1 4 (12.,32.) DEAL::2 0 (6.0,20.) DEAL::2 1 (9.0,25.) -DEAL::2 2 (1.1e+02,2.5e+02) +DEAL::2 2 (81.,2.0e+02) DEAL::2 3 (15.,35.) -DEAL::2 4 (18.,40.) DEAL::3 0 (8.0,24.) DEAL::3 1 (12.,30.) -DEAL::3 2 (1.5e+02,3.0e+02) +DEAL::3 2 (1.1e+02,2.4e+02) DEAL::3 3 (20.,42.) -DEAL::3 4 (24.,48.) DEAL::4 0 (10.,28.) DEAL::4 1 (15.,35.) -DEAL::4 2 (1.8e+02,3.5e+02) +DEAL::4 2 (1.4e+02,2.9e+02) DEAL::4 3 (25.,49.) -DEAL::4 4 (30.,56.) diff --git a/tests/full_matrix/complex_complex_full_matrix_34.cc b/tests/full_matrix/complex_complex_full_matrix_34.cc index 2939357de5..54f46d1173 100644 --- a/tests/full_matrix/complex_complex_full_matrix_34.cc +++ b/tests/full_matrix/complex_complex_full_matrix_34.cc @@ -32,7 +32,6 @@ check () { FullMatrix > m; make_complex_matrix (m); - m.swap_col (2, 4); + m.swap_col (2, 3); print_matrix (m); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_34.output b/tests/full_matrix/complex_complex_full_matrix_34.output index 1ab9dfaa34..da67ae5c12 100644 --- a/tests/full_matrix/complex_complex_full_matrix_34.output +++ b/tests/full_matrix/complex_complex_full_matrix_34.output @@ -1,51 +1,41 @@ DEAL::0 0 (2.0,12.) DEAL::0 1 (3.0,15.) -DEAL::0 2 (6.0,24.) -DEAL::0 3 (5.0,21.) -DEAL::0 4 (4.0,18.) +DEAL::0 2 (5.0,21.) +DEAL::0 3 (4.0,18.) DEAL::1 0 (4.0,16.) DEAL::1 1 (6.0,20.) -DEAL::1 2 (12.,32.) -DEAL::1 3 (10.,28.) -DEAL::1 4 (8.0,24.) +DEAL::1 2 (10.,28.) +DEAL::1 3 (8.0,24.) DEAL::2 0 (6.0,20.) DEAL::2 1 (9.0,25.) -DEAL::2 2 (18.,40.) -DEAL::2 3 (15.,35.) -DEAL::2 4 (12.,30.) +DEAL::2 2 (15.,35.) +DEAL::2 3 (12.,30.) DEAL::3 0 (8.0,24.) DEAL::3 1 (12.,30.) -DEAL::3 2 (24.,48.) -DEAL::3 3 (20.,42.) -DEAL::3 4 (16.,36.) +DEAL::3 2 (20.,42.) +DEAL::3 3 (16.,36.) DEAL::4 0 (10.,28.) DEAL::4 1 (15.,35.) -DEAL::4 2 (30.,56.) -DEAL::4 3 (25.,49.) -DEAL::4 4 (20.,42.) +DEAL::4 2 (25.,49.) +DEAL::4 3 (20.,42.) DEAL::0 0 (2.0,12.) DEAL::0 1 (3.0,15.) -DEAL::0 2 (6.0,24.) -DEAL::0 3 (5.0,21.) -DEAL::0 4 (4.0,18.) +DEAL::0 2 (5.0,21.) +DEAL::0 3 (4.0,18.) DEAL::1 0 (4.0,16.) DEAL::1 1 (6.0,20.) -DEAL::1 2 (12.,32.) -DEAL::1 3 (10.,28.) -DEAL::1 4 (8.0,24.) +DEAL::1 2 (10.,28.) +DEAL::1 3 (8.0,24.) DEAL::2 0 (6.0,20.) DEAL::2 1 (9.0,25.) -DEAL::2 2 (18.,40.) -DEAL::2 3 (15.,35.) -DEAL::2 4 (12.,30.) +DEAL::2 2 (15.,35.) +DEAL::2 3 (12.,30.) DEAL::3 0 (8.0,24.) DEAL::3 1 (12.,30.) -DEAL::3 2 (24.,48.) -DEAL::3 3 (20.,42.) -DEAL::3 4 (16.,36.) +DEAL::3 2 (20.,42.) +DEAL::3 3 (16.,36.) DEAL::4 0 (10.,28.) DEAL::4 1 (15.,35.) -DEAL::4 2 (30.,56.) -DEAL::4 3 (25.,49.) -DEAL::4 4 (20.,42.) +DEAL::4 2 (25.,49.) +DEAL::4 3 (20.,42.) diff --git a/tests/full_matrix/complex_complex_full_matrix_45.output b/tests/full_matrix/complex_complex_full_matrix_45.output index b80b7e6cab..c71f1f89c7 100644 --- a/tests/full_matrix/complex_complex_full_matrix_45.output +++ b/tests/full_matrix/complex_complex_full_matrix_45.output @@ -1,41 +1,37 @@ -DEAL::0 (-4.1e+02,4.1e+02) -DEAL::1 (-5.0e+02,6.2e+02) -DEAL::2 (-5.9e+02,8.4e+02) -DEAL::3 (-6.8e+02,1.0e+03) -DEAL::4 (-7.6e+02,1.3e+03) +DEAL::0 (-2.7e+02,2.5e+02) +DEAL::1 (-3.3e+02,3.8e+02) +DEAL::2 (-4.0e+02,5.1e+02) +DEAL::3 (-4.6e+02,6.4e+02) +DEAL::4 (-5.2e+02,7.7e+02) DEAL::0 (1.0,3.0) DEAL::1 (2.0,4.0) DEAL::2 (3.0,5.0) DEAL::3 (4.0,6.0) -DEAL::4 (5.0,7.0) -DEAL::0 (-4.1e+02,4.1e+02) -DEAL::1 (-5.0e+02,6.2e+02) -DEAL::2 (-5.9e+02,8.3e+02) -DEAL::3 (-6.8e+02,1.0e+03) -DEAL::4 (-7.7e+02,1.2e+03) +DEAL::0 (-2.7e+02,2.5e+02) +DEAL::1 (-3.4e+02,3.8e+02) +DEAL::2 (-4.0e+02,5.0e+02) +DEAL::3 (-4.6e+02,6.3e+02) +DEAL::4 (-5.3e+02,7.6e+02) DEAL::0 (1.0,3.0) DEAL::1 (2.0,4.0) DEAL::2 (3.0,5.0) DEAL::3 (4.0,6.0) -DEAL::4 (5.0,7.0) -DEAL::0 (-4.1e+02,4.1e+02) -DEAL::1 (-5.0e+02,6.2e+02) -DEAL::2 (-5.9e+02,8.4e+02) -DEAL::3 (-6.8e+02,1.0e+03) -DEAL::4 (-7.6e+02,1.3e+03) +DEAL::0 (-2.7e+02,2.5e+02) +DEAL::1 (-3.3e+02,3.8e+02) +DEAL::2 (-4.0e+02,5.1e+02) +DEAL::3 (-4.6e+02,6.4e+02) +DEAL::4 (-5.2e+02,7.7e+02) DEAL::0 (1.0,3.0) DEAL::1 (2.0,4.0) DEAL::2 (3.0,5.0) DEAL::3 (4.0,6.0) -DEAL::4 (5.0,7.0) -DEAL::0 (-4.1e+02,4.1e+02) -DEAL::1 (-5.0e+02,6.2e+02) -DEAL::2 (-5.9e+02,8.3e+02) -DEAL::3 (-6.8e+02,1.0e+03) -DEAL::4 (-7.7e+02,1.2e+03) +DEAL::0 (-2.7e+02,2.5e+02) +DEAL::1 (-3.4e+02,3.8e+02) +DEAL::2 (-4.0e+02,5.0e+02) +DEAL::3 (-4.6e+02,6.3e+02) +DEAL::4 (-5.3e+02,7.6e+02) DEAL::0 (1.0,3.0) DEAL::1 (2.0,4.0) DEAL::2 (3.0,5.0) DEAL::3 (4.0,6.0) -DEAL::4 (5.0,7.0) diff --git a/tests/full_matrix/complex_complex_full_matrix_46.cc b/tests/full_matrix/complex_complex_full_matrix_46.cc index 0e037cd08e..4628fcb83b 100644 --- a/tests/full_matrix/complex_complex_full_matrix_46.cc +++ b/tests/full_matrix/complex_complex_full_matrix_46.cc @@ -33,11 +33,10 @@ check () FullMatrix > m; make_complex_matrix (m); Vector > v, w; - make_complex_vector (v); - make_complex_vector (w); + make_complex_range_vector (v); + make_complex_domain_vector (w); m.vmult_add (v, w); print_vector (v); print_vector (w); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_46.output b/tests/full_matrix/complex_complex_full_matrix_46.output index 7dc66d43f4..9a8aaa9c65 100644 --- a/tests/full_matrix/complex_complex_full_matrix_46.output +++ b/tests/full_matrix/complex_complex_full_matrix_46.output @@ -1,21 +1,19 @@ -DEAL::0 (-4.1e+02,4.1e+02) -DEAL::1 (-5.0e+02,6.2e+02) -DEAL::2 (-5.9e+02,8.4e+02) -DEAL::3 (-6.8e+02,1.0e+03) -DEAL::4 (-7.6e+02,1.3e+03) +DEAL::0 (-2.7e+02,2.5e+02) +DEAL::1 (-3.3e+02,3.8e+02) +DEAL::2 (-4.0e+02,5.1e+02) +DEAL::3 (-4.6e+02,6.4e+02) +DEAL::4 (-5.2e+02,7.7e+02) DEAL::0 (1.0,3.0) DEAL::1 (2.0,4.0) DEAL::2 (3.0,5.0) DEAL::3 (4.0,6.0) -DEAL::4 (5.0,7.0) -DEAL::0 (-4.1e+02,4.1e+02) -DEAL::1 (-5.0e+02,6.2e+02) -DEAL::2 (-5.9e+02,8.4e+02) -DEAL::3 (-6.8e+02,1.0e+03) -DEAL::4 (-7.6e+02,1.3e+03) +DEAL::0 (-2.7e+02,2.5e+02) +DEAL::1 (-3.3e+02,3.8e+02) +DEAL::2 (-4.0e+02,5.1e+02) +DEAL::3 (-4.6e+02,6.4e+02) +DEAL::4 (-5.2e+02,7.7e+02) DEAL::0 (1.0,3.0) DEAL::1 (2.0,4.0) DEAL::2 (3.0,5.0) DEAL::3 (4.0,6.0) -DEAL::4 (5.0,7.0) diff --git a/tests/full_matrix/complex_complex_full_matrix_47.cc b/tests/full_matrix/complex_complex_full_matrix_47.cc index 1f6a8836f4..be5237e7a6 100644 --- a/tests/full_matrix/complex_complex_full_matrix_47.cc +++ b/tests/full_matrix/complex_complex_full_matrix_47.cc @@ -33,8 +33,8 @@ check () FullMatrix > m; make_complex_matrix (m); Vector > v, w; - make_complex_vector (v); - make_complex_vector (w); + make_complex_domain_vector (v); + make_complex_range_vector (w); m.Tvmult (v, w, true); print_vector (v); @@ -44,4 +44,3 @@ check () print_vector (v); print_vector (w); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_48.cc b/tests/full_matrix/complex_complex_full_matrix_48.cc index eb519d7ddd..8b7894a8c8 100644 --- a/tests/full_matrix/complex_complex_full_matrix_48.cc +++ b/tests/full_matrix/complex_complex_full_matrix_48.cc @@ -33,11 +33,10 @@ check () FullMatrix > m; make_complex_matrix (m); Vector > v, w; - make_complex_vector (v); - make_complex_vector (w); + make_complex_domain_vector (v); + make_complex_range_vector (w); m.Tvmult_add (v, w); print_vector (v); print_vector (w); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_49.cc b/tests/full_matrix/complex_complex_full_matrix_49.cc index 53b59da5e5..5f1837ef42 100644 --- a/tests/full_matrix/complex_complex_full_matrix_49.cc +++ b/tests/full_matrix/complex_complex_full_matrix_49.cc @@ -31,13 +31,12 @@ void check () { FullMatrix > m; - make_complex_matrix (m); + make_complex_square_matrix (m); Vector > v, w; - make_complex_vector (v); - make_complex_vector (w); + make_complex_range_vector (v); + make_complex_range_vector (w); m.precondition_Jacobi (v, w, 3.141); print_vector (v); print_vector (w); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_50.cc b/tests/full_matrix/complex_complex_full_matrix_50.cc index b686a84999..0a2891190d 100644 --- a/tests/full_matrix/complex_complex_full_matrix_50.cc +++ b/tests/full_matrix/complex_complex_full_matrix_50.cc @@ -33,13 +33,12 @@ check () FullMatrix > m; make_complex_matrix (m); Vector > v, w, x; - make_complex_vector (v); - make_complex_vector (w); - make_complex_vector (x); + make_complex_range_vector (v); + make_complex_domain_vector (w); + make_complex_range_vector (x); m.residual (v, w, x); print_vector (v); print_vector (w); print_vector (x); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_50.output b/tests/full_matrix/complex_complex_full_matrix_50.output index c219d84978..2ce5e94334 100644 --- a/tests/full_matrix/complex_complex_full_matrix_50.output +++ b/tests/full_matrix/complex_complex_full_matrix_50.output @@ -1,29 +1,27 @@ -DEAL::0 (4.1e+02,-4.1e+02) -DEAL::1 (5.0e+02,-6.2e+02) -DEAL::2 (5.9e+02,-8.2e+02) -DEAL::3 (6.8e+02,-1.0e+03) -DEAL::4 (7.8e+02,-1.2e+03) +DEAL::0 (2.7e+02,-2.4e+02) +DEAL::1 (3.4e+02,-3.7e+02) +DEAL::2 (4.0e+02,-5.0e+02) +DEAL::3 (4.7e+02,-6.3e+02) +DEAL::4 (5.3e+02,-7.5e+02) DEAL::0 (1.0,3.0) DEAL::1 (2.0,4.0) DEAL::2 (3.0,5.0) DEAL::3 (4.0,6.0) -DEAL::4 (5.0,7.0) DEAL::0 (1.0,3.0) DEAL::1 (2.0,4.0) DEAL::2 (3.0,5.0) DEAL::3 (4.0,6.0) DEAL::4 (5.0,7.0) -DEAL::0 (4.1e+02,-4.1e+02) -DEAL::1 (5.0e+02,-6.2e+02) -DEAL::2 (5.9e+02,-8.2e+02) -DEAL::3 (6.8e+02,-1.0e+03) -DEAL::4 (7.8e+02,-1.2e+03) +DEAL::0 (2.7e+02,-2.4e+02) +DEAL::1 (3.4e+02,-3.7e+02) +DEAL::2 (4.0e+02,-5.0e+02) +DEAL::3 (4.7e+02,-6.3e+02) +DEAL::4 (5.3e+02,-7.5e+02) DEAL::0 (1.0,3.0) DEAL::1 (2.0,4.0) DEAL::2 (3.0,5.0) DEAL::3 (4.0,6.0) -DEAL::4 (5.0,7.0) DEAL::0 (1.0,3.0) DEAL::1 (2.0,4.0) DEAL::2 (3.0,5.0) diff --git a/tests/full_matrix/complex_real_full_matrix_10.output b/tests/full_matrix/complex_real_full_matrix_10.output index ec8fa95379..9a10c4707c 100644 --- a/tests/full_matrix/complex_real_full_matrix_10.output +++ b/tests/full_matrix/complex_real_full_matrix_10.output @@ -37,7 +37,7 @@ DEAL::3 4 (2.0,0.0) DEAL::3 5 (3.0,0.0) DEAL::3 6 (4.0,0.0) DEAL::3 7 (5.0,0.0) -DEAL::3 8 (6.0,0.0) +DEAL::3 8 (0.0,0.0) DEAL::3 9 (0.0,0.0) DEAL::4 0 (0.0,0.0) DEAL::4 1 (0.0,0.0) @@ -47,7 +47,7 @@ DEAL::4 4 (4.0,0.0) DEAL::4 5 (6.0,0.0) DEAL::4 6 (8.0,0.0) DEAL::4 7 (10.,0.0) -DEAL::4 8 (12.,0.0) +DEAL::4 8 (0.0,0.0) DEAL::4 9 (0.0,0.0) DEAL::5 0 (0.0,0.0) DEAL::5 1 (0.0,0.0) @@ -57,7 +57,7 @@ DEAL::5 4 (6.0,0.0) DEAL::5 5 (9.0,0.0) DEAL::5 6 (12.,0.0) DEAL::5 7 (15.,0.0) -DEAL::5 8 (18.,0.0) +DEAL::5 8 (0.0,0.0) DEAL::5 9 (0.0,0.0) DEAL::6 0 (0.0,0.0) DEAL::6 1 (0.0,0.0) @@ -67,7 +67,7 @@ DEAL::6 4 (8.0,0.0) DEAL::6 5 (12.,0.0) DEAL::6 6 (16.,0.0) DEAL::6 7 (20.,0.0) -DEAL::6 8 (24.,0.0) +DEAL::6 8 (0.0,0.0) DEAL::6 9 (0.0,0.0) DEAL::7 0 (0.0,0.0) DEAL::7 1 (0.0,0.0) @@ -77,7 +77,7 @@ DEAL::7 4 (10.,0.0) DEAL::7 5 (15.,0.0) DEAL::7 6 (20.,0.0) DEAL::7 7 (25.,0.0) -DEAL::7 8 (30.,0.0) +DEAL::7 8 (0.0,0.0) DEAL::7 9 (0.0,0.0) DEAL::8 0 (0.0,0.0) DEAL::8 1 (0.0,0.0) @@ -137,7 +137,7 @@ DEAL::3 4 (2.0,0.0) DEAL::3 5 (3.0,0.0) DEAL::3 6 (4.0,0.0) DEAL::3 7 (5.0,0.0) -DEAL::3 8 (6.0,0.0) +DEAL::3 8 (0.0,0.0) DEAL::3 9 (0.0,0.0) DEAL::4 0 (0.0,0.0) DEAL::4 1 (0.0,0.0) @@ -147,7 +147,7 @@ DEAL::4 4 (4.0,0.0) DEAL::4 5 (6.0,0.0) DEAL::4 6 (8.0,0.0) DEAL::4 7 (10.,0.0) -DEAL::4 8 (12.,0.0) +DEAL::4 8 (0.0,0.0) DEAL::4 9 (0.0,0.0) DEAL::5 0 (0.0,0.0) DEAL::5 1 (0.0,0.0) @@ -157,7 +157,7 @@ DEAL::5 4 (6.0,0.0) DEAL::5 5 (9.0,0.0) DEAL::5 6 (12.,0.0) DEAL::5 7 (15.,0.0) -DEAL::5 8 (18.,0.0) +DEAL::5 8 (0.0,0.0) DEAL::5 9 (0.0,0.0) DEAL::6 0 (0.0,0.0) DEAL::6 1 (0.0,0.0) @@ -167,7 +167,7 @@ DEAL::6 4 (8.0,0.0) DEAL::6 5 (12.,0.0) DEAL::6 6 (16.,0.0) DEAL::6 7 (20.,0.0) -DEAL::6 8 (24.,0.0) +DEAL::6 8 (0.0,0.0) DEAL::6 9 (0.0,0.0) DEAL::7 0 (0.0,0.0) DEAL::7 1 (0.0,0.0) @@ -177,7 +177,7 @@ DEAL::7 4 (10.,0.0) DEAL::7 5 (15.,0.0) DEAL::7 6 (20.,0.0) DEAL::7 7 (25.,0.0) -DEAL::7 8 (30.,0.0) +DEAL::7 8 (0.0,0.0) DEAL::7 9 (0.0,0.0) DEAL::8 0 (0.0,0.0) DEAL::8 1 (0.0,0.0) diff --git a/tests/full_matrix/complex_real_full_matrix_14.cc b/tests/full_matrix/complex_real_full_matrix_14.cc index c0326ec221..d48813c6d9 100644 --- a/tests/full_matrix/complex_real_full_matrix_14.cc +++ b/tests/full_matrix/complex_real_full_matrix_14.cc @@ -33,11 +33,10 @@ check () FullMatrix > m; make_matrix (m); Vector > v,w; - make_vector (v); - make_vector (w); + make_range_vector (v); + make_domain_vector (w); for (unsigned int i=0; i(1.); deallog << m.matrix_scalar_product (v,w) << std::endl; } - diff --git a/tests/full_matrix/complex_real_full_matrix_14.output b/tests/full_matrix/complex_real_full_matrix_14.output index ba1c954bdb..35b2f9c274 100644 --- a/tests/full_matrix/complex_real_full_matrix_14.output +++ b/tests/full_matrix/complex_real_full_matrix_14.output @@ -1,3 +1,3 @@ -DEAL::(5.0e+03,0.0) -DEAL::(5.0e+03,0.0) +DEAL::(3.0e+03,0.0) +DEAL::(3.0e+03,0.0) diff --git a/tests/full_matrix/complex_real_full_matrix_15.output b/tests/full_matrix/complex_real_full_matrix_15.output index 5219ffb481..a4401c35d8 100644 --- a/tests/full_matrix/complex_real_full_matrix_15.output +++ b/tests/full_matrix/complex_real_full_matrix_15.output @@ -1,3 +1,3 @@ -DEAL::90. -DEAL::90. +DEAL::75. +DEAL::75. diff --git a/tests/full_matrix/complex_real_full_matrix_16.output b/tests/full_matrix/complex_real_full_matrix_16.output index bf7e83ec97..d106e772eb 100644 --- a/tests/full_matrix/complex_real_full_matrix_16.output +++ b/tests/full_matrix/complex_real_full_matrix_16.output @@ -1,3 +1,3 @@ -DEAL::1.0e+02 -DEAL::1.0e+02 +DEAL::70. +DEAL::70. diff --git a/tests/full_matrix/complex_real_full_matrix_17.output b/tests/full_matrix/complex_real_full_matrix_17.output index d106e772eb..cf6890bc1c 100644 --- a/tests/full_matrix/complex_real_full_matrix_17.output +++ b/tests/full_matrix/complex_real_full_matrix_17.output @@ -1,3 +1,3 @@ -DEAL::70. -DEAL::70. +DEAL::54. +DEAL::54. diff --git a/tests/full_matrix/complex_real_full_matrix_21.output b/tests/full_matrix/complex_real_full_matrix_21.output index 8c4940c9ea..edc836d000 100644 --- a/tests/full_matrix/complex_real_full_matrix_21.output +++ b/tests/full_matrix/complex_real_full_matrix_21.output @@ -1,11 +1,11 @@ -(2.0,0.0)(3.0,0.0)(4.0,0.0)(5.0,0.0)(6.0,0.0) -(4.0,0.0)(6.0,0.0)(8.0,0.0)(10.,0.0)(12.,0.0) -(6.0,0.0)(9.0,0.0)(12.,0.0)(15.,0.0)(18.,0.0) -(8.0,0.0)(12.,0.0)(16.,0.0)(20.,0.0)(24.,0.0) -(10.,0.0)(15.,0.0)(20.,0.0)(25.,0.0)(30.,0.0) -(2.0,0.0)(3.0,0.0)(4.0,0.0)(5.0,0.0)(6.0,0.0) -(4.0,0.0)(6.0,0.0)(8.0,0.0)(10.,0.0)(12.,0.0) -(6.0,0.0)(9.0,0.0)(12.,0.0)(15.,0.0)(18.,0.0) -(8.0,0.0)(12.,0.0)(16.,0.0)(20.,0.0)(24.,0.0) -(10.,0.0)(15.,0.0)(20.,0.0)(25.,0.0)(30.,0.0) +(2.0,0.0)(3.0,0.0)(4.0,0.0)(5.0,0.0) +(4.0,0.0)(6.0,0.0)(8.0,0.0)(10.,0.0) +(6.0,0.0)(9.0,0.0)(12.,0.0)(15.,0.0) +(8.0,0.0)(12.,0.0)(16.,0.0)(20.,0.0) +(10.,0.0)(15.,0.0)(20.,0.0)(25.,0.0) +(2.0,0.0)(3.0,0.0)(4.0,0.0)(5.0,0.0) +(4.0,0.0)(6.0,0.0)(8.0,0.0)(10.,0.0) +(6.0,0.0)(9.0,0.0)(12.,0.0)(15.,0.0) +(8.0,0.0)(12.,0.0)(16.,0.0)(20.,0.0) +(10.,0.0)(15.,0.0)(20.,0.0)(25.,0.0) diff --git a/tests/full_matrix/complex_real_full_matrix_27.output b/tests/full_matrix/complex_real_full_matrix_27.output index af1e79ecf0..7420ccbedb 100644 --- a/tests/full_matrix/complex_real_full_matrix_27.output +++ b/tests/full_matrix/complex_real_full_matrix_27.output @@ -34,7 +34,7 @@ DEAL::3 1 (0.0,0.0) DEAL::3 2 (0.0,0.0) DEAL::3 3 (0.0,0.0) DEAL::3 4 (30.,0.0) -DEAL::3 5 (36.,0.0) +DEAL::3 5 (0.0,0.0) DEAL::3 6 (0.0,0.0) DEAL::3 7 (0.0,0.0) DEAL::3 8 (0.0,0.0) @@ -44,7 +44,7 @@ DEAL::4 1 (0.0,0.0) DEAL::4 2 (0.0,0.0) DEAL::4 3 (0.0,0.0) DEAL::4 4 (40.,0.0) -DEAL::4 5 (48.,0.0) +DEAL::4 5 (0.0,0.0) DEAL::4 6 (0.0,0.0) DEAL::4 7 (0.0,0.0) DEAL::4 8 (0.0,0.0) @@ -54,7 +54,7 @@ DEAL::5 1 (0.0,0.0) DEAL::5 2 (0.0,0.0) DEAL::5 3 (0.0,0.0) DEAL::5 4 (50.,0.0) -DEAL::5 5 (60.,0.0) +DEAL::5 5 (0.0,0.0) DEAL::5 6 (0.0,0.0) DEAL::5 7 (0.0,0.0) DEAL::5 8 (0.0,0.0) @@ -134,7 +134,7 @@ DEAL::3 1 (0.0,0.0) DEAL::3 2 (0.0,0.0) DEAL::3 3 (0.0,0.0) DEAL::3 4 (30.,0.0) -DEAL::3 5 (36.,0.0) +DEAL::3 5 (0.0,0.0) DEAL::3 6 (0.0,0.0) DEAL::3 7 (0.0,0.0) DEAL::3 8 (0.0,0.0) @@ -144,7 +144,7 @@ DEAL::4 1 (0.0,0.0) DEAL::4 2 (0.0,0.0) DEAL::4 3 (0.0,0.0) DEAL::4 4 (40.,0.0) -DEAL::4 5 (48.,0.0) +DEAL::4 5 (0.0,0.0) DEAL::4 6 (0.0,0.0) DEAL::4 7 (0.0,0.0) DEAL::4 8 (0.0,0.0) @@ -154,7 +154,7 @@ DEAL::5 1 (0.0,0.0) DEAL::5 2 (0.0,0.0) DEAL::5 3 (0.0,0.0) DEAL::5 4 (50.,0.0) -DEAL::5 5 (60.,0.0) +DEAL::5 5 (0.0,0.0) DEAL::5 6 (0.0,0.0) DEAL::5 7 (0.0,0.0) DEAL::5 8 (0.0,0.0) diff --git a/tests/full_matrix/complex_real_full_matrix_28.output b/tests/full_matrix/complex_real_full_matrix_28.output index c9644245ad..5ad54b89eb 100644 --- a/tests/full_matrix/complex_real_full_matrix_28.output +++ b/tests/full_matrix/complex_real_full_matrix_28.output @@ -43,9 +43,9 @@ DEAL::4 0 (0.0,0.0) DEAL::4 1 (0.0,0.0) DEAL::4 2 (0.0,0.0) DEAL::4 3 (0.0,0.0) -DEAL::4 4 (36.,0.0) -DEAL::4 5 (48.,0.0) -DEAL::4 6 (60.,0.0) +DEAL::4 4 (0.0,0.0) +DEAL::4 5 (0.0,0.0) +DEAL::4 6 (0.0,0.0) DEAL::4 7 (0.0,0.0) DEAL::4 8 (0.0,0.0) DEAL::4 9 (0.0,0.0) @@ -143,9 +143,9 @@ DEAL::4 0 (0.0,0.0) DEAL::4 1 (0.0,0.0) DEAL::4 2 (0.0,0.0) DEAL::4 3 (0.0,0.0) -DEAL::4 4 (36.,0.0) -DEAL::4 5 (48.,0.0) -DEAL::4 6 (60.,0.0) +DEAL::4 4 (0.0,0.0) +DEAL::4 5 (0.0,0.0) +DEAL::4 6 (0.0,0.0) DEAL::4 7 (0.0,0.0) DEAL::4 8 (0.0,0.0) DEAL::4 9 (0.0,0.0) diff --git a/tests/full_matrix/complex_real_full_matrix_31.cc b/tests/full_matrix/complex_real_full_matrix_31.cc index 8a878a6ad9..7c0ab1c11a 100644 --- a/tests/full_matrix/complex_real_full_matrix_31.cc +++ b/tests/full_matrix/complex_real_full_matrix_31.cc @@ -32,7 +32,6 @@ check () { FullMatrix > m; make_matrix (m); - m.add_col (2, 3.141, 4); + m.add_col (2, 3.141, 3); print_matrix (m); } - diff --git a/tests/full_matrix/complex_real_full_matrix_31.output b/tests/full_matrix/complex_real_full_matrix_31.output index cace4be3b9..363b508928 100644 --- a/tests/full_matrix/complex_real_full_matrix_31.output +++ b/tests/full_matrix/complex_real_full_matrix_31.output @@ -1,51 +1,41 @@ DEAL::0 0 (2.0,0.0) DEAL::0 1 (3.0,0.0) -DEAL::0 2 (23.,0.0) +DEAL::0 2 (20.,0.0) DEAL::0 3 (5.0,0.0) -DEAL::0 4 (6.0,0.0) DEAL::1 0 (4.0,0.0) DEAL::1 1 (6.0,0.0) -DEAL::1 2 (46.,0.0) +DEAL::1 2 (39.,0.0) DEAL::1 3 (10.,0.0) -DEAL::1 4 (12.,0.0) DEAL::2 0 (6.0,0.0) DEAL::2 1 (9.0,0.0) -DEAL::2 2 (69.,0.0) +DEAL::2 2 (59.,0.0) DEAL::2 3 (15.,0.0) -DEAL::2 4 (18.,0.0) DEAL::3 0 (8.0,0.0) DEAL::3 1 (12.,0.0) -DEAL::3 2 (91.,0.0) +DEAL::3 2 (79.,0.0) DEAL::3 3 (20.,0.0) -DEAL::3 4 (24.,0.0) DEAL::4 0 (10.,0.0) DEAL::4 1 (15.,0.0) -DEAL::4 2 (1.1e+02,0.0) +DEAL::4 2 (99.,0.0) DEAL::4 3 (25.,0.0) -DEAL::4 4 (30.,0.0) DEAL::0 0 (2.0,0.0) DEAL::0 1 (3.0,0.0) -DEAL::0 2 (23.,0.0) +DEAL::0 2 (20.,0.0) DEAL::0 3 (5.0,0.0) -DEAL::0 4 (6.0,0.0) DEAL::1 0 (4.0,0.0) DEAL::1 1 (6.0,0.0) -DEAL::1 2 (46.,0.0) +DEAL::1 2 (39.,0.0) DEAL::1 3 (10.,0.0) -DEAL::1 4 (12.,0.0) DEAL::2 0 (6.0,0.0) DEAL::2 1 (9.0,0.0) -DEAL::2 2 (69.,0.0) +DEAL::2 2 (59.,0.0) DEAL::2 3 (15.,0.0) -DEAL::2 4 (18.,0.0) DEAL::3 0 (8.0,0.0) DEAL::3 1 (12.,0.0) -DEAL::3 2 (91.,0.0) +DEAL::3 2 (79.,0.0) DEAL::3 3 (20.,0.0) -DEAL::3 4 (24.,0.0) DEAL::4 0 (10.,0.0) DEAL::4 1 (15.,0.0) -DEAL::4 2 (1.1e+02,0.0) +DEAL::4 2 (99.,0.0) DEAL::4 3 (25.,0.0) -DEAL::4 4 (30.,0.0) diff --git a/tests/full_matrix/complex_real_full_matrix_32.cc b/tests/full_matrix/complex_real_full_matrix_32.cc index 0986fe3113..b375ce525a 100644 --- a/tests/full_matrix/complex_real_full_matrix_32.cc +++ b/tests/full_matrix/complex_real_full_matrix_32.cc @@ -32,7 +32,6 @@ check () { FullMatrix > m; make_matrix (m); - m.add_col (2, 3.141, 4, 2.718, 3); + m.add_col (2, 3.141, 1, 2.718, 3); print_matrix (m); } - diff --git a/tests/full_matrix/complex_real_full_matrix_32.output b/tests/full_matrix/complex_real_full_matrix_32.output index 4015cee3d5..29759d8c82 100644 --- a/tests/full_matrix/complex_real_full_matrix_32.output +++ b/tests/full_matrix/complex_real_full_matrix_32.output @@ -1,51 +1,41 @@ DEAL::0 0 (2.0,0.0) DEAL::0 1 (3.0,0.0) -DEAL::0 2 (36.,0.0) +DEAL::0 2 (27.,0.0) DEAL::0 3 (5.0,0.0) -DEAL::0 4 (6.0,0.0) DEAL::1 0 (4.0,0.0) DEAL::1 1 (6.0,0.0) -DEAL::1 2 (73.,0.0) +DEAL::1 2 (54.,0.0) DEAL::1 3 (10.,0.0) -DEAL::1 4 (12.,0.0) DEAL::2 0 (6.0,0.0) DEAL::2 1 (9.0,0.0) -DEAL::2 2 (1.1e+02,0.0) +DEAL::2 2 (81.,0.0) DEAL::2 3 (15.,0.0) -DEAL::2 4 (18.,0.0) DEAL::3 0 (8.0,0.0) DEAL::3 1 (12.,0.0) -DEAL::3 2 (1.5e+02,0.0) +DEAL::3 2 (1.1e+02,0.0) DEAL::3 3 (20.,0.0) -DEAL::3 4 (24.,0.0) DEAL::4 0 (10.,0.0) DEAL::4 1 (15.,0.0) -DEAL::4 2 (1.8e+02,0.0) +DEAL::4 2 (1.4e+02,0.0) DEAL::4 3 (25.,0.0) -DEAL::4 4 (30.,0.0) DEAL::0 0 (2.0,0.0) DEAL::0 1 (3.0,0.0) -DEAL::0 2 (36.,0.0) +DEAL::0 2 (27.,0.0) DEAL::0 3 (5.0,0.0) -DEAL::0 4 (6.0,0.0) DEAL::1 0 (4.0,0.0) DEAL::1 1 (6.0,0.0) -DEAL::1 2 (73.,0.0) +DEAL::1 2 (54.,0.0) DEAL::1 3 (10.,0.0) -DEAL::1 4 (12.,0.0) DEAL::2 0 (6.0,0.0) DEAL::2 1 (9.0,0.0) -DEAL::2 2 (1.1e+02,0.0) +DEAL::2 2 (81.,0.0) DEAL::2 3 (15.,0.0) -DEAL::2 4 (18.,0.0) DEAL::3 0 (8.0,0.0) DEAL::3 1 (12.,0.0) -DEAL::3 2 (1.5e+02,0.0) +DEAL::3 2 (1.1e+02,0.0) DEAL::3 3 (20.,0.0) -DEAL::3 4 (24.,0.0) DEAL::4 0 (10.,0.0) DEAL::4 1 (15.,0.0) -DEAL::4 2 (1.8e+02,0.0) +DEAL::4 2 (1.4e+02,0.0) DEAL::4 3 (25.,0.0) -DEAL::4 4 (30.,0.0) diff --git a/tests/full_matrix/complex_real_full_matrix_34.cc b/tests/full_matrix/complex_real_full_matrix_34.cc index 6cf4edc0cc..54230e518d 100644 --- a/tests/full_matrix/complex_real_full_matrix_34.cc +++ b/tests/full_matrix/complex_real_full_matrix_34.cc @@ -32,7 +32,6 @@ check () { FullMatrix > m; make_matrix (m); - m.swap_col (2, 4); + m.swap_col (2, 3); print_matrix (m); } - diff --git a/tests/full_matrix/complex_real_full_matrix_34.output b/tests/full_matrix/complex_real_full_matrix_34.output index a60126c607..ab65b8a404 100644 --- a/tests/full_matrix/complex_real_full_matrix_34.output +++ b/tests/full_matrix/complex_real_full_matrix_34.output @@ -1,51 +1,41 @@ DEAL::0 0 (2.0,0.0) DEAL::0 1 (3.0,0.0) -DEAL::0 2 (6.0,0.0) -DEAL::0 3 (5.0,0.0) -DEAL::0 4 (4.0,0.0) +DEAL::0 2 (5.0,0.0) +DEAL::0 3 (4.0,0.0) DEAL::1 0 (4.0,0.0) DEAL::1 1 (6.0,0.0) -DEAL::1 2 (12.,0.0) -DEAL::1 3 (10.,0.0) -DEAL::1 4 (8.0,0.0) +DEAL::1 2 (10.,0.0) +DEAL::1 3 (8.0,0.0) DEAL::2 0 (6.0,0.0) DEAL::2 1 (9.0,0.0) -DEAL::2 2 (18.,0.0) -DEAL::2 3 (15.,0.0) -DEAL::2 4 (12.,0.0) +DEAL::2 2 (15.,0.0) +DEAL::2 3 (12.,0.0) DEAL::3 0 (8.0,0.0) DEAL::3 1 (12.,0.0) -DEAL::3 2 (24.,0.0) -DEAL::3 3 (20.,0.0) -DEAL::3 4 (16.,0.0) +DEAL::3 2 (20.,0.0) +DEAL::3 3 (16.,0.0) DEAL::4 0 (10.,0.0) DEAL::4 1 (15.,0.0) -DEAL::4 2 (30.,0.0) -DEAL::4 3 (25.,0.0) -DEAL::4 4 (20.,0.0) +DEAL::4 2 (25.,0.0) +DEAL::4 3 (20.,0.0) DEAL::0 0 (2.0,0.0) DEAL::0 1 (3.0,0.0) -DEAL::0 2 (6.0,0.0) -DEAL::0 3 (5.0,0.0) -DEAL::0 4 (4.0,0.0) +DEAL::0 2 (5.0,0.0) +DEAL::0 3 (4.0,0.0) DEAL::1 0 (4.0,0.0) DEAL::1 1 (6.0,0.0) -DEAL::1 2 (12.,0.0) -DEAL::1 3 (10.,0.0) -DEAL::1 4 (8.0,0.0) +DEAL::1 2 (10.,0.0) +DEAL::1 3 (8.0,0.0) DEAL::2 0 (6.0,0.0) DEAL::2 1 (9.0,0.0) -DEAL::2 2 (18.,0.0) -DEAL::2 3 (15.,0.0) -DEAL::2 4 (12.,0.0) +DEAL::2 2 (15.,0.0) +DEAL::2 3 (12.,0.0) DEAL::3 0 (8.0,0.0) DEAL::3 1 (12.,0.0) -DEAL::3 2 (24.,0.0) -DEAL::3 3 (20.,0.0) -DEAL::3 4 (16.,0.0) +DEAL::3 2 (20.,0.0) +DEAL::3 3 (16.,0.0) DEAL::4 0 (10.,0.0) DEAL::4 1 (15.,0.0) -DEAL::4 2 (30.,0.0) -DEAL::4 3 (25.,0.0) -DEAL::4 4 (20.,0.0) +DEAL::4 2 (25.,0.0) +DEAL::4 3 (20.,0.0) diff --git a/tests/full_matrix/complex_real_full_matrix_45.cc b/tests/full_matrix/complex_real_full_matrix_45.cc index 862269550c..d9ffdb9c21 100644 --- a/tests/full_matrix/complex_real_full_matrix_45.cc +++ b/tests/full_matrix/complex_real_full_matrix_45.cc @@ -33,8 +33,8 @@ check () FullMatrix > m; make_matrix (m); Vector > v, w; - make_vector (v); - make_vector (w); + make_range_vector (v); + make_domain_vector (w); m.vmult (v, w, true); print_vector (v); @@ -44,4 +44,3 @@ check () print_vector (v); print_vector (w); } - diff --git a/tests/full_matrix/complex_real_full_matrix_45.output b/tests/full_matrix/complex_real_full_matrix_45.output index ac31e794db..ebdebe7702 100644 --- a/tests/full_matrix/complex_real_full_matrix_45.output +++ b/tests/full_matrix/complex_real_full_matrix_45.output @@ -1,41 +1,37 @@ -DEAL::0 (71.,0.0) -DEAL::1 (1.4e+02,0.0) -DEAL::2 (2.1e+02,0.0) -DEAL::3 (2.8e+02,0.0) -DEAL::4 (3.6e+02,0.0) +DEAL::0 (41.,0.0) +DEAL::1 (82.,0.0) +DEAL::2 (1.2e+02,0.0) +DEAL::3 (1.6e+02,0.0) +DEAL::4 (2.0e+02,0.0) DEAL::0 (1.0,0.0) DEAL::1 (2.0,0.0) DEAL::2 (3.0,0.0) DEAL::3 (4.0,0.0) -DEAL::4 (5.0,0.0) -DEAL::0 (70.,0.0) -DEAL::1 (1.4e+02,0.0) -DEAL::2 (2.1e+02,0.0) -DEAL::3 (2.8e+02,0.0) -DEAL::4 (3.5e+02,0.0) +DEAL::0 (40.,0.0) +DEAL::1 (80.,0.0) +DEAL::2 (1.2e+02,0.0) +DEAL::3 (1.6e+02,0.0) +DEAL::4 (2.0e+02,0.0) DEAL::0 (1.0,0.0) DEAL::1 (2.0,0.0) DEAL::2 (3.0,0.0) DEAL::3 (4.0,0.0) -DEAL::4 (5.0,0.0) -DEAL::0 (71.,0.0) -DEAL::1 (1.4e+02,0.0) -DEAL::2 (2.1e+02,0.0) -DEAL::3 (2.8e+02,0.0) -DEAL::4 (3.6e+02,0.0) +DEAL::0 (41.,0.0) +DEAL::1 (82.,0.0) +DEAL::2 (1.2e+02,0.0) +DEAL::3 (1.6e+02,0.0) +DEAL::4 (2.0e+02,0.0) DEAL::0 (1.0,0.0) DEAL::1 (2.0,0.0) DEAL::2 (3.0,0.0) DEAL::3 (4.0,0.0) -DEAL::4 (5.0,0.0) -DEAL::0 (70.,0.0) -DEAL::1 (1.4e+02,0.0) -DEAL::2 (2.1e+02,0.0) -DEAL::3 (2.8e+02,0.0) -DEAL::4 (3.5e+02,0.0) +DEAL::0 (40.,0.0) +DEAL::1 (80.,0.0) +DEAL::2 (1.2e+02,0.0) +DEAL::3 (1.6e+02,0.0) +DEAL::4 (2.0e+02,0.0) DEAL::0 (1.0,0.0) DEAL::1 (2.0,0.0) DEAL::2 (3.0,0.0) DEAL::3 (4.0,0.0) -DEAL::4 (5.0,0.0) diff --git a/tests/full_matrix/complex_real_full_matrix_46.cc b/tests/full_matrix/complex_real_full_matrix_46.cc index a6363cabea..048c5ec802 100644 --- a/tests/full_matrix/complex_real_full_matrix_46.cc +++ b/tests/full_matrix/complex_real_full_matrix_46.cc @@ -33,11 +33,10 @@ check () FullMatrix > m; make_matrix (m); Vector > v, w; - make_vector (v); - make_vector (w); + make_range_vector (v); + make_domain_vector (w); m.vmult_add (v, w); print_vector (v); print_vector (w); } - diff --git a/tests/full_matrix/complex_real_full_matrix_46.output b/tests/full_matrix/complex_real_full_matrix_46.output index 3b9b54ee47..996765d2ee 100644 --- a/tests/full_matrix/complex_real_full_matrix_46.output +++ b/tests/full_matrix/complex_real_full_matrix_46.output @@ -1,21 +1,19 @@ -DEAL::0 (71.,0.0) -DEAL::1 (1.4e+02,0.0) -DEAL::2 (2.1e+02,0.0) -DEAL::3 (2.8e+02,0.0) -DEAL::4 (3.6e+02,0.0) +DEAL::0 (41.,0.0) +DEAL::1 (82.,0.0) +DEAL::2 (1.2e+02,0.0) +DEAL::3 (1.6e+02,0.0) +DEAL::4 (2.0e+02,0.0) DEAL::0 (1.0,0.0) DEAL::1 (2.0,0.0) DEAL::2 (3.0,0.0) DEAL::3 (4.0,0.0) -DEAL::4 (5.0,0.0) -DEAL::0 (71.,0.0) -DEAL::1 (1.4e+02,0.0) -DEAL::2 (2.1e+02,0.0) -DEAL::3 (2.8e+02,0.0) -DEAL::4 (3.6e+02,0.0) +DEAL::0 (41.,0.0) +DEAL::1 (82.,0.0) +DEAL::2 (1.2e+02,0.0) +DEAL::3 (1.6e+02,0.0) +DEAL::4 (2.0e+02,0.0) DEAL::0 (1.0,0.0) DEAL::1 (2.0,0.0) DEAL::2 (3.0,0.0) DEAL::3 (4.0,0.0) -DEAL::4 (5.0,0.0) diff --git a/tests/full_matrix/complex_real_full_matrix_50.cc b/tests/full_matrix/complex_real_full_matrix_50.cc index f50fb19136..8893f3ee1b 100644 --- a/tests/full_matrix/complex_real_full_matrix_50.cc +++ b/tests/full_matrix/complex_real_full_matrix_50.cc @@ -33,13 +33,12 @@ check () FullMatrix > m; make_matrix (m); Vector > v, w, x; - make_vector (v); - make_vector (w); - make_vector (x); + make_range_vector (v); + make_domain_vector (w); + make_range_vector (x); m.residual (v, w, x); print_vector (v); print_vector (w); print_vector (x); } - diff --git a/tests/full_matrix/complex_real_full_matrix_50.output b/tests/full_matrix/complex_real_full_matrix_50.output index 215ee596c8..352fb4cbc5 100644 --- a/tests/full_matrix/complex_real_full_matrix_50.output +++ b/tests/full_matrix/complex_real_full_matrix_50.output @@ -1,29 +1,27 @@ -DEAL::0 (-69.,0.0) -DEAL::1 (-1.4e+02,0.0) -DEAL::2 (-2.1e+02,0.0) -DEAL::3 (-2.8e+02,0.0) -DEAL::4 (-3.4e+02,0.0) +DEAL::0 (-39.,0.0) +DEAL::1 (-78.,0.0) +DEAL::2 (-1.2e+02,0.0) +DEAL::3 (-1.6e+02,0.0) +DEAL::4 (-2.0e+02,0.0) DEAL::0 (1.0,0.0) DEAL::1 (2.0,0.0) DEAL::2 (3.0,0.0) DEAL::3 (4.0,0.0) -DEAL::4 (5.0,0.0) DEAL::0 (1.0,0.0) DEAL::1 (2.0,0.0) DEAL::2 (3.0,0.0) DEAL::3 (4.0,0.0) DEAL::4 (5.0,0.0) -DEAL::0 (-69.,0.0) -DEAL::1 (-1.4e+02,0.0) -DEAL::2 (-2.1e+02,0.0) -DEAL::3 (-2.8e+02,0.0) -DEAL::4 (-3.4e+02,0.0) +DEAL::0 (-39.,0.0) +DEAL::1 (-78.,0.0) +DEAL::2 (-1.2e+02,0.0) +DEAL::3 (-1.6e+02,0.0) +DEAL::4 (-2.0e+02,0.0) DEAL::0 (1.0,0.0) DEAL::1 (2.0,0.0) DEAL::2 (3.0,0.0) DEAL::3 (4.0,0.0) -DEAL::4 (5.0,0.0) DEAL::0 (1.0,0.0) DEAL::1 (2.0,0.0) DEAL::2 (3.0,0.0) diff --git a/tests/full_matrix/complex_real_full_matrix_51.cc b/tests/full_matrix/complex_real_full_matrix_51.cc index 711c331d8a..439755f3f9 100644 --- a/tests/full_matrix/complex_real_full_matrix_51.cc +++ b/tests/full_matrix/complex_real_full_matrix_51.cc @@ -33,11 +33,10 @@ check () FullMatrix > m; make_matrix (m); Vector > x, y; - make_vector (x); - make_vector (y); + make_range_vector (x); + make_domain_vector (y); m.forward (x, y); print_vector (x); print_vector (y); } - diff --git a/tests/full_matrix/complex_real_full_matrix_51.output b/tests/full_matrix/complex_real_full_matrix_51.output index 4ee323373b..725e680b31 100644 --- a/tests/full_matrix/complex_real_full_matrix_51.output +++ b/tests/full_matrix/complex_real_full_matrix_51.output @@ -3,19 +3,17 @@ DEAL::0 (0.50,0.0) DEAL::1 (0.0,0.0) DEAL::2 (0.0,0.0) DEAL::3 (0.0,0.0) -DEAL::4 (0.0,0.0) +DEAL::4 (5.0,0.0) DEAL::0 (1.0,0.0) DEAL::1 (2.0,0.0) DEAL::2 (3.0,0.0) DEAL::3 (4.0,0.0) -DEAL::4 (5.0,0.0) DEAL::0 (0.50,0.0) DEAL::1 (0.0,0.0) DEAL::2 (0.0,0.0) DEAL::3 (0.0,0.0) -DEAL::4 (0.0,0.0) +DEAL::4 (5.0,0.0) DEAL::0 (1.0,0.0) DEAL::1 (2.0,0.0) DEAL::2 (3.0,0.0) DEAL::3 (4.0,0.0) -DEAL::4 (5.0,0.0) diff --git a/tests/full_matrix/complex_real_full_matrix_52.cc b/tests/full_matrix/complex_real_full_matrix_52.cc index 166942beb7..1dc3e90fb6 100644 --- a/tests/full_matrix/complex_real_full_matrix_52.cc +++ b/tests/full_matrix/complex_real_full_matrix_52.cc @@ -33,11 +33,12 @@ check () FullMatrix > m; make_matrix (m); Vector > x, y; - make_vector (x); - make_vector (y); + make_range_vector (x); + make_domain_vector (y); + for (std::complex &entry : y) + entry += std::complex(1.0, 0.0); m.backward (x, y); print_vector (x); print_vector (y); } - diff --git a/tests/full_matrix/complex_real_full_matrix_52.output b/tests/full_matrix/complex_real_full_matrix_52.output index 7864d6a667..cdbf3c9925 100644 --- a/tests/full_matrix/complex_real_full_matrix_52.output +++ b/tests/full_matrix/complex_real_full_matrix_52.output @@ -1,21 +1,19 @@ -DEAL::0 (0.0,0.0) -DEAL::1 (0.0,0.0) -DEAL::2 (0.0,0.0) -DEAL::3 (0.0,0.0) -DEAL::4 (0.17,0.0) -DEAL::0 (1.0,0.0) -DEAL::1 (2.0,0.0) -DEAL::2 (3.0,0.0) -DEAL::3 (4.0,0.0) +DEAL::0 (0.25,0.0) +DEAL::1 (0.056,0.0) +DEAL::2 (0.021,0.0) +DEAL::3 (0.25,0.0) DEAL::4 (5.0,0.0) -DEAL::0 (0.0,0.0) -DEAL::1 (0.0,0.0) -DEAL::2 (0.0,0.0) -DEAL::3 (0.0,0.0) -DEAL::4 (0.17,0.0) -DEAL::0 (1.0,0.0) -DEAL::1 (2.0,0.0) -DEAL::2 (3.0,0.0) -DEAL::3 (4.0,0.0) +DEAL::0 (2.0,0.0) +DEAL::1 (3.0,0.0) +DEAL::2 (4.0,0.0) +DEAL::3 (5.0,0.0) +DEAL::0 (0.25,0.0) +DEAL::1 (0.056,0.0) +DEAL::2 (0.021,0.0) +DEAL::3 (0.25,0.0) DEAL::4 (5.0,0.0) +DEAL::0 (2.0,0.0) +DEAL::1 (3.0,0.0) +DEAL::2 (4.0,0.0) +DEAL::3 (5.0,0.0) diff --git a/tests/full_matrix/full_matrix_15.output b/tests/full_matrix/full_matrix_15.output index 5219ffb481..a4401c35d8 100644 --- a/tests/full_matrix/full_matrix_15.output +++ b/tests/full_matrix/full_matrix_15.output @@ -1,3 +1,3 @@ -DEAL::90. -DEAL::90. +DEAL::75. +DEAL::75. diff --git a/tests/full_matrix/full_matrix_16.output b/tests/full_matrix/full_matrix_16.output index bf7e83ec97..d106e772eb 100644 --- a/tests/full_matrix/full_matrix_16.output +++ b/tests/full_matrix/full_matrix_16.output @@ -1,3 +1,3 @@ -DEAL::1.0e+02 -DEAL::1.0e+02 +DEAL::70. +DEAL::70. diff --git a/tests/full_matrix/full_matrix_17.output b/tests/full_matrix/full_matrix_17.output index d106e772eb..cf6890bc1c 100644 --- a/tests/full_matrix/full_matrix_17.output +++ b/tests/full_matrix/full_matrix_17.output @@ -1,3 +1,3 @@ -DEAL::70. -DEAL::70. +DEAL::54. +DEAL::54. diff --git a/tests/full_matrix/full_matrix_21.output b/tests/full_matrix/full_matrix_21.output index e6da357911..e3434fa0af 100644 --- a/tests/full_matrix/full_matrix_21.output +++ b/tests/full_matrix/full_matrix_21.output @@ -1,11 +1,11 @@ -2.0 3.0 4.0 5.0 6.0 -4.0 6.0 8.0 10. 12. -6.0 9.0 12. 15. 18. -8.0 12. 16. 20. 24. -10. 15. 20. 25. 30. -2.0 3.0 4.0 5.0 6.0 -4.0 6.0 8.0 10. 12. -6.0 9.0 12. 15. 18. -8.0 12. 16. 20. 24. -10. 15. 20. 25. 30. +2.0 3.0 4.0 5.0 +4.0 6.0 8.0 10. +6.0 9.0 12. 15. +8.0 12. 16. 20. +10. 15. 20. 25. +2.0 3.0 4.0 5.0 +4.0 6.0 8.0 10. +6.0 9.0 12. 15. +8.0 12. 16. 20. +10. 15. 20. 25. diff --git a/tests/full_matrix/full_matrix_27.output b/tests/full_matrix/full_matrix_27.output index 6684fea5a5..367a4e5399 100644 --- a/tests/full_matrix/full_matrix_27.output +++ b/tests/full_matrix/full_matrix_27.output @@ -1,201 +1,201 @@ -DEAL::0 0 0 -DEAL::0 1 0 -DEAL::0 2 0 -DEAL::0 3 0 -DEAL::0 4 0 -DEAL::0 5 0 -DEAL::0 6 0 -DEAL::0 7 0 -DEAL::0 8 0 -DEAL::0 9 0 -DEAL::1 0 0 -DEAL::1 1 0 -DEAL::1 2 0 -DEAL::1 3 0 -DEAL::1 4 0 -DEAL::1 5 0 -DEAL::1 6 0 -DEAL::1 7 0 -DEAL::1 8 0 -DEAL::1 9 0 -DEAL::2 0 0 -DEAL::2 1 0 -DEAL::2 2 0 -DEAL::2 3 0 -DEAL::2 4 0 -DEAL::2 5 0 -DEAL::2 6 0 -DEAL::2 7 0 -DEAL::2 8 0 -DEAL::2 9 0 -DEAL::3 0 0 -DEAL::3 1 0 -DEAL::3 2 0 -DEAL::3 3 0 +DEAL::0 0 0.0 +DEAL::0 1 0.0 +DEAL::0 2 0.0 +DEAL::0 3 0.0 +DEAL::0 4 0.0 +DEAL::0 5 0.0 +DEAL::0 6 0.0 +DEAL::0 7 0.0 +DEAL::0 8 0.0 +DEAL::0 9 0.0 +DEAL::1 0 0.0 +DEAL::1 1 0.0 +DEAL::1 2 0.0 +DEAL::1 3 0.0 +DEAL::1 4 0.0 +DEAL::1 5 0.0 +DEAL::1 6 0.0 +DEAL::1 7 0.0 +DEAL::1 8 0.0 +DEAL::1 9 0.0 +DEAL::2 0 0.0 +DEAL::2 1 0.0 +DEAL::2 2 0.0 +DEAL::2 3 0.0 +DEAL::2 4 0.0 +DEAL::2 5 0.0 +DEAL::2 6 0.0 +DEAL::2 7 0.0 +DEAL::2 8 0.0 +DEAL::2 9 0.0 +DEAL::3 0 0.0 +DEAL::3 1 0.0 +DEAL::3 2 0.0 +DEAL::3 3 0.0 DEAL::3 4 30. -DEAL::3 5 36. -DEAL::3 6 0 -DEAL::3 7 0 -DEAL::3 8 0 -DEAL::3 9 0 -DEAL::4 0 0 -DEAL::4 1 0 -DEAL::4 2 0 -DEAL::4 3 0 +DEAL::3 5 0.0 +DEAL::3 6 0.0 +DEAL::3 7 0.0 +DEAL::3 8 0.0 +DEAL::3 9 0.0 +DEAL::4 0 0.0 +DEAL::4 1 0.0 +DEAL::4 2 0.0 +DEAL::4 3 0.0 DEAL::4 4 40. -DEAL::4 5 48. -DEAL::4 6 0 -DEAL::4 7 0 -DEAL::4 8 0 -DEAL::4 9 0 -DEAL::5 0 0 -DEAL::5 1 0 -DEAL::5 2 0 -DEAL::5 3 0 +DEAL::4 5 0.0 +DEAL::4 6 0.0 +DEAL::4 7 0.0 +DEAL::4 8 0.0 +DEAL::4 9 0.0 +DEAL::5 0 0.0 +DEAL::5 1 0.0 +DEAL::5 2 0.0 +DEAL::5 3 0.0 DEAL::5 4 50. -DEAL::5 5 60. -DEAL::5 6 0 -DEAL::5 7 0 -DEAL::5 8 0 -DEAL::5 9 0 -DEAL::6 0 0 -DEAL::6 1 0 -DEAL::6 2 0 -DEAL::6 3 0 -DEAL::6 4 0 -DEAL::6 5 0 -DEAL::6 6 0 -DEAL::6 7 0 -DEAL::6 8 0 -DEAL::6 9 0 -DEAL::7 0 0 -DEAL::7 1 0 -DEAL::7 2 0 -DEAL::7 3 0 -DEAL::7 4 0 -DEAL::7 5 0 -DEAL::7 6 0 -DEAL::7 7 0 -DEAL::7 8 0 -DEAL::7 9 0 -DEAL::8 0 0 -DEAL::8 1 0 -DEAL::8 2 0 -DEAL::8 3 0 -DEAL::8 4 0 -DEAL::8 5 0 -DEAL::8 6 0 -DEAL::8 7 0 -DEAL::8 8 0 -DEAL::8 9 0 -DEAL::9 0 0 -DEAL::9 1 0 -DEAL::9 2 0 -DEAL::9 3 0 -DEAL::9 4 0 -DEAL::9 5 0 -DEAL::9 6 0 -DEAL::9 7 0 -DEAL::9 8 0 -DEAL::9 9 0 -DEAL::0 0 0 -DEAL::0 1 0 -DEAL::0 2 0 -DEAL::0 3 0 -DEAL::0 4 0 -DEAL::0 5 0 -DEAL::0 6 0 -DEAL::0 7 0 -DEAL::0 8 0 -DEAL::0 9 0 -DEAL::1 0 0 -DEAL::1 1 0 -DEAL::1 2 0 -DEAL::1 3 0 -DEAL::1 4 0 -DEAL::1 5 0 -DEAL::1 6 0 -DEAL::1 7 0 -DEAL::1 8 0 -DEAL::1 9 0 -DEAL::2 0 0 -DEAL::2 1 0 -DEAL::2 2 0 -DEAL::2 3 0 -DEAL::2 4 0 -DEAL::2 5 0 -DEAL::2 6 0 -DEAL::2 7 0 -DEAL::2 8 0 -DEAL::2 9 0 -DEAL::3 0 0 -DEAL::3 1 0 -DEAL::3 2 0 -DEAL::3 3 0 +DEAL::5 5 0.0 +DEAL::5 6 0.0 +DEAL::5 7 0.0 +DEAL::5 8 0.0 +DEAL::5 9 0.0 +DEAL::6 0 0.0 +DEAL::6 1 0.0 +DEAL::6 2 0.0 +DEAL::6 3 0.0 +DEAL::6 4 0.0 +DEAL::6 5 0.0 +DEAL::6 6 0.0 +DEAL::6 7 0.0 +DEAL::6 8 0.0 +DEAL::6 9 0.0 +DEAL::7 0 0.0 +DEAL::7 1 0.0 +DEAL::7 2 0.0 +DEAL::7 3 0.0 +DEAL::7 4 0.0 +DEAL::7 5 0.0 +DEAL::7 6 0.0 +DEAL::7 7 0.0 +DEAL::7 8 0.0 +DEAL::7 9 0.0 +DEAL::8 0 0.0 +DEAL::8 1 0.0 +DEAL::8 2 0.0 +DEAL::8 3 0.0 +DEAL::8 4 0.0 +DEAL::8 5 0.0 +DEAL::8 6 0.0 +DEAL::8 7 0.0 +DEAL::8 8 0.0 +DEAL::8 9 0.0 +DEAL::9 0 0.0 +DEAL::9 1 0.0 +DEAL::9 2 0.0 +DEAL::9 3 0.0 +DEAL::9 4 0.0 +DEAL::9 5 0.0 +DEAL::9 6 0.0 +DEAL::9 7 0.0 +DEAL::9 8 0.0 +DEAL::9 9 0.0 +DEAL::0 0 0.0 +DEAL::0 1 0.0 +DEAL::0 2 0.0 +DEAL::0 3 0.0 +DEAL::0 4 0.0 +DEAL::0 5 0.0 +DEAL::0 6 0.0 +DEAL::0 7 0.0 +DEAL::0 8 0.0 +DEAL::0 9 0.0 +DEAL::1 0 0.0 +DEAL::1 1 0.0 +DEAL::1 2 0.0 +DEAL::1 3 0.0 +DEAL::1 4 0.0 +DEAL::1 5 0.0 +DEAL::1 6 0.0 +DEAL::1 7 0.0 +DEAL::1 8 0.0 +DEAL::1 9 0.0 +DEAL::2 0 0.0 +DEAL::2 1 0.0 +DEAL::2 2 0.0 +DEAL::2 3 0.0 +DEAL::2 4 0.0 +DEAL::2 5 0.0 +DEAL::2 6 0.0 +DEAL::2 7 0.0 +DEAL::2 8 0.0 +DEAL::2 9 0.0 +DEAL::3 0 0.0 +DEAL::3 1 0.0 +DEAL::3 2 0.0 +DEAL::3 3 0.0 DEAL::3 4 30. -DEAL::3 5 36. -DEAL::3 6 0 -DEAL::3 7 0 -DEAL::3 8 0 -DEAL::3 9 0 -DEAL::4 0 0 -DEAL::4 1 0 -DEAL::4 2 0 -DEAL::4 3 0 +DEAL::3 5 0.0 +DEAL::3 6 0.0 +DEAL::3 7 0.0 +DEAL::3 8 0.0 +DEAL::3 9 0.0 +DEAL::4 0 0.0 +DEAL::4 1 0.0 +DEAL::4 2 0.0 +DEAL::4 3 0.0 DEAL::4 4 40. -DEAL::4 5 48. -DEAL::4 6 0 -DEAL::4 7 0 -DEAL::4 8 0 -DEAL::4 9 0 -DEAL::5 0 0 -DEAL::5 1 0 -DEAL::5 2 0 -DEAL::5 3 0 +DEAL::4 5 0.0 +DEAL::4 6 0.0 +DEAL::4 7 0.0 +DEAL::4 8 0.0 +DEAL::4 9 0.0 +DEAL::5 0 0.0 +DEAL::5 1 0.0 +DEAL::5 2 0.0 +DEAL::5 3 0.0 DEAL::5 4 50. -DEAL::5 5 60. -DEAL::5 6 0 -DEAL::5 7 0 -DEAL::5 8 0 -DEAL::5 9 0 -DEAL::6 0 0 -DEAL::6 1 0 -DEAL::6 2 0 -DEAL::6 3 0 -DEAL::6 4 0 -DEAL::6 5 0 -DEAL::6 6 0 -DEAL::6 7 0 -DEAL::6 8 0 -DEAL::6 9 0 -DEAL::7 0 0 -DEAL::7 1 0 -DEAL::7 2 0 -DEAL::7 3 0 -DEAL::7 4 0 -DEAL::7 5 0 -DEAL::7 6 0 -DEAL::7 7 0 -DEAL::7 8 0 -DEAL::7 9 0 -DEAL::8 0 0 -DEAL::8 1 0 -DEAL::8 2 0 -DEAL::8 3 0 -DEAL::8 4 0 -DEAL::8 5 0 -DEAL::8 6 0 -DEAL::8 7 0 -DEAL::8 8 0 -DEAL::8 9 0 -DEAL::9 0 0 -DEAL::9 1 0 -DEAL::9 2 0 -DEAL::9 3 0 -DEAL::9 4 0 -DEAL::9 5 0 -DEAL::9 6 0 -DEAL::9 7 0 -DEAL::9 8 0 -DEAL::9 9 0 +DEAL::5 5 0.0 +DEAL::5 6 0.0 +DEAL::5 7 0.0 +DEAL::5 8 0.0 +DEAL::5 9 0.0 +DEAL::6 0 0.0 +DEAL::6 1 0.0 +DEAL::6 2 0.0 +DEAL::6 3 0.0 +DEAL::6 4 0.0 +DEAL::6 5 0.0 +DEAL::6 6 0.0 +DEAL::6 7 0.0 +DEAL::6 8 0.0 +DEAL::6 9 0.0 +DEAL::7 0 0.0 +DEAL::7 1 0.0 +DEAL::7 2 0.0 +DEAL::7 3 0.0 +DEAL::7 4 0.0 +DEAL::7 5 0.0 +DEAL::7 6 0.0 +DEAL::7 7 0.0 +DEAL::7 8 0.0 +DEAL::7 9 0.0 +DEAL::8 0 0.0 +DEAL::8 1 0.0 +DEAL::8 2 0.0 +DEAL::8 3 0.0 +DEAL::8 4 0.0 +DEAL::8 5 0.0 +DEAL::8 6 0.0 +DEAL::8 7 0.0 +DEAL::8 8 0.0 +DEAL::8 9 0.0 +DEAL::9 0 0.0 +DEAL::9 1 0.0 +DEAL::9 2 0.0 +DEAL::9 3 0.0 +DEAL::9 4 0.0 +DEAL::9 5 0.0 +DEAL::9 6 0.0 +DEAL::9 7 0.0 +DEAL::9 8 0.0 +DEAL::9 9 0.0 diff --git a/tests/full_matrix/full_matrix_28.output b/tests/full_matrix/full_matrix_28.output index 86563c502c..7f625da250 100644 --- a/tests/full_matrix/full_matrix_28.output +++ b/tests/full_matrix/full_matrix_28.output @@ -1,201 +1,201 @@ -DEAL::0 0 0 -DEAL::0 1 0 -DEAL::0 2 0 -DEAL::0 3 0 -DEAL::0 4 0 -DEAL::0 5 0 -DEAL::0 6 0 -DEAL::0 7 0 -DEAL::0 8 0 -DEAL::0 9 0 -DEAL::1 0 0 -DEAL::1 1 0 -DEAL::1 2 0 -DEAL::1 3 0 -DEAL::1 4 0 -DEAL::1 5 0 -DEAL::1 6 0 -DEAL::1 7 0 -DEAL::1 8 0 -DEAL::1 9 0 -DEAL::2 0 0 -DEAL::2 1 0 -DEAL::2 2 0 -DEAL::2 3 0 -DEAL::2 4 0 -DEAL::2 5 0 -DEAL::2 6 0 -DEAL::2 7 0 -DEAL::2 8 0 -DEAL::2 9 0 -DEAL::3 0 0 -DEAL::3 1 0 -DEAL::3 2 0 -DEAL::3 3 0 +DEAL::0 0 0.0 +DEAL::0 1 0.0 +DEAL::0 2 0.0 +DEAL::0 3 0.0 +DEAL::0 4 0.0 +DEAL::0 5 0.0 +DEAL::0 6 0.0 +DEAL::0 7 0.0 +DEAL::0 8 0.0 +DEAL::0 9 0.0 +DEAL::1 0 0.0 +DEAL::1 1 0.0 +DEAL::1 2 0.0 +DEAL::1 3 0.0 +DEAL::1 4 0.0 +DEAL::1 5 0.0 +DEAL::1 6 0.0 +DEAL::1 7 0.0 +DEAL::1 8 0.0 +DEAL::1 9 0.0 +DEAL::2 0 0.0 +DEAL::2 1 0.0 +DEAL::2 2 0.0 +DEAL::2 3 0.0 +DEAL::2 4 0.0 +DEAL::2 5 0.0 +DEAL::2 6 0.0 +DEAL::2 7 0.0 +DEAL::2 8 0.0 +DEAL::2 9 0.0 +DEAL::3 0 0.0 +DEAL::3 1 0.0 +DEAL::3 2 0.0 +DEAL::3 3 0.0 DEAL::3 4 30. DEAL::3 5 40. DEAL::3 6 50. -DEAL::3 7 0 -DEAL::3 8 0 -DEAL::3 9 0 -DEAL::4 0 0 -DEAL::4 1 0 -DEAL::4 2 0 -DEAL::4 3 0 -DEAL::4 4 36. -DEAL::4 5 48. -DEAL::4 6 60. -DEAL::4 7 0 -DEAL::4 8 0 -DEAL::4 9 0 -DEAL::5 0 0 -DEAL::5 1 0 -DEAL::5 2 0 -DEAL::5 3 0 -DEAL::5 4 0 -DEAL::5 5 0 -DEAL::5 6 0 -DEAL::5 7 0 -DEAL::5 8 0 -DEAL::5 9 0 -DEAL::6 0 0 -DEAL::6 1 0 -DEAL::6 2 0 -DEAL::6 3 0 -DEAL::6 4 0 -DEAL::6 5 0 -DEAL::6 6 0 -DEAL::6 7 0 -DEAL::6 8 0 -DEAL::6 9 0 -DEAL::7 0 0 -DEAL::7 1 0 -DEAL::7 2 0 -DEAL::7 3 0 -DEAL::7 4 0 -DEAL::7 5 0 -DEAL::7 6 0 -DEAL::7 7 0 -DEAL::7 8 0 -DEAL::7 9 0 -DEAL::8 0 0 -DEAL::8 1 0 -DEAL::8 2 0 -DEAL::8 3 0 -DEAL::8 4 0 -DEAL::8 5 0 -DEAL::8 6 0 -DEAL::8 7 0 -DEAL::8 8 0 -DEAL::8 9 0 -DEAL::9 0 0 -DEAL::9 1 0 -DEAL::9 2 0 -DEAL::9 3 0 -DEAL::9 4 0 -DEAL::9 5 0 -DEAL::9 6 0 -DEAL::9 7 0 -DEAL::9 8 0 -DEAL::9 9 0 -DEAL::0 0 0 -DEAL::0 1 0 -DEAL::0 2 0 -DEAL::0 3 0 -DEAL::0 4 0 -DEAL::0 5 0 -DEAL::0 6 0 -DEAL::0 7 0 -DEAL::0 8 0 -DEAL::0 9 0 -DEAL::1 0 0 -DEAL::1 1 0 -DEAL::1 2 0 -DEAL::1 3 0 -DEAL::1 4 0 -DEAL::1 5 0 -DEAL::1 6 0 -DEAL::1 7 0 -DEAL::1 8 0 -DEAL::1 9 0 -DEAL::2 0 0 -DEAL::2 1 0 -DEAL::2 2 0 -DEAL::2 3 0 -DEAL::2 4 0 -DEAL::2 5 0 -DEAL::2 6 0 -DEAL::2 7 0 -DEAL::2 8 0 -DEAL::2 9 0 -DEAL::3 0 0 -DEAL::3 1 0 -DEAL::3 2 0 -DEAL::3 3 0 +DEAL::3 7 0.0 +DEAL::3 8 0.0 +DEAL::3 9 0.0 +DEAL::4 0 0.0 +DEAL::4 1 0.0 +DEAL::4 2 0.0 +DEAL::4 3 0.0 +DEAL::4 4 0.0 +DEAL::4 5 0.0 +DEAL::4 6 0.0 +DEAL::4 7 0.0 +DEAL::4 8 0.0 +DEAL::4 9 0.0 +DEAL::5 0 0.0 +DEAL::5 1 0.0 +DEAL::5 2 0.0 +DEAL::5 3 0.0 +DEAL::5 4 0.0 +DEAL::5 5 0.0 +DEAL::5 6 0.0 +DEAL::5 7 0.0 +DEAL::5 8 0.0 +DEAL::5 9 0.0 +DEAL::6 0 0.0 +DEAL::6 1 0.0 +DEAL::6 2 0.0 +DEAL::6 3 0.0 +DEAL::6 4 0.0 +DEAL::6 5 0.0 +DEAL::6 6 0.0 +DEAL::6 7 0.0 +DEAL::6 8 0.0 +DEAL::6 9 0.0 +DEAL::7 0 0.0 +DEAL::7 1 0.0 +DEAL::7 2 0.0 +DEAL::7 3 0.0 +DEAL::7 4 0.0 +DEAL::7 5 0.0 +DEAL::7 6 0.0 +DEAL::7 7 0.0 +DEAL::7 8 0.0 +DEAL::7 9 0.0 +DEAL::8 0 0.0 +DEAL::8 1 0.0 +DEAL::8 2 0.0 +DEAL::8 3 0.0 +DEAL::8 4 0.0 +DEAL::8 5 0.0 +DEAL::8 6 0.0 +DEAL::8 7 0.0 +DEAL::8 8 0.0 +DEAL::8 9 0.0 +DEAL::9 0 0.0 +DEAL::9 1 0.0 +DEAL::9 2 0.0 +DEAL::9 3 0.0 +DEAL::9 4 0.0 +DEAL::9 5 0.0 +DEAL::9 6 0.0 +DEAL::9 7 0.0 +DEAL::9 8 0.0 +DEAL::9 9 0.0 +DEAL::0 0 0.0 +DEAL::0 1 0.0 +DEAL::0 2 0.0 +DEAL::0 3 0.0 +DEAL::0 4 0.0 +DEAL::0 5 0.0 +DEAL::0 6 0.0 +DEAL::0 7 0.0 +DEAL::0 8 0.0 +DEAL::0 9 0.0 +DEAL::1 0 0.0 +DEAL::1 1 0.0 +DEAL::1 2 0.0 +DEAL::1 3 0.0 +DEAL::1 4 0.0 +DEAL::1 5 0.0 +DEAL::1 6 0.0 +DEAL::1 7 0.0 +DEAL::1 8 0.0 +DEAL::1 9 0.0 +DEAL::2 0 0.0 +DEAL::2 1 0.0 +DEAL::2 2 0.0 +DEAL::2 3 0.0 +DEAL::2 4 0.0 +DEAL::2 5 0.0 +DEAL::2 6 0.0 +DEAL::2 7 0.0 +DEAL::2 8 0.0 +DEAL::2 9 0.0 +DEAL::3 0 0.0 +DEAL::3 1 0.0 +DEAL::3 2 0.0 +DEAL::3 3 0.0 DEAL::3 4 30. DEAL::3 5 40. DEAL::3 6 50. -DEAL::3 7 0 -DEAL::3 8 0 -DEAL::3 9 0 -DEAL::4 0 0 -DEAL::4 1 0 -DEAL::4 2 0 -DEAL::4 3 0 -DEAL::4 4 36. -DEAL::4 5 48. -DEAL::4 6 60. -DEAL::4 7 0 -DEAL::4 8 0 -DEAL::4 9 0 -DEAL::5 0 0 -DEAL::5 1 0 -DEAL::5 2 0 -DEAL::5 3 0 -DEAL::5 4 0 -DEAL::5 5 0 -DEAL::5 6 0 -DEAL::5 7 0 -DEAL::5 8 0 -DEAL::5 9 0 -DEAL::6 0 0 -DEAL::6 1 0 -DEAL::6 2 0 -DEAL::6 3 0 -DEAL::6 4 0 -DEAL::6 5 0 -DEAL::6 6 0 -DEAL::6 7 0 -DEAL::6 8 0 -DEAL::6 9 0 -DEAL::7 0 0 -DEAL::7 1 0 -DEAL::7 2 0 -DEAL::7 3 0 -DEAL::7 4 0 -DEAL::7 5 0 -DEAL::7 6 0 -DEAL::7 7 0 -DEAL::7 8 0 -DEAL::7 9 0 -DEAL::8 0 0 -DEAL::8 1 0 -DEAL::8 2 0 -DEAL::8 3 0 -DEAL::8 4 0 -DEAL::8 5 0 -DEAL::8 6 0 -DEAL::8 7 0 -DEAL::8 8 0 -DEAL::8 9 0 -DEAL::9 0 0 -DEAL::9 1 0 -DEAL::9 2 0 -DEAL::9 3 0 -DEAL::9 4 0 -DEAL::9 5 0 -DEAL::9 6 0 -DEAL::9 7 0 -DEAL::9 8 0 -DEAL::9 9 0 +DEAL::3 7 0.0 +DEAL::3 8 0.0 +DEAL::3 9 0.0 +DEAL::4 0 0.0 +DEAL::4 1 0.0 +DEAL::4 2 0.0 +DEAL::4 3 0.0 +DEAL::4 4 0.0 +DEAL::4 5 0.0 +DEAL::4 6 0.0 +DEAL::4 7 0.0 +DEAL::4 8 0.0 +DEAL::4 9 0.0 +DEAL::5 0 0.0 +DEAL::5 1 0.0 +DEAL::5 2 0.0 +DEAL::5 3 0.0 +DEAL::5 4 0.0 +DEAL::5 5 0.0 +DEAL::5 6 0.0 +DEAL::5 7 0.0 +DEAL::5 8 0.0 +DEAL::5 9 0.0 +DEAL::6 0 0.0 +DEAL::6 1 0.0 +DEAL::6 2 0.0 +DEAL::6 3 0.0 +DEAL::6 4 0.0 +DEAL::6 5 0.0 +DEAL::6 6 0.0 +DEAL::6 7 0.0 +DEAL::6 8 0.0 +DEAL::6 9 0.0 +DEAL::7 0 0.0 +DEAL::7 1 0.0 +DEAL::7 2 0.0 +DEAL::7 3 0.0 +DEAL::7 4 0.0 +DEAL::7 5 0.0 +DEAL::7 6 0.0 +DEAL::7 7 0.0 +DEAL::7 8 0.0 +DEAL::7 9 0.0 +DEAL::8 0 0.0 +DEAL::8 1 0.0 +DEAL::8 2 0.0 +DEAL::8 3 0.0 +DEAL::8 4 0.0 +DEAL::8 5 0.0 +DEAL::8 6 0.0 +DEAL::8 7 0.0 +DEAL::8 8 0.0 +DEAL::8 9 0.0 +DEAL::9 0 0.0 +DEAL::9 1 0.0 +DEAL::9 2 0.0 +DEAL::9 3 0.0 +DEAL::9 4 0.0 +DEAL::9 5 0.0 +DEAL::9 6 0.0 +DEAL::9 7 0.0 +DEAL::9 8 0.0 +DEAL::9 9 0.0 diff --git a/tests/full_matrix/full_matrix_31.cc b/tests/full_matrix/full_matrix_31.cc index 34dfef005c..47d09e1cd7 100644 --- a/tests/full_matrix/full_matrix_31.cc +++ b/tests/full_matrix/full_matrix_31.cc @@ -30,7 +30,6 @@ check () { FullMatrix m; make_matrix (m); - m.add_col (2, 3.141, 4); + m.add_col (2, 3.141, 3); print_matrix (m); } - diff --git a/tests/full_matrix/full_matrix_31.output b/tests/full_matrix/full_matrix_31.output index 45f1c60cc4..f3296ecc02 100644 --- a/tests/full_matrix/full_matrix_31.output +++ b/tests/full_matrix/full_matrix_31.output @@ -1,51 +1,41 @@ DEAL::0 0 2.0 DEAL::0 1 3.0 -DEAL::0 2 23. +DEAL::0 2 20. DEAL::0 3 5.0 -DEAL::0 4 6.0 DEAL::1 0 4.0 DEAL::1 1 6.0 -DEAL::1 2 46. +DEAL::1 2 39. DEAL::1 3 10. -DEAL::1 4 12. DEAL::2 0 6.0 DEAL::2 1 9.0 -DEAL::2 2 69. +DEAL::2 2 59. DEAL::2 3 15. -DEAL::2 4 18. DEAL::3 0 8.0 DEAL::3 1 12. -DEAL::3 2 91. +DEAL::3 2 79. DEAL::3 3 20. -DEAL::3 4 24. DEAL::4 0 10. DEAL::4 1 15. -DEAL::4 2 1.1e+02 +DEAL::4 2 99. DEAL::4 3 25. -DEAL::4 4 30. DEAL::0 0 2.0 DEAL::0 1 3.0 -DEAL::0 2 23. +DEAL::0 2 20. DEAL::0 3 5.0 -DEAL::0 4 6.0 DEAL::1 0 4.0 DEAL::1 1 6.0 -DEAL::1 2 46. +DEAL::1 2 39. DEAL::1 3 10. -DEAL::1 4 12. DEAL::2 0 6.0 DEAL::2 1 9.0 -DEAL::2 2 69. +DEAL::2 2 59. DEAL::2 3 15. -DEAL::2 4 18. DEAL::3 0 8.0 DEAL::3 1 12. -DEAL::3 2 91. +DEAL::3 2 79. DEAL::3 3 20. -DEAL::3 4 24. DEAL::4 0 10. DEAL::4 1 15. -DEAL::4 2 1.1e+02 +DEAL::4 2 99. DEAL::4 3 25. -DEAL::4 4 30. diff --git a/tests/full_matrix/full_matrix_32.cc b/tests/full_matrix/full_matrix_32.cc index 61869fd133..97a9421a1a 100644 --- a/tests/full_matrix/full_matrix_32.cc +++ b/tests/full_matrix/full_matrix_32.cc @@ -30,7 +30,6 @@ check () { FullMatrix m; make_matrix (m); - m.add_col (2, 3.141, 4, 2.718, 3); + m.add_col (2, 3.141, 1, 2.718, 3); print_matrix (m); } - diff --git a/tests/full_matrix/full_matrix_32.output b/tests/full_matrix/full_matrix_32.output index c981a2d15e..449bcf458c 100644 --- a/tests/full_matrix/full_matrix_32.output +++ b/tests/full_matrix/full_matrix_32.output @@ -1,51 +1,41 @@ DEAL::0 0 2.0 DEAL::0 1 3.0 -DEAL::0 2 36. +DEAL::0 2 27. DEAL::0 3 5.0 -DEAL::0 4 6.0 DEAL::1 0 4.0 DEAL::1 1 6.0 -DEAL::1 2 73. +DEAL::1 2 54. DEAL::1 3 10. -DEAL::1 4 12. DEAL::2 0 6.0 DEAL::2 1 9.0 -DEAL::2 2 1.1e+02 +DEAL::2 2 81. DEAL::2 3 15. -DEAL::2 4 18. DEAL::3 0 8.0 DEAL::3 1 12. -DEAL::3 2 1.5e+02 +DEAL::3 2 1.1e+02 DEAL::3 3 20. -DEAL::3 4 24. DEAL::4 0 10. DEAL::4 1 15. -DEAL::4 2 1.8e+02 +DEAL::4 2 1.4e+02 DEAL::4 3 25. -DEAL::4 4 30. DEAL::0 0 2.0 DEAL::0 1 3.0 -DEAL::0 2 36. +DEAL::0 2 27. DEAL::0 3 5.0 -DEAL::0 4 6.0 DEAL::1 0 4.0 DEAL::1 1 6.0 -DEAL::1 2 73. +DEAL::1 2 54. DEAL::1 3 10. -DEAL::1 4 12. DEAL::2 0 6.0 DEAL::2 1 9.0 -DEAL::2 2 1.1e+02 +DEAL::2 2 81. DEAL::2 3 15. -DEAL::2 4 18. DEAL::3 0 8.0 DEAL::3 1 12. -DEAL::3 2 1.5e+02 +DEAL::3 2 1.1e+02 DEAL::3 3 20. -DEAL::3 4 24. DEAL::4 0 10. DEAL::4 1 15. -DEAL::4 2 1.8e+02 +DEAL::4 2 1.4e+02 DEAL::4 3 25. -DEAL::4 4 30. diff --git a/tests/full_matrix/full_matrix_34.cc b/tests/full_matrix/full_matrix_34.cc index 91380c5c69..055761bd10 100644 --- a/tests/full_matrix/full_matrix_34.cc +++ b/tests/full_matrix/full_matrix_34.cc @@ -30,7 +30,6 @@ check () { FullMatrix m; make_matrix (m); - m.swap_col (2, 4); + m.swap_col (2, 3); print_matrix (m); } - diff --git a/tests/full_matrix/full_matrix_34.output b/tests/full_matrix/full_matrix_34.output index 0253c8d3ce..092c5ee62f 100644 --- a/tests/full_matrix/full_matrix_34.output +++ b/tests/full_matrix/full_matrix_34.output @@ -1,51 +1,41 @@ DEAL::0 0 2.0 DEAL::0 1 3.0 -DEAL::0 2 6.0 -DEAL::0 3 5.0 -DEAL::0 4 4.0 +DEAL::0 2 5.0 +DEAL::0 3 4.0 DEAL::1 0 4.0 DEAL::1 1 6.0 -DEAL::1 2 12. -DEAL::1 3 10. -DEAL::1 4 8.0 +DEAL::1 2 10. +DEAL::1 3 8.0 DEAL::2 0 6.0 DEAL::2 1 9.0 -DEAL::2 2 18. -DEAL::2 3 15. -DEAL::2 4 12. +DEAL::2 2 15. +DEAL::2 3 12. DEAL::3 0 8.0 DEAL::3 1 12. -DEAL::3 2 24. -DEAL::3 3 20. -DEAL::3 4 16. +DEAL::3 2 20. +DEAL::3 3 16. DEAL::4 0 10. DEAL::4 1 15. -DEAL::4 2 30. -DEAL::4 3 25. -DEAL::4 4 20. +DEAL::4 2 25. +DEAL::4 3 20. DEAL::0 0 2.0 DEAL::0 1 3.0 -DEAL::0 2 6.0 -DEAL::0 3 5.0 -DEAL::0 4 4.0 +DEAL::0 2 5.0 +DEAL::0 3 4.0 DEAL::1 0 4.0 DEAL::1 1 6.0 -DEAL::1 2 12. -DEAL::1 3 10. -DEAL::1 4 8.0 +DEAL::1 2 10. +DEAL::1 3 8.0 DEAL::2 0 6.0 DEAL::2 1 9.0 -DEAL::2 2 18. -DEAL::2 3 15. -DEAL::2 4 12. +DEAL::2 2 15. +DEAL::2 3 12. DEAL::3 0 8.0 DEAL::3 1 12. -DEAL::3 2 24. -DEAL::3 3 20. -DEAL::3 4 16. +DEAL::3 2 20. +DEAL::3 3 16. DEAL::4 0 10. DEAL::4 1 15. -DEAL::4 2 30. -DEAL::4 3 25. -DEAL::4 4 20. +DEAL::4 2 25. +DEAL::4 3 20. diff --git a/tests/full_matrix/full_matrix_45.cc b/tests/full_matrix/full_matrix_45.cc index f690041a1f..46ae4c5544 100644 --- a/tests/full_matrix/full_matrix_45.cc +++ b/tests/full_matrix/full_matrix_45.cc @@ -31,8 +31,8 @@ check () FullMatrix m; make_matrix (m); Vector v, w; - make_vector (v); - make_vector (w); + make_range_vector (v); + make_domain_vector (w); m.vmult (v, w, true); print_vector (v); @@ -42,4 +42,3 @@ check () print_vector (v); print_vector (w); } - diff --git a/tests/full_matrix/full_matrix_45.output b/tests/full_matrix/full_matrix_45.output index 56a587a10c..96c50e482c 100644 --- a/tests/full_matrix/full_matrix_45.output +++ b/tests/full_matrix/full_matrix_45.output @@ -1,41 +1,37 @@ -DEAL::0 71. -DEAL::1 1.4e+02 -DEAL::2 2.1e+02 -DEAL::3 2.8e+02 -DEAL::4 3.6e+02 +DEAL::0 41. +DEAL::1 82. +DEAL::2 1.2e+02 +DEAL::3 1.6e+02 +DEAL::4 2.0e+02 DEAL::0 1.0 DEAL::1 2.0 DEAL::2 3.0 DEAL::3 4.0 -DEAL::4 5.0 -DEAL::0 70. -DEAL::1 1.4e+02 -DEAL::2 2.1e+02 -DEAL::3 2.8e+02 -DEAL::4 3.5e+02 +DEAL::0 40. +DEAL::1 80. +DEAL::2 1.2e+02 +DEAL::3 1.6e+02 +DEAL::4 2.0e+02 DEAL::0 1.0 DEAL::1 2.0 DEAL::2 3.0 DEAL::3 4.0 -DEAL::4 5.0 -DEAL::0 71. -DEAL::1 1.4e+02 -DEAL::2 2.1e+02 -DEAL::3 2.8e+02 -DEAL::4 3.6e+02 +DEAL::0 41. +DEAL::1 82. +DEAL::2 1.2e+02 +DEAL::3 1.6e+02 +DEAL::4 2.0e+02 DEAL::0 1.0 DEAL::1 2.0 DEAL::2 3.0 DEAL::3 4.0 -DEAL::4 5.0 -DEAL::0 70. -DEAL::1 1.4e+02 -DEAL::2 2.1e+02 -DEAL::3 2.8e+02 -DEAL::4 3.5e+02 +DEAL::0 40. +DEAL::1 80. +DEAL::2 1.2e+02 +DEAL::3 1.6e+02 +DEAL::4 2.0e+02 DEAL::0 1.0 DEAL::1 2.0 DEAL::2 3.0 DEAL::3 4.0 -DEAL::4 5.0 diff --git a/tests/full_matrix/full_matrix_46.cc b/tests/full_matrix/full_matrix_46.cc index 3f94b00596..ba96995967 100644 --- a/tests/full_matrix/full_matrix_46.cc +++ b/tests/full_matrix/full_matrix_46.cc @@ -31,11 +31,10 @@ check () FullMatrix m; make_matrix (m); Vector v, w; - make_vector (v); - make_vector (w); + make_range_vector (v); + make_domain_vector (w); m.vmult_add (v, w); print_vector (v); print_vector (w); } - diff --git a/tests/full_matrix/full_matrix_46.output b/tests/full_matrix/full_matrix_46.output index c2e6529d2d..c260a2f5d6 100644 --- a/tests/full_matrix/full_matrix_46.output +++ b/tests/full_matrix/full_matrix_46.output @@ -1,21 +1,19 @@ -DEAL::0 71. -DEAL::1 1.4e+02 -DEAL::2 2.1e+02 -DEAL::3 2.8e+02 -DEAL::4 3.6e+02 +DEAL::0 41. +DEAL::1 82. +DEAL::2 1.2e+02 +DEAL::3 1.6e+02 +DEAL::4 2.0e+02 DEAL::0 1.0 DEAL::1 2.0 DEAL::2 3.0 DEAL::3 4.0 -DEAL::4 5.0 -DEAL::0 71. -DEAL::1 1.4e+02 -DEAL::2 2.1e+02 -DEAL::3 2.8e+02 -DEAL::4 3.6e+02 +DEAL::0 41. +DEAL::1 82. +DEAL::2 1.2e+02 +DEAL::3 1.6e+02 +DEAL::4 2.0e+02 DEAL::0 1.0 DEAL::1 2.0 DEAL::2 3.0 DEAL::3 4.0 -DEAL::4 5.0 diff --git a/tests/full_matrix/full_matrix_50.cc b/tests/full_matrix/full_matrix_50.cc index 3794dcffe1..472143d7b9 100644 --- a/tests/full_matrix/full_matrix_50.cc +++ b/tests/full_matrix/full_matrix_50.cc @@ -31,13 +31,12 @@ check () FullMatrix m; make_matrix (m); Vector v, w, x; - make_vector (v); - make_vector (w); - make_vector (x); + make_range_vector (v); + make_domain_vector (w); + make_range_vector (x); m.residual (v, w, x); print_vector (v); print_vector (w); print_vector (x); } - diff --git a/tests/full_matrix/full_matrix_50.output b/tests/full_matrix/full_matrix_50.output index 648d9f4139..4d3ff08446 100644 --- a/tests/full_matrix/full_matrix_50.output +++ b/tests/full_matrix/full_matrix_50.output @@ -1,29 +1,27 @@ -DEAL::0 -69. -DEAL::1 -1.4e+02 -DEAL::2 -2.1e+02 -DEAL::3 -2.8e+02 -DEAL::4 -3.4e+02 +DEAL::0 -39. +DEAL::1 -78. +DEAL::2 -1.2e+02 +DEAL::3 -1.6e+02 +DEAL::4 -2.0e+02 DEAL::0 1.0 DEAL::1 2.0 DEAL::2 3.0 DEAL::3 4.0 -DEAL::4 5.0 DEAL::0 1.0 DEAL::1 2.0 DEAL::2 3.0 DEAL::3 4.0 DEAL::4 5.0 -DEAL::0 -69. -DEAL::1 -1.4e+02 -DEAL::2 -2.1e+02 -DEAL::3 -2.8e+02 -DEAL::4 -3.4e+02 +DEAL::0 -39. +DEAL::1 -78. +DEAL::2 -1.2e+02 +DEAL::3 -1.6e+02 +DEAL::4 -2.0e+02 DEAL::0 1.0 DEAL::1 2.0 DEAL::2 3.0 DEAL::3 4.0 -DEAL::4 5.0 DEAL::0 1.0 DEAL::1 2.0 DEAL::2 3.0 diff --git a/tests/full_matrix/full_matrix_67.output b/tests/full_matrix/full_matrix_67.output index f4acfa766a..1156ddbe6d 100644 --- a/tests/full_matrix/full_matrix_67.output +++ b/tests/full_matrix/full_matrix_67.output @@ -1,201 +1,201 @@ -DEAL::0 0 0 -DEAL::0 1 0 -DEAL::0 2 0 -DEAL::0 3 0 -DEAL::0 4 0 -DEAL::0 5 0 -DEAL::0 6 0 -DEAL::0 7 0 -DEAL::0 8 0 -DEAL::0 9 0 -DEAL::1 0 0 -DEAL::1 1 0 -DEAL::1 2 0 -DEAL::1 3 0 -DEAL::1 4 0 -DEAL::1 5 0 -DEAL::1 6 0 -DEAL::1 7 0 -DEAL::1 8 0 -DEAL::1 9 0 -DEAL::2 0 0 -DEAL::2 1 0 -DEAL::2 2 0 -DEAL::2 3 0 -DEAL::2 4 0 -DEAL::2 5 0 -DEAL::2 6 0 -DEAL::2 7 0 -DEAL::2 8 0 -DEAL::2 9 0 -DEAL::3 0 0 -DEAL::3 1 0 -DEAL::3 2 0 -DEAL::3 3 0 +DEAL::0 0 0.0 +DEAL::0 1 0.0 +DEAL::0 2 0.0 +DEAL::0 3 0.0 +DEAL::0 4 0.0 +DEAL::0 5 0.0 +DEAL::0 6 0.0 +DEAL::0 7 0.0 +DEAL::0 8 0.0 +DEAL::0 9 0.0 +DEAL::1 0 0.0 +DEAL::1 1 0.0 +DEAL::1 2 0.0 +DEAL::1 3 0.0 +DEAL::1 4 0.0 +DEAL::1 5 0.0 +DEAL::1 6 0.0 +DEAL::1 7 0.0 +DEAL::1 8 0.0 +DEAL::1 9 0.0 +DEAL::2 0 0.0 +DEAL::2 1 0.0 +DEAL::2 2 0.0 +DEAL::2 3 0.0 +DEAL::2 4 0.0 +DEAL::2 5 0.0 +DEAL::2 6 0.0 +DEAL::2 7 0.0 +DEAL::2 8 0.0 +DEAL::2 9 0.0 +DEAL::3 0 0.0 +DEAL::3 1 0.0 +DEAL::3 2 0.0 +DEAL::3 3 0.0 DEAL::3 4 2.0 DEAL::3 5 3.0 DEAL::3 6 4.0 DEAL::3 7 5.0 -DEAL::3 8 6.0 -DEAL::3 9 0 -DEAL::4 0 0 -DEAL::4 1 0 -DEAL::4 2 0 -DEAL::4 3 0 +DEAL::3 8 0.0 +DEAL::3 9 0.0 +DEAL::4 0 0.0 +DEAL::4 1 0.0 +DEAL::4 2 0.0 +DEAL::4 3 0.0 DEAL::4 4 4.0 DEAL::4 5 6.0 DEAL::4 6 8.0 DEAL::4 7 10. -DEAL::4 8 12. -DEAL::4 9 0 -DEAL::5 0 0 -DEAL::5 1 0 -DEAL::5 2 0 -DEAL::5 3 0 +DEAL::4 8 0.0 +DEAL::4 9 0.0 +DEAL::5 0 0.0 +DEAL::5 1 0.0 +DEAL::5 2 0.0 +DEAL::5 3 0.0 DEAL::5 4 6.0 DEAL::5 5 9.0 DEAL::5 6 12. DEAL::5 7 15. -DEAL::5 8 18. -DEAL::5 9 0 -DEAL::6 0 0 -DEAL::6 1 0 -DEAL::6 2 0 -DEAL::6 3 0 +DEAL::5 8 0.0 +DEAL::5 9 0.0 +DEAL::6 0 0.0 +DEAL::6 1 0.0 +DEAL::6 2 0.0 +DEAL::6 3 0.0 DEAL::6 4 8.0 DEAL::6 5 12. DEAL::6 6 16. DEAL::6 7 20. -DEAL::6 8 24. -DEAL::6 9 0 -DEAL::7 0 0 -DEAL::7 1 0 -DEAL::7 2 0 -DEAL::7 3 0 +DEAL::6 8 0.0 +DEAL::6 9 0.0 +DEAL::7 0 0.0 +DEAL::7 1 0.0 +DEAL::7 2 0.0 +DEAL::7 3 0.0 DEAL::7 4 10. DEAL::7 5 15. DEAL::7 6 20. DEAL::7 7 25. -DEAL::7 8 30. -DEAL::7 9 0 -DEAL::8 0 0 -DEAL::8 1 0 -DEAL::8 2 0 -DEAL::8 3 0 -DEAL::8 4 0 -DEAL::8 5 0 -DEAL::8 6 0 -DEAL::8 7 0 -DEAL::8 8 0 -DEAL::8 9 0 -DEAL::9 0 0 -DEAL::9 1 0 -DEAL::9 2 0 -DEAL::9 3 0 -DEAL::9 4 0 -DEAL::9 5 0 -DEAL::9 6 0 -DEAL::9 7 0 -DEAL::9 8 0 -DEAL::9 9 0 -DEAL::0 0 0 -DEAL::0 1 0 -DEAL::0 2 0 -DEAL::0 3 0 -DEAL::0 4 0 -DEAL::0 5 0 -DEAL::0 6 0 -DEAL::0 7 0 -DEAL::0 8 0 -DEAL::0 9 0 -DEAL::1 0 0 -DEAL::1 1 0 -DEAL::1 2 0 -DEAL::1 3 0 -DEAL::1 4 0 -DEAL::1 5 0 -DEAL::1 6 0 -DEAL::1 7 0 -DEAL::1 8 0 -DEAL::1 9 0 -DEAL::2 0 0 -DEAL::2 1 0 -DEAL::2 2 0 -DEAL::2 3 0 -DEAL::2 4 0 -DEAL::2 5 0 -DEAL::2 6 0 -DEAL::2 7 0 -DEAL::2 8 0 -DEAL::2 9 0 -DEAL::3 0 0 -DEAL::3 1 0 -DEAL::3 2 0 -DEAL::3 3 0 +DEAL::7 8 0.0 +DEAL::7 9 0.0 +DEAL::8 0 0.0 +DEAL::8 1 0.0 +DEAL::8 2 0.0 +DEAL::8 3 0.0 +DEAL::8 4 0.0 +DEAL::8 5 0.0 +DEAL::8 6 0.0 +DEAL::8 7 0.0 +DEAL::8 8 0.0 +DEAL::8 9 0.0 +DEAL::9 0 0.0 +DEAL::9 1 0.0 +DEAL::9 2 0.0 +DEAL::9 3 0.0 +DEAL::9 4 0.0 +DEAL::9 5 0.0 +DEAL::9 6 0.0 +DEAL::9 7 0.0 +DEAL::9 8 0.0 +DEAL::9 9 0.0 +DEAL::0 0 0.0 +DEAL::0 1 0.0 +DEAL::0 2 0.0 +DEAL::0 3 0.0 +DEAL::0 4 0.0 +DEAL::0 5 0.0 +DEAL::0 6 0.0 +DEAL::0 7 0.0 +DEAL::0 8 0.0 +DEAL::0 9 0.0 +DEAL::1 0 0.0 +DEAL::1 1 0.0 +DEAL::1 2 0.0 +DEAL::1 3 0.0 +DEAL::1 4 0.0 +DEAL::1 5 0.0 +DEAL::1 6 0.0 +DEAL::1 7 0.0 +DEAL::1 8 0.0 +DEAL::1 9 0.0 +DEAL::2 0 0.0 +DEAL::2 1 0.0 +DEAL::2 2 0.0 +DEAL::2 3 0.0 +DEAL::2 4 0.0 +DEAL::2 5 0.0 +DEAL::2 6 0.0 +DEAL::2 7 0.0 +DEAL::2 8 0.0 +DEAL::2 9 0.0 +DEAL::3 0 0.0 +DEAL::3 1 0.0 +DEAL::3 2 0.0 +DEAL::3 3 0.0 DEAL::3 4 2.0 DEAL::3 5 3.0 DEAL::3 6 4.0 DEAL::3 7 5.0 -DEAL::3 8 6.0 -DEAL::3 9 0 -DEAL::4 0 0 -DEAL::4 1 0 -DEAL::4 2 0 -DEAL::4 3 0 +DEAL::3 8 0.0 +DEAL::3 9 0.0 +DEAL::4 0 0.0 +DEAL::4 1 0.0 +DEAL::4 2 0.0 +DEAL::4 3 0.0 DEAL::4 4 4.0 DEAL::4 5 6.0 DEAL::4 6 8.0 DEAL::4 7 10. -DEAL::4 8 12. -DEAL::4 9 0 -DEAL::5 0 0 -DEAL::5 1 0 -DEAL::5 2 0 -DEAL::5 3 0 +DEAL::4 8 0.0 +DEAL::4 9 0.0 +DEAL::5 0 0.0 +DEAL::5 1 0.0 +DEAL::5 2 0.0 +DEAL::5 3 0.0 DEAL::5 4 6.0 DEAL::5 5 9.0 DEAL::5 6 12. DEAL::5 7 15. -DEAL::5 8 18. -DEAL::5 9 0 -DEAL::6 0 0 -DEAL::6 1 0 -DEAL::6 2 0 -DEAL::6 3 0 +DEAL::5 8 0.0 +DEAL::5 9 0.0 +DEAL::6 0 0.0 +DEAL::6 1 0.0 +DEAL::6 2 0.0 +DEAL::6 3 0.0 DEAL::6 4 8.0 DEAL::6 5 12. DEAL::6 6 16. DEAL::6 7 20. -DEAL::6 8 24. -DEAL::6 9 0 -DEAL::7 0 0 -DEAL::7 1 0 -DEAL::7 2 0 -DEAL::7 3 0 +DEAL::6 8 0.0 +DEAL::6 9 0.0 +DEAL::7 0 0.0 +DEAL::7 1 0.0 +DEAL::7 2 0.0 +DEAL::7 3 0.0 DEAL::7 4 10. DEAL::7 5 15. DEAL::7 6 20. DEAL::7 7 25. -DEAL::7 8 30. -DEAL::7 9 0 -DEAL::8 0 0 -DEAL::8 1 0 -DEAL::8 2 0 -DEAL::8 3 0 -DEAL::8 4 0 -DEAL::8 5 0 -DEAL::8 6 0 -DEAL::8 7 0 -DEAL::8 8 0 -DEAL::8 9 0 -DEAL::9 0 0 -DEAL::9 1 0 -DEAL::9 2 0 -DEAL::9 3 0 -DEAL::9 4 0 -DEAL::9 5 0 -DEAL::9 6 0 -DEAL::9 7 0 -DEAL::9 8 0 -DEAL::9 9 0 +DEAL::7 8 0.0 +DEAL::7 9 0.0 +DEAL::8 0 0.0 +DEAL::8 1 0.0 +DEAL::8 2 0.0 +DEAL::8 3 0.0 +DEAL::8 4 0.0 +DEAL::8 5 0.0 +DEAL::8 6 0.0 +DEAL::8 7 0.0 +DEAL::8 8 0.0 +DEAL::8 9 0.0 +DEAL::9 0 0.0 +DEAL::9 1 0.0 +DEAL::9 2 0.0 +DEAL::9 3 0.0 +DEAL::9 4 0.0 +DEAL::9 5 0.0 +DEAL::9 6 0.0 +DEAL::9 7 0.0 +DEAL::9 8 0.0 +DEAL::9 9 0.0 -- 2.39.5