From f4d0c51995a18179248085b6e50d7e0fda3a31b5 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sun, 26 Feb 2017 15:32:04 +0100 Subject: [PATCH] Make bits/fe_tools pass for Intel-17 --- tests/bits/fe_tools_05.output | 12 ++++++------ tests/bits/fe_tools_06.output | 8 ++++---- tests/bits/fe_tools_06b.output | 8 ++++---- tests/bits/fe_tools_06c.output | 2 +- tests/bits/fe_tools_06d.output | 2 +- tests/bits/fe_tools_common.h | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/bits/fe_tools_05.output b/tests/bits/fe_tools_05.output index 6a61533416..0637cfe56f 100644 --- a/tests/bits/fe_tools_05.output +++ b/tests/bits/fe_tools_05.output @@ -50,10 +50,10 @@ DEAL::Checking Q2 against Q2 in 2d: DEAL::1387.7500 221.45661 56.000000 DEAL::0 2.0000000 4.0000000 6.0000000 8.0000000 10.000000 12.000000 14.000000 16.000000 18.000000 20.000000 22.000000 24.000000 26.000000 28.000000 6.0000000 32.000000 34.000000 4.8750000 38.000000 40.000000 42.000000 44.000000 46.000000 48.000000 12.000000 8.2500000 54.000000 56.000000 DEAL::Checking Q2 against Q2 in 3d: -DEAL::37413.562 2632.5886 320.00000 +DEAL::37413.563 2632.5886 320.00000 DEAL::0 16.000000 32.000000 48.000000 64.000000 80.000000 96.000000 112.00000 128.00000 144.00000 18.500000 176.00000 192.00000 48.125000 224.00000 240.00000 256.00000 37.000000 288.00000 85.015625 320.00000 DEAL::Checking Q2 against Q2 in 3d: -DEAL::37413.562 2632.5886 320.00000 +DEAL::37413.563 2632.5886 320.00000 DEAL::0 16.000000 32.000000 48.000000 64.000000 80.000000 96.000000 112.00000 128.00000 144.00000 18.500000 176.00000 192.00000 48.125000 224.00000 240.00000 256.00000 37.000000 288.00000 85.015625 320.00000 DEAL::Checking Q2 against Q3 in 1d: DEAL::Checking Q3 against Q2 in 1d: @@ -61,14 +61,14 @@ DEAL::Checking Q2 against Q3 in 2d: DEAL::2992.4000 327.73594 57.199149 DEAL::0 3.8472136 5.8763932 7.4319350 8.8111456 13.682755 17.000000 19.847214 21.448065 25.000000 25.134752 29.074690 33.083282 31.383870 3.4819660 38.000000 42.130495 37.793112 45.923607 45.934752 47.240325 50.492724 12.570820 52.007214 DEAL::Checking Q3 against Q2 in 2d: -DEAL::2748.7812 448.66465 122.62500 -DEAL::0 2.0000000 5.3750000 10.500000 16.500000 17.000000 23.500000 29.796875 29.000000 31.000000 35.625000 40.500000 44.000000 47.000000 53.625000 10.500000 63.500000 68.703125 8.2500000 75.000000 78.000000 86.750000 87.000000 90.000000 96.375000 23.500000 16.000000 122.62500 117.17187 +DEAL::2748.7813 448.66465 122.62500 +DEAL::0 2.0000000 5.3750000 10.500000 16.500000 17.000000 23.500000 29.796875 29.000000 31.000000 35.625000 40.500000 44.000000 47.000000 53.625000 10.500000 63.500000 68.703125 8.2500000 75.000000 78.000000 86.750000 87.000000 90.000000 96.375000 23.500000 16.000000 122.62500 117.17188 DEAL::Checking Q2 against Q3 in 3d: DEAL::117697.54 4784.8654 333.00157 DEAL::0 20.610820 40.024922 57.047214 73.523607 63.435063 101.33633 123.58164 139.75279 18.758359 168.45403 180.53929 177.84503 203.80076 242.17183 247.87639 267.60263 40.921478 67.668421 35.000000 297.68124 DEAL::Checking Q3 against Q2 in 3d: -DEAL::102238.74 7352.0313 942.70312 -DEAL::0 30.125000 80.000000 115.00000 159.75000 206.76562 290.07812 287.00000 336.37500 369.87500 41.656250 488.85937 539.12500 136.10937 617.00000 702.37500 707.84375 84.375000 815.25000 233.48633 936.95898 +DEAL::102238.74 7352.0313 942.70313 +DEAL::0 30.125000 80.000000 115.00000 159.75000 206.76563 290.07813 287.00000 336.37500 369.87500 41.656250 488.85938 539.12500 136.10938 617.00000 702.37500 707.84375 84.375000 815.25000 233.48633 936.95898 DEAL::Checking Q3 against Q3 in 1d: DEAL::Checking Q3 against Q3 in 1d: DEAL::Checking Q3 against Q3 in 2d: diff --git a/tests/bits/fe_tools_06.output b/tests/bits/fe_tools_06.output index 88e8081749..34e144f72f 100644 --- a/tests/bits/fe_tools_06.output +++ b/tests/bits/fe_tools_06.output @@ -50,22 +50,22 @@ DEAL::Checking Q2 against Q2 in 2d: DEAL::1387.7500 221.45661 56.000000 DEAL::0 2.0000000 4.0000000 6.0000000 8.0000000 10.000000 12.000000 14.000000 16.000000 18.000000 20.000000 22.000000 24.000000 26.000000 28.000000 6.0000000 32.000000 34.000000 4.8750000 38.000000 40.000000 42.000000 44.000000 46.000000 48.000000 12.000000 8.2500000 54.000000 56.000000 DEAL::Checking Q2 against Q2 in 3d: -DEAL::37413.562 2632.5886 320.00000 +DEAL::37413.563 2632.5886 320.00000 DEAL::0 16.000000 32.000000 48.000000 64.000000 80.000000 96.000000 112.00000 128.00000 144.00000 18.500000 176.00000 192.00000 48.125000 224.00000 240.00000 256.00000 37.000000 288.00000 85.015625 320.00000 DEAL::Checking Q2 against Q2 in 3d: -DEAL::37413.562 2632.5886 320.00000 +DEAL::37413.563 2632.5886 320.00000 DEAL::0 16.000000 32.000000 48.000000 64.000000 80.000000 96.000000 112.00000 128.00000 144.00000 18.500000 176.00000 192.00000 48.125000 224.00000 240.00000 256.00000 37.000000 288.00000 85.015625 320.00000 DEAL::Checking Q2 against Q3 in 1d: DEAL::Checking Q3 against Q2 in 1d: DEAL::Checking Q2 against Q3 in 2d: -DEAL::1413.7812 227.03943 61.343750 +DEAL::1413.7813 227.03943 61.343750 DEAL::0 2.0000000 4.0000000 6.0000000 8.0000000 10.000000 12.000000 14.000000 16.000000 18.000000 20.000000 22.000000 24.000000 26.000000 28.000000 6.0000000 35.000000 37.578125 4.8750000 38.000000 40.000000 42.000000 44.000000 46.000000 48.000000 12.000000 8.2500000 54.000000 61.343750 DEAL::Checking Q3 against Q2 in 2d: DEAL::5826.4000 648.05573 124.99727 DEAL::0 4.9472136 10.276393 14.394427 17.145898 27.786068 30.000000 34.947214 40.605573 45.000000 47.369505 56.580495 50.366061 52.182485 5.6257354 75.000000 86.431811 78.015403 89.723607 93.369505 104.68936 117.70474 24.427051 91.406905 DEAL::Checking Q2 against Q3 in 3d: DEAL::39000.598 2789.1175 390.65430 -DEAL::0 16.000000 32.000000 48.000000 64.000000 80.000000 96.000000 112.00000 128.00000 144.00000 18.500000 194.76562 207.23438 48.125000 224.00000 240.00000 256.00000 37.000000 314.25000 85.015625 390.65430 +DEAL::0 16.000000 32.000000 48.000000 64.000000 80.000000 96.000000 112.00000 128.00000 144.00000 18.500000 194.76563 207.23438 48.125000 224.00000 240.00000 256.00000 37.000000 314.25000 85.015625 390.65430 DEAL::Checking Q3 against Q2 in 3d: DEAL::308212.00 12700.333 1094.4945 DEAL::0 46.841641 100.33313 134.94721 179.72361 178.31897 279.54427 316.18328 360.05279 40.261552 494.58532 430.84580 535.28945 447.65706 690.54466 675.27639 542.56269 103.88764 185.86202 86.750000 1044.9429 diff --git a/tests/bits/fe_tools_06b.output b/tests/bits/fe_tools_06b.output index 88e8081749..34e144f72f 100644 --- a/tests/bits/fe_tools_06b.output +++ b/tests/bits/fe_tools_06b.output @@ -50,22 +50,22 @@ DEAL::Checking Q2 against Q2 in 2d: DEAL::1387.7500 221.45661 56.000000 DEAL::0 2.0000000 4.0000000 6.0000000 8.0000000 10.000000 12.000000 14.000000 16.000000 18.000000 20.000000 22.000000 24.000000 26.000000 28.000000 6.0000000 32.000000 34.000000 4.8750000 38.000000 40.000000 42.000000 44.000000 46.000000 48.000000 12.000000 8.2500000 54.000000 56.000000 DEAL::Checking Q2 against Q2 in 3d: -DEAL::37413.562 2632.5886 320.00000 +DEAL::37413.563 2632.5886 320.00000 DEAL::0 16.000000 32.000000 48.000000 64.000000 80.000000 96.000000 112.00000 128.00000 144.00000 18.500000 176.00000 192.00000 48.125000 224.00000 240.00000 256.00000 37.000000 288.00000 85.015625 320.00000 DEAL::Checking Q2 against Q2 in 3d: -DEAL::37413.562 2632.5886 320.00000 +DEAL::37413.563 2632.5886 320.00000 DEAL::0 16.000000 32.000000 48.000000 64.000000 80.000000 96.000000 112.00000 128.00000 144.00000 18.500000 176.00000 192.00000 48.125000 224.00000 240.00000 256.00000 37.000000 288.00000 85.015625 320.00000 DEAL::Checking Q2 against Q3 in 1d: DEAL::Checking Q3 against Q2 in 1d: DEAL::Checking Q2 against Q3 in 2d: -DEAL::1413.7812 227.03943 61.343750 +DEAL::1413.7813 227.03943 61.343750 DEAL::0 2.0000000 4.0000000 6.0000000 8.0000000 10.000000 12.000000 14.000000 16.000000 18.000000 20.000000 22.000000 24.000000 26.000000 28.000000 6.0000000 35.000000 37.578125 4.8750000 38.000000 40.000000 42.000000 44.000000 46.000000 48.000000 12.000000 8.2500000 54.000000 61.343750 DEAL::Checking Q3 against Q2 in 2d: DEAL::5826.4000 648.05573 124.99727 DEAL::0 4.9472136 10.276393 14.394427 17.145898 27.786068 30.000000 34.947214 40.605573 45.000000 47.369505 56.580495 50.366061 52.182485 5.6257354 75.000000 86.431811 78.015403 89.723607 93.369505 104.68936 117.70474 24.427051 91.406905 DEAL::Checking Q2 against Q3 in 3d: DEAL::39000.598 2789.1175 390.65430 -DEAL::0 16.000000 32.000000 48.000000 64.000000 80.000000 96.000000 112.00000 128.00000 144.00000 18.500000 194.76562 207.23438 48.125000 224.00000 240.00000 256.00000 37.000000 314.25000 85.015625 390.65430 +DEAL::0 16.000000 32.000000 48.000000 64.000000 80.000000 96.000000 112.00000 128.00000 144.00000 18.500000 194.76563 207.23438 48.125000 224.00000 240.00000 256.00000 37.000000 314.25000 85.015625 390.65430 DEAL::Checking Q3 against Q2 in 3d: DEAL::308212.00 12700.333 1094.4945 DEAL::0 46.841641 100.33313 134.94721 179.72361 178.31897 279.54427 316.18328 360.05279 40.261552 494.58532 430.84580 535.28945 447.65706 690.54466 675.27639 542.56269 103.88764 185.86202 86.750000 1044.9429 diff --git a/tests/bits/fe_tools_06c.output b/tests/bits/fe_tools_06c.output index fe2ed23d8d..149ba9604c 100644 --- a/tests/bits/fe_tools_06c.output +++ b/tests/bits/fe_tools_06c.output @@ -40,7 +40,7 @@ DEAL::7750.0000 802.02868 124.00000 DEAL::0 6.0000000 12.000000 18.000000 24.000000 30.000000 36.000000 42.000000 48.000000 54.000000 60.000000 66.000000 72.000000 78.000000 84.000000 90.000000 96.000000 102.00000 108.00000 114.00000 120.00000 DEAL::Checking Q3 against Q1 in 3d: DEAL::2005454.0 51078.396 2170.0000 -DEAL::0 48.787228 143.48529 172.75503 379.45673 270.23932 638.44721 698.61215 823.41277 611.70906 532.38244 470.80009 588.80009 1391.3358 814.71944 1401.4393 1341.1062 1529.8737 1845.4128 1772.5130 2125.2243 +DEAL::0 48.787228 143.48529 172.75503 379.45673 270.23932 638.44721 698.61215 823.41277 611.70906 532.38244 470.80009 588.80009 1391.3358 814.71944 1401.4393 1341.1063 1529.8737 1845.4128 1772.5130 2125.2243 DEAL::Checking Q2 against Q2 in 1d: DEAL::Checking Q2 against Q2 in 1d: DEAL::Checking Q2 against Q2 in 2d: diff --git a/tests/bits/fe_tools_06d.output b/tests/bits/fe_tools_06d.output index fe2ed23d8d..149ba9604c 100644 --- a/tests/bits/fe_tools_06d.output +++ b/tests/bits/fe_tools_06d.output @@ -40,7 +40,7 @@ DEAL::7750.0000 802.02868 124.00000 DEAL::0 6.0000000 12.000000 18.000000 24.000000 30.000000 36.000000 42.000000 48.000000 54.000000 60.000000 66.000000 72.000000 78.000000 84.000000 90.000000 96.000000 102.00000 108.00000 114.00000 120.00000 DEAL::Checking Q3 against Q1 in 3d: DEAL::2005454.0 51078.396 2170.0000 -DEAL::0 48.787228 143.48529 172.75503 379.45673 270.23932 638.44721 698.61215 823.41277 611.70906 532.38244 470.80009 588.80009 1391.3358 814.71944 1401.4393 1341.1062 1529.8737 1845.4128 1772.5130 2125.2243 +DEAL::0 48.787228 143.48529 172.75503 379.45673 270.23932 638.44721 698.61215 823.41277 611.70906 532.38244 470.80009 588.80009 1391.3358 814.71944 1401.4393 1341.1063 1529.8737 1845.4128 1772.5130 2125.2243 DEAL::Checking Q2 against Q2 in 1d: DEAL::Checking Q2 against Q2 in 1d: DEAL::Checking Q2 against Q2 in 2d: diff --git a/tests/bits/fe_tools_common.h b/tests/bits/fe_tools_common.h index 156769eb40..ddef11e916 100644 --- a/tests/bits/fe_tools_common.h +++ b/tests/bits/fe_tools_common.h @@ -187,7 +187,7 @@ main() deallog << std::setprecision (8); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.test_mode(true, 1.e-10, 1.e-7f, 1.e-10); CHECK_ALL(Q,1,Q,1); CHECK_ALL(Q,1,Q,2); -- 2.39.5