From 6d9ee98c923d4999ee3f16a8de05539404d702a7 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 20 Mar 2018 15:21:08 -0500 Subject: [PATCH] tests: lac/*vector_add_and_dot* These three tests change output slightly (but unfortunately just above our numdiff rounding threshold) depending on whether DEAL_II_MAX_THREADS is set (and to what value). So let's add another output variant for those three tests. --- ...nd_dot_complex.output.DEAL_II_MAX_THREADS2 | 22 ++++++++ ...nd_dot_complex.output.DEAL_II_MAX_THREADS2 | 52 +++++++++++++++++++ ...nd_dot_complex.output.DEAL_II_MAX_THREADS2 | 14 +++++ 3 files changed, 88 insertions(+) create mode 100644 tests/lac/la_parallel_vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 create mode 100644 tests/lac/la_vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 create mode 100644 tests/lac/vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 diff --git a/tests/lac/la_parallel_vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 b/tests/lac/la_parallel_vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 new file mode 100644 index 0000000000..30e0cc1fa5 --- /dev/null +++ b/tests/lac/la_parallel_vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 @@ -0,0 +1,22 @@ + +DEAL::Add and dot should be (1334.7905,349.71042), is (1334.7905,349.71042) +DEAL::Add and dot should be (91530.094,22094.703), is (91530.094,22094.703) +DEAL::Add and dot should be (181725.41,43834.062), is (181725.41,43834.062) +DEAL::Add and dot should be (271920.72,65573.367), is (271920.72,65573.367) +DEAL::Add and dot should be (362116.00,87312.664), is (362116.00,87312.664) +Process #0 +Local range: [0, 17), global size: 17 +Vector data: +(2.554e-02,1.842e+00) (3.311e-02,1.444e+01) (4.069e-02,2.704e+01) (4.827e-02,3.965e+01) (5.585e-02,5.225e+01) (6.342e-02,6.485e+01) (7.100e-02,7.745e+01) (7.858e-02,9.005e+01) (8.616e-02,1.027e+02) (9.373e-02,1.153e+02) (1.013e-01,1.279e+02) (1.089e-01,1.405e+02) (1.165e-01,1.531e+02) (1.240e-01,1.657e+02) (1.316e-01,1.783e+02) (1.392e-01,1.909e+02) (1.468e-01,2.035e+02) +DEAL::Vector add reference: +Process #0 +Local range: [0, 17), global size: 17 +Vector data: +(2.554e-02,1.842e+00) (3.311e-02,1.444e+01) (4.069e-02,2.704e+01) (4.827e-02,3.965e+01) (5.585e-02,5.225e+01) (6.342e-02,6.485e+01) (7.100e-02,7.745e+01) (7.858e-02,9.005e+01) (8.616e-02,1.027e+02) (9.373e-02,1.153e+02) (1.013e-01,1.279e+02) (1.089e-01,1.405e+02) (1.165e-01,1.531e+02) (1.240e-01,1.657e+02) (1.316e-01,1.783e+02) (1.392e-01,1.909e+02) (1.468e-01,2.035e+02) +DEAL::Vector check reference: +DEAL::Add and dot should be (1334.7906,349.71041), is (1334.7906,349.71041) +DEAL::Add and dot should be (91530.091,22094.701), is (91530.091,22094.701) +DEAL::Add and dot should be (181725.40,43834.063), is (181725.40,43834.063) +DEAL::Add and dot should be (271920.71,65573.368), is (271920.71,65573.368) +DEAL::Add and dot should be (362116.02,87312.657), is (362116.02,87312.657) +DEAL::OK diff --git a/tests/lac/la_vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 b/tests/lac/la_vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 new file mode 100644 index 0000000000..7cc4b3feff --- /dev/null +++ b/tests/lac/la_vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 @@ -0,0 +1,52 @@ + +DEAL::Add and dot should be (1334.7905,349.71042), is (1334.7905,349.71042) +DEAL::Add and dot should be (91530.094,22094.703), is (91530.094,22094.703) +DEAL::Add and dot should be (181725.41,43834.062), is (181725.41,43834.062) +DEAL::Add and dot should be (271920.72,65573.367), is (271920.72,65573.367) +DEAL::Add and dot should be (362116.00,87312.664), is (362116.00,87312.664) +IndexSet: {[0,16]} + +[0]: (2.554e-02,1.842e+00) +[1]: (3.311e-02,1.444e+01) +[2]: (4.069e-02,2.704e+01) +[3]: (4.827e-02,3.965e+01) +[4]: (5.585e-02,5.225e+01) +[5]: (6.342e-02,6.485e+01) +[6]: (7.100e-02,7.745e+01) +[7]: (7.858e-02,9.005e+01) +[8]: (8.616e-02,1.027e+02) +[9]: (9.373e-02,1.153e+02) +[10]: (1.013e-01,1.279e+02) +[11]: (1.089e-01,1.405e+02) +[12]: (1.165e-01,1.531e+02) +[13]: (1.240e-01,1.657e+02) +[14]: (1.316e-01,1.783e+02) +[15]: (1.392e-01,1.909e+02) +[16]: (1.468e-01,2.035e+02) +DEAL::Vector add reference: +IndexSet: {[0,16]} + +[0]: (2.554e-02,1.842e+00) +[1]: (3.311e-02,1.444e+01) +[2]: (4.069e-02,2.704e+01) +[3]: (4.827e-02,3.965e+01) +[4]: (5.585e-02,5.225e+01) +[5]: (6.342e-02,6.485e+01) +[6]: (7.100e-02,7.745e+01) +[7]: (7.858e-02,9.005e+01) +[8]: (8.616e-02,1.027e+02) +[9]: (9.373e-02,1.153e+02) +[10]: (1.013e-01,1.279e+02) +[11]: (1.089e-01,1.405e+02) +[12]: (1.165e-01,1.531e+02) +[13]: (1.240e-01,1.657e+02) +[14]: (1.316e-01,1.783e+02) +[15]: (1.392e-01,1.909e+02) +[16]: (1.468e-01,2.035e+02) +DEAL::Vector check reference: +DEAL::Add and dot should be (1334.7906,349.71041), is (1334.7906,349.71041) +DEAL::Add and dot should be (91530.091,22094.701), is (91530.091,22094.701) +DEAL::Add and dot should be (181725.40,43834.063), is (181725.40,43834.063) +DEAL::Add and dot should be (271920.71,65573.368), is (271920.71,65573.368) +DEAL::Add and dot should be (362116.02,87312.657), is (362116.02,87312.657) +DEAL::OK diff --git a/tests/lac/vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 b/tests/lac/vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 new file mode 100644 index 0000000000..12907981a7 --- /dev/null +++ b/tests/lac/vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 @@ -0,0 +1,14 @@ + +DEAL::Add and dot should be (1334.7905,349.71042), is (1334.7905,349.71042) +DEAL::Add and dot should be (91530.094,22094.703), is (91530.094,22094.703) +DEAL::Add and dot should be (181725.41,43834.062), is (181725.41,43834.062) +DEAL::Add and dot should be (271920.72,65573.367), is (271920.72,65573.367) +DEAL::Add and dot should be (362116.00,87312.664), is (362116.00,87312.664) +DEAL::Vector add reference: (0.025536000,1.8415145) (0.033113600,14.442955) (0.040691200,27.044395) (0.048268800,39.645835) (0.055846400,52.247275) (0.063424000,64.848715) (0.071001600,77.450155) (0.078579200,90.051595) (0.086156800,102.65303) (0.093734400,115.25447) (0.10131200,127.85591) (0.10888960,140.45735) (0.11646720,153.05879) (0.12404480,165.66023) (0.13162240,178.26167) (0.13920000,190.86311) (0.14677760,203.46455) +DEAL::Vector check reference: (0.025536000,1.8415145) (0.033113600,14.442955) (0.040691200,27.044395) (0.048268800,39.645835) (0.055846400,52.247275) (0.063424000,64.848715) (0.071001600,77.450155) (0.078579200,90.051595) (0.086156800,102.65303) (0.093734400,115.25447) (0.10131200,127.85591) (0.10888960,140.45735) (0.11646720,153.05879) (0.12404480,165.66023) (0.13162240,178.26167) (0.13920000,190.86311) (0.14677760,203.46455) +DEAL::Add and dot should be (1334.7906,349.71041), is (1334.7906,349.71041) +DEAL::Add and dot should be (91530.091,22094.701), is (91530.091,22094.701) +DEAL::Add and dot should be (181725.40,43834.063), is (181725.40,43834.063) +DEAL::Add and dot should be (271920.71,65573.368), is (271920.71,65573.368) +DEAL::Add and dot should be (362116.02,87312.657), is (362116.02,87312.657) +DEAL::OK -- 2.39.5