From 62e6af16b2f3a34e86988be9b5d141f649f4208c Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 19 Mar 2018 22:33:48 -0500 Subject: [PATCH] tests: lac/*vector_add_and_dot_complex increase output precision --- .../la_parallel_vector_add_and_dot_complex.cc | 7 ++---- ...parallel_vector_add_and_dot_complex.output | 20 ++++++++-------- tests/lac/la_vector_add_and_dot_complex.cc | 7 ++---- .../lac/la_vector_add_and_dot_complex.output | 20 ++++++++-------- tests/lac/vector_add_and_dot_complex.cc | 7 ++---- tests/lac/vector_add_and_dot_complex.output | 24 +++++++++---------- 6 files changed, 38 insertions(+), 47 deletions(-) diff --git a/tests/lac/la_parallel_vector_add_and_dot_complex.cc b/tests/lac/la_parallel_vector_add_and_dot_complex.cc index 22e79c6f19..315864f9b6 100644 --- a/tests/lac/la_parallel_vector_add_and_dot_complex.cc +++ b/tests/lac/la_parallel_vector_add_and_dot_complex.cc @@ -65,11 +65,8 @@ void check () int main() { - std::ofstream logfile("output"); - deallog << std::fixed; - deallog << std::setprecision(2); - deallog.attach(logfile); - + initlog(); + deallog << std::setprecision(8); check(); check(); deallog << "OK" << std::endl; diff --git a/tests/lac/la_parallel_vector_add_and_dot_complex.output b/tests/lac/la_parallel_vector_add_and_dot_complex.output index 0dc50c403e..67591526a9 100644 --- a/tests/lac/la_parallel_vector_add_and_dot_complex.output +++ b/tests/lac/la_parallel_vector_add_and_dot_complex.output @@ -1,9 +1,9 @@ -DEAL::Add and dot should be (1334.79,349.71), is (1334.79,349.71) -DEAL::Add and dot should be (91530.09,22094.70), is (91530.09,22094.70) -DEAL::Add and dot should be (181725.41,43834.06), is (181725.41,43834.06) -DEAL::Add and dot should be (271920.72,65573.37), is (271920.72,65573.37) -DEAL::Add and dot should be (362116.03,87312.66), is (362116.03,87312.66) +DEAL::Add and dot should be (1334.7905,349.71042), is (1334.7905,349.71042) +DEAL::Add and dot should be (91530.094,22094.701), is (91530.094,22094.701) +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.03,87312.664), is (362116.03,87312.664) Process #0 Local range: [0, 17), global size: 17 Vector data: @@ -14,9 +14,9 @@ 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.79,349.71), is (1334.79,349.71) -DEAL::Add and dot should be (91530.09,22094.70), is (91530.09,22094.70) -DEAL::Add and dot should be (181725.40,43834.06), is (181725.40,43834.06) -DEAL::Add and dot should be (271920.71,65573.37), is (271920.71,65573.37) -DEAL::Add and dot should be (362116.02,87312.66), is (362116.02,87312.66) +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.cc b/tests/lac/la_vector_add_and_dot_complex.cc index 45b6e30a15..f9e50a0ef3 100644 --- a/tests/lac/la_vector_add_and_dot_complex.cc +++ b/tests/lac/la_vector_add_and_dot_complex.cc @@ -64,11 +64,8 @@ void check () int main() { - std::ofstream logfile("output"); - deallog << std::fixed; - deallog << std::setprecision(2); - deallog.attach(logfile); - + initlog(); + deallog << std::setprecision(8); check(); check(); deallog << "OK" << std::endl; diff --git a/tests/lac/la_vector_add_and_dot_complex.output b/tests/lac/la_vector_add_and_dot_complex.output index d901301702..2a79919e8c 100644 --- a/tests/lac/la_vector_add_and_dot_complex.output +++ b/tests/lac/la_vector_add_and_dot_complex.output @@ -1,9 +1,9 @@ -DEAL::Add and dot should be (1334.79,349.71), is (1334.79,349.71) -DEAL::Add and dot should be (91530.09,22094.70), is (91530.09,22094.70) -DEAL::Add and dot should be (181725.41,43834.06), is (181725.41,43834.06) -DEAL::Add and dot should be (271920.72,65573.37), is (271920.72,65573.37) -DEAL::Add and dot should be (362116.03,87312.66), is (362116.03,87312.66) +DEAL::Add and dot should be (1334.7905,349.71042), is (1334.7905,349.71042) +DEAL::Add and dot should be (91530.094,22094.701), is (91530.094,22094.701) +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.03,87312.664), is (362116.03,87312.664) IndexSet: {[0,16]} [0]: (2.554e-02,1.842e+00) @@ -44,9 +44,9 @@ IndexSet: {[0,16]} [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.79,349.71), is (1334.79,349.71) -DEAL::Add and dot should be (91530.09,22094.70), is (91530.09,22094.70) -DEAL::Add and dot should be (181725.40,43834.06), is (181725.40,43834.06) -DEAL::Add and dot should be (271920.71,65573.37), is (271920.71,65573.37) -DEAL::Add and dot should be (362116.02,87312.66), is (362116.02,87312.66) +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.cc b/tests/lac/vector_add_and_dot_complex.cc index 45ad3100d9..5324160a6e 100644 --- a/tests/lac/vector_add_and_dot_complex.cc +++ b/tests/lac/vector_add_and_dot_complex.cc @@ -62,11 +62,8 @@ void check () int main() { - std::ofstream logfile("output"); - deallog << std::fixed; - deallog << std::setprecision(2); - deallog.attach(logfile); - + initlog(); + deallog << std::setprecision(8); check(); check(); deallog << "OK" << std::endl; diff --git a/tests/lac/vector_add_and_dot_complex.output b/tests/lac/vector_add_and_dot_complex.output index 1997230214..3db4be8d01 100644 --- a/tests/lac/vector_add_and_dot_complex.output +++ b/tests/lac/vector_add_and_dot_complex.output @@ -1,14 +1,14 @@ -DEAL::Add and dot should be (1334.79,349.71), is (1334.79,349.71) -DEAL::Add and dot should be (91530.09,22094.70), is (91530.09,22094.70) -DEAL::Add and dot should be (181725.41,43834.06), is (181725.41,43834.06) -DEAL::Add and dot should be (271920.72,65573.37), is (271920.72,65573.37) -DEAL::Add and dot should be (362116.03,87312.66), is (362116.03,87312.66) -DEAL::Vector add reference: (0.03,1.84) (0.03,14.44) (0.04,27.04) (0.05,39.65) (0.06,52.25) (0.06,64.85) (0.07,77.45) (0.08,90.05) (0.09,102.65) (0.09,115.25) (0.10,127.86) (0.11,140.46) (0.12,153.06) (0.12,165.66) (0.13,178.26) (0.14,190.86) (0.15,203.46) -DEAL::Vector check reference: (0.03,1.84) (0.03,14.44) (0.04,27.04) (0.05,39.65) (0.06,52.25) (0.06,64.85) (0.07,77.45) (0.08,90.05) (0.09,102.65) (0.09,115.25) (0.10,127.86) (0.11,140.46) (0.12,153.06) (0.12,165.66) (0.13,178.26) (0.14,190.86) (0.15,203.46) -DEAL::Add and dot should be (1334.79,349.71), is (1334.79,349.71) -DEAL::Add and dot should be (91530.09,22094.70), is (91530.09,22094.70) -DEAL::Add and dot should be (181725.40,43834.06), is (181725.40,43834.06) -DEAL::Add and dot should be (271920.71,65573.37), is (271920.71,65573.37) -DEAL::Add and dot should be (362116.02,87312.66), is (362116.02,87312.66) +DEAL::Add and dot should be (1334.7905,349.71042), is (1334.7905,349.71042) +DEAL::Add and dot should be (91530.094,22094.701), is (91530.094,22094.701) +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.03,87312.664), is (362116.03,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