From: kanschat Date: Thu, 24 Jan 2008 05:31:14 +0000 (+0000) Subject: tests must be changed for new LogStream X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db70ad19f43808ca9c91d130162901bd0b321288;p=dealii-svn.git tests must be changed for new LogStream git-svn-id: https://svn.dealii.org/trunk@15662 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/deal.II/block_matrices.cc b/tests/deal.II/block_matrices.cc index edf7b20f1b..753f0dbb2d 100644 --- a/tests/deal.II/block_matrices.cc +++ b/tests/deal.II/block_matrices.cc @@ -353,7 +353,7 @@ void LaplaceProblem::run () int main () { std::ofstream logfile("block_matrices/output"); - logfile.precision(2); + deallog << std::setprecision(2); deallog.attach(logfile); deallog.depth_console(0); @@ -418,7 +418,7 @@ int main () Assert (solutions[i].size() == solutions[i].size(), ExcInternalError()); - logfile.precision(16); + deallog << std::setprecision(16); for (unsigned int i=1; i::run () int main () { deallog.depth_console (0); - logfile.precision(2); + logfile << std::setprecision(2); + deallog << std::setprecision(2); LaplaceProblem<2> laplace_problem_2d; laplace_problem_2d.run (); diff --git a/tests/deal.II/derivative_approximation.cc b/tests/deal.II/derivative_approximation.cc index 13513e3704..df83125b2c 100644 --- a/tests/deal.II/derivative_approximation.cc +++ b/tests/deal.II/derivative_approximation.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2004 by the deal.II authors +// Copyright (C) 2000, 2001, 2004, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -77,8 +77,8 @@ check () int main () { std::ofstream logfile ("derivative_approximation/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/derivative_approximation_2.cc b/tests/deal.II/derivative_approximation_2.cc index 96f421a969..38e184d5ee 100644 --- a/tests/deal.II/derivative_approximation_2.cc +++ b/tests/deal.II/derivative_approximation_2.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include using namespace std; diff --git a/tests/deal.II/derivatives.cc b/tests/deal.II/derivatives.cc index 18c7c3232a..7d151f9ef3 100644 --- a/tests/deal.II/derivatives.cc +++ b/tests/deal.II/derivatives.cc @@ -213,8 +213,8 @@ void loop () int main () { std::ofstream logfile ("derivatives/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); if (!errors) deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/dof_renumbering.cc b/tests/deal.II/dof_renumbering.cc index c7799a7978..a965a5dbfb 100644 --- a/tests/deal.II/dof_renumbering.cc +++ b/tests/deal.II/dof_renumbering.cc @@ -177,8 +177,8 @@ check () int main () { std::ofstream logfile ("dof_renumbering/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/dof_renumbering_02.cc b/tests/deal.II/dof_renumbering_02.cc index 9b4533e63d..ea878520c6 100644 --- a/tests/deal.II/dof_renumbering_02.cc +++ b/tests/deal.II/dof_renumbering_02.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2003, 2004, 2007 by the deal.II authors +// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -159,8 +159,8 @@ check () int main () { std::ofstream logfile ("dof_renumbering_02/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/error_estimator.cc b/tests/deal.II/error_estimator.cc index 99252906e5..f92c13d955 100644 --- a/tests/deal.II/error_estimator.cc +++ b/tests/deal.II/error_estimator.cc @@ -115,8 +115,8 @@ check () int main () { std::ofstream logfile ("error_estimator/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/face_orientations_3d.cc b/tests/deal.II/face_orientations_3d.cc index 8d71253609..42b8dffb7b 100644 --- a/tests/deal.II/face_orientations_3d.cc +++ b/tests/deal.II/face_orientations_3d.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -28,6 +28,7 @@ #include #include +#include std::ofstream logfile("face_orientations_3d/output"); @@ -72,7 +73,7 @@ void test (const char *filename) int main () { - logfile.precision (2); + deallog << std::setprecision (2); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/fe_tables.cc b/tests/deal.II/fe_tables.cc index dade1d71d6..810514c973 100644 --- a/tests/deal.II/fe_tables.cc +++ b/tests/deal.II/fe_tables.cc @@ -104,8 +104,8 @@ int main() deallog.depth_console(0); deallog.threshold_double(1.e-10); - logfile.precision(4); - logfile.setf(std::ios::fixed); + deallog << std::setprecision(4); + deallog << std::fixed; deallog.push("GeometryInfo"); diff --git a/tests/deal.II/filtered_iterator.cc b/tests/deal.II/filtered_iterator.cc index b2be8095c3..73141c7c5d 100644 --- a/tests/deal.II/filtered_iterator.cc +++ b/tests/deal.II/filtered_iterator.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -218,7 +219,7 @@ void test () int main () { - logfile.precision(4); + deallog << std::setprecision(4); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/filtered_matrix.cc b/tests/deal.II/filtered_matrix.cc index 19e245e22d..4956409096 100644 --- a/tests/deal.II/filtered_matrix.cc +++ b/tests/deal.II/filtered_matrix.cc @@ -200,8 +200,8 @@ check () int main () { std::ofstream logfile ("filtered_matrix/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/grid_generator_01.cc b/tests/deal.II/grid_generator_01.cc index c26c20cc81..b852467592 100644 --- a/tests/deal.II/grid_generator_01.cc +++ b/tests/deal.II/grid_generator_01.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2007 by the deal.II authors +// Copyright (C) 2007, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -24,6 +24,7 @@ #include #include +#include std::ofstream logfile("grid_generator_01/output"); diff --git a/tests/deal.II/grid_hyper_shell.cc b/tests/deal.II/grid_hyper_shell.cc index 7a45b20890..7d8c0458f4 100644 --- a/tests/deal.II/grid_hyper_shell.cc +++ b/tests/deal.II/grid_hyper_shell.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2007 by the deal.II authors +// Copyright (C) 2007, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -25,6 +25,7 @@ #include #include +#include std::ofstream logfile("grid_hyper_shell/output"); diff --git a/tests/deal.II/grid_in.cc b/tests/deal.II/grid_in.cc index ddd603637a..b3b7b62085 100644 --- a/tests/deal.II/grid_in.cc +++ b/tests/deal.II/grid_in.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005, 2007 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -25,6 +25,7 @@ #include #include +#include #include std::ofstream logfile("grid_in/output"); @@ -108,7 +109,8 @@ void filename_resolution() int main () { - logfile.precision (2); + deallog << std::setprecision (2); + logfile << std::setprecision (2); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/grid_in_3d.cc b/tests/deal.II/grid_in_3d.cc index e7e1660be7..da7a6f8254 100644 --- a/tests/deal.II/grid_in_3d.cc +++ b/tests/deal.II/grid_in_3d.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -29,7 +29,7 @@ #include #include - +#include std::ofstream logfile("grid_in_3d/output"); @@ -85,7 +85,7 @@ void test1() int main () { - logfile.precision (2); + deallog << std::setprecision (2); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/grid_in_msh.cc b/tests/deal.II/grid_in_msh.cc index eab51a8846..e936cbac76 100644 --- a/tests/deal.II/grid_in_msh.cc +++ b/tests/deal.II/grid_in_msh.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005, 2006 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -25,6 +25,7 @@ #include #include +#include #include std::ofstream logfile("grid_in_msh/output"); @@ -55,7 +56,8 @@ void filename_resolution() int main () { - logfile.precision (2); + deallog << std::setprecision (2); + logfile << std::setprecision (2); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/grid_in_tecplot.cc b/tests/deal.II/grid_in_tecplot.cc index 78116afdd8..561be99c3b 100644 --- a/tests/deal.II/grid_in_tecplot.cc +++ b/tests/deal.II/grid_in_tecplot.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005, 2007 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -19,6 +19,7 @@ #include #include +#include #include std::ofstream logfile("grid_in_tecplot/output"); diff --git a/tests/deal.II/grid_out.cc b/tests/deal.II/grid_out.cc index 0a62e06ceb..0a941cc8af 100644 --- a/tests/deal.II/grid_out.cc +++ b/tests/deal.II/grid_out.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005, 2007 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -22,6 +22,7 @@ #include #include +#include std::ofstream logfile("grid_out/output"); @@ -58,7 +59,8 @@ void test () int main () { - logfile.precision (2); + deallog << std::setprecision (2); + logfile << std::setprecision (2); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/grid_out_02.cc b/tests/deal.II/grid_out_02.cc index df43aadc88..a0ac105f06 100644 --- a/tests/deal.II/grid_out_02.cc +++ b/tests/deal.II/grid_out_02.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 2002, 2003, 2004, 2005, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -28,6 +28,7 @@ #include #include +#include std::ofstream logfile("grid_out_02/output"); @@ -56,7 +57,8 @@ void test () int main () { - logfile.precision (2); + deallog << std::setprecision (2); + logfile << std::setprecision (2); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/grid_output_input.cc b/tests/deal.II/grid_output_input.cc index 5b76c537b9..cee9434a69 100644 --- a/tests/deal.II/grid_output_input.cc +++ b/tests/deal.II/grid_output_input.cc @@ -24,7 +24,7 @@ #include #include -#include +#include template diff --git a/tests/deal.II/grid_test.cc b/tests/deal.II/grid_test.cc index 29975bee02..d9cf10d17b 100644 --- a/tests/deal.II/grid_test.cc +++ b/tests/deal.II/grid_test.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -24,6 +24,7 @@ #include #include +#include #include std::ofstream logfile("grid_test/output"); @@ -268,7 +269,8 @@ void test (const int test_case) int main () { - logfile.precision(2); + deallog << std::setprecision(2); + logfile << std::setprecision(2); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/grid_tools.cc b/tests/deal.II/grid_tools.cc index d4fe53e2ad..1048d7be9b 100644 --- a/tests/deal.II/grid_tools.cc +++ b/tests/deal.II/grid_tools.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -20,7 +20,7 @@ #include #include - +#include std::ofstream logfile("grid_tools/output"); @@ -90,7 +90,8 @@ void test2 () int main () { - logfile.precision(4); + deallog << std::setprecision(4); + logfile << std::setprecision(4); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/grid_transform.cc b/tests/deal.II/grid_transform.cc index c10bbe5eec..b432bb3033 100644 --- a/tests/deal.II/grid_transform.cc +++ b/tests/deal.II/grid_transform.cc @@ -23,7 +23,7 @@ #include #include -#include +#include int main () diff --git a/tests/deal.II/grid_transform_3d.cc b/tests/deal.II/grid_transform_3d.cc index 08113a3aca..c08aa9343f 100644 --- a/tests/deal.II/grid_transform_3d.cc +++ b/tests/deal.II/grid_transform_3d.cc @@ -24,7 +24,7 @@ #include #include -#include +#include int main () diff --git a/tests/deal.II/intergrid_constraints.cc b/tests/deal.II/intergrid_constraints.cc index 2810b71023..95d74ef802 100644 --- a/tests/deal.II/intergrid_constraints.cc +++ b/tests/deal.II/intergrid_constraints.cc @@ -224,8 +224,8 @@ void check () int main () { - logfile.precision(2); - + deallog << std::setprecision(2); + logfile << std::setprecision(2); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/intergrid_map.cc b/tests/deal.II/intergrid_map.cc index 3335c04eb6..c9a1f5f102 100644 --- a/tests/deal.II/intergrid_map.cc +++ b/tests/deal.II/intergrid_map.cc @@ -103,7 +103,7 @@ void check () int main () { std::ofstream logfile("intergrid_map/output"); - logfile.precision(2); + deallog << std::setprecision(2); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/deal.II/interpolate_boundary_values_01.cc b/tests/deal.II/interpolate_boundary_values_01.cc index 977831c062..d9e2ee3ac2 100644 --- a/tests/deal.II/interpolate_boundary_values_01.cc +++ b/tests/deal.II/interpolate_boundary_values_01.cc @@ -39,7 +39,7 @@ #include #include -#include +#include #include diff --git a/tests/deal.II/interpolate_dgq_01.cc b/tests/deal.II/interpolate_dgq_01.cc index 0061a59fdd..5cfda57968 100644 --- a/tests/deal.II/interpolate_dgq_01.cc +++ b/tests/deal.II/interpolate_dgq_01.cc @@ -104,7 +104,7 @@ void test () int main () { std::ofstream logfile("interpolate_dgq_01/output"); - logfile.precision (3); + deallog << std::setprecision (3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/deal.II/interpolate_dgq_02.cc b/tests/deal.II/interpolate_dgq_02.cc index d52d3a43d2..1d0755af06 100644 --- a/tests/deal.II/interpolate_dgq_02.cc +++ b/tests/deal.II/interpolate_dgq_02.cc @@ -114,7 +114,7 @@ void test () int main () { std::ofstream logfile("interpolate_dgq_02/output"); - logfile.precision (3); + deallog << std::setprecision (3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/deal.II/interpolate_q_01.cc b/tests/deal.II/interpolate_q_01.cc index dc5e275021..d7432e3857 100644 --- a/tests/deal.II/interpolate_q_01.cc +++ b/tests/deal.II/interpolate_q_01.cc @@ -104,7 +104,7 @@ void test () int main () { std::ofstream logfile("interpolate_q_01/output"); - logfile.precision (3); + deallog << std::setprecision (3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/deal.II/interpolate_q_02.cc b/tests/deal.II/interpolate_q_02.cc index 88d6c5f291..ada8014229 100644 --- a/tests/deal.II/interpolate_q_02.cc +++ b/tests/deal.II/interpolate_q_02.cc @@ -114,7 +114,7 @@ void test () int main () { std::ofstream logfile("interpolate_q_02/output"); - logfile.precision (3); + deallog << std::setprecision (3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/deal.II/interpolate_q_system_01.cc b/tests/deal.II/interpolate_q_system_01.cc index 52ee1834cd..539807d59d 100644 --- a/tests/deal.II/interpolate_q_system_01.cc +++ b/tests/deal.II/interpolate_q_system_01.cc @@ -110,7 +110,7 @@ void test () int main () { std::ofstream logfile("interpolate_q_system_01/output"); - logfile.precision (3); + deallog << std::setprecision (3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/deal.II/interpolate_q_system_02.cc b/tests/deal.II/interpolate_q_system_02.cc index 217df6ea14..4eed9cb3d5 100644 --- a/tests/deal.II/interpolate_q_system_02.cc +++ b/tests/deal.II/interpolate_q_system_02.cc @@ -119,7 +119,7 @@ void test () int main () { std::ofstream logfile("interpolate_q_system_02/output"); - logfile.precision (3); + deallog << std::setprecision (3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/deal.II/line_coarsening_3d.cc b/tests/deal.II/line_coarsening_3d.cc index bd6dc8510d..c76c39b013 100644 --- a/tests/deal.II/line_coarsening_3d.cc +++ b/tests/deal.II/line_coarsening_3d.cc @@ -20,7 +20,7 @@ #include #include -#include +#include #include diff --git a/tests/deal.II/matrices.cc b/tests/deal.II/matrices.cc index 2592e86764..b13be4c086 100644 --- a/tests/deal.II/matrices.cc +++ b/tests/deal.II/matrices.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2003, 2004, 2007 by the deal.II authors +// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -203,8 +203,10 @@ check () int main () { std::ofstream logfile ("matrices/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + logfile << std::setprecision (2); + logfile << std::fixed; + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/maximal_cell_diameter.cc b/tests/deal.II/maximal_cell_diameter.cc index 08816e745f..4600bfd88a 100644 --- a/tests/deal.II/maximal_cell_diameter.cc +++ b/tests/deal.II/maximal_cell_diameter.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -20,6 +20,7 @@ #include #include +#include std::ofstream logfile("maximal_cell_diameter/output"); @@ -73,7 +74,7 @@ void test1 () int main () { - logfile.precision(4); + deallog << std::setprecision(4); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/measure_et_al.cc b/tests/deal.II/measure_et_al.cc index 03b9c9bcb5..a13bf80e20 100644 --- a/tests/deal.II/measure_et_al.cc +++ b/tests/deal.II/measure_et_al.cc @@ -1,5 +1,5 @@ // $Id$ -// Copyright (C) 2005, 2006 by the deal.II authors +// Copyright (C) 2005, 2006, 2008 by the deal.II authors // // Computes measure, center and barycenter on a variety of cells @@ -9,6 +9,7 @@ #include #include #include +#include #define PRECISION 5 @@ -92,7 +93,7 @@ void test() int main() { std::ofstream logfile ("measure_et_al/output"); - logfile.precision (PRECISION); + deallog << std::setprecision (PRECISION); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/mg_dof_handler.cc b/tests/deal.II/mg_dof_handler.cc index 7a65744ea0..f2a8cb687a 100644 --- a/tests/deal.II/mg_dof_handler.cc +++ b/tests/deal.II/mg_dof_handler.cc @@ -31,7 +31,7 @@ int main () { std::ofstream logfile("mg_dof_handler/output"); - logfile.precision(2); + deallog << std::setprecision(2); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/deal.II/minimal_cell_diameter.cc b/tests/deal.II/minimal_cell_diameter.cc index 717f2b50f3..eed60526d3 100644 --- a/tests/deal.II/minimal_cell_diameter.cc +++ b/tests/deal.II/minimal_cell_diameter.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -20,6 +20,7 @@ #include #include +#include std::ofstream logfile("minimal_cell_diameter/output"); @@ -67,7 +68,7 @@ void test1 () int main () { - logfile.precision(4); + deallog << std::setprecision(4); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/normals_at_vertices.cc b/tests/deal.II/normals_at_vertices.cc index 08c67485fc..303a6372e4 100644 --- a/tests/deal.II/normals_at_vertices.cc +++ b/tests/deal.II/normals_at_vertices.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2005 by the deal.II authors +// Copyright (C) 2005, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -26,6 +26,7 @@ #include #include +#include @@ -56,8 +57,8 @@ void create_triangulation(const unsigned int case_no, int main () { std::ofstream logfile ("normals_at_vertices/output"); - logfile.precision (3); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (3); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/project_boundary_rt_01.cc b/tests/deal.II/project_boundary_rt_01.cc index 5296102486..56be52a028 100644 --- a/tests/deal.II/project_boundary_rt_01.cc +++ b/tests/deal.II/project_boundary_rt_01.cc @@ -175,8 +175,8 @@ void test_hyper_cube(const FiniteElement& fe) int main() { std::ofstream logfile ("project_boundary_rt_01/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); deallog.threshold_double(1.e-12); diff --git a/tests/deal.II/project_common.cc b/tests/deal.II/project_common.cc index 4428bb3b90..6ad5ad3d73 100644 --- a/tests/deal.II/project_common.cc +++ b/tests/deal.II/project_common.cc @@ -344,7 +344,7 @@ void test_with_2d_deformed_refined_mesh (const FiniteElement &fe, int main () { std::ofstream logfile(logname); - logfile.precision (3); + deallog << std::setprecision (3); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/deal.II/sparsity_pattern.cc b/tests/deal.II/sparsity_pattern.cc index fb9b8decbb..54ec5721cb 100644 --- a/tests/deal.II/sparsity_pattern.cc +++ b/tests/deal.II/sparsity_pattern.cc @@ -226,8 +226,8 @@ check () int main () { std::ofstream logfile ("sparsity_pattern/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/sparsity_pattern_01.cc b/tests/deal.II/sparsity_pattern_01.cc index 69974e0d75..f37af63b31 100644 --- a/tests/deal.II/sparsity_pattern_01.cc +++ b/tests/deal.II/sparsity_pattern_01.cc @@ -226,8 +226,8 @@ check () int main () { std::ofstream logfile ("sparsity_pattern_01/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/sparsity_pattern_01_x.cc b/tests/deal.II/sparsity_pattern_01_x.cc index 6c3348a204..aeef424550 100644 --- a/tests/deal.II/sparsity_pattern_01_x.cc +++ b/tests/deal.II/sparsity_pattern_01_x.cc @@ -226,8 +226,8 @@ check () int main () { std::ofstream logfile ("sparsity_pattern_01_x/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/sparsity_pattern_02.cc b/tests/deal.II/sparsity_pattern_02.cc index 1d2fd06e49..7d490acfcb 100644 --- a/tests/deal.II/sparsity_pattern_02.cc +++ b/tests/deal.II/sparsity_pattern_02.cc @@ -93,8 +93,8 @@ check () int main () { std::ofstream logfile ("sparsity_pattern_02/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/sparsity_pattern_03.cc b/tests/deal.II/sparsity_pattern_03.cc index d73d45cc64..8a24b1159e 100644 --- a/tests/deal.II/sparsity_pattern_03.cc +++ b/tests/deal.II/sparsity_pattern_03.cc @@ -96,8 +96,8 @@ check () int main () { std::ofstream logfile ("sparsity_pattern_03/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/sparsity_pattern_04.cc b/tests/deal.II/sparsity_pattern_04.cc index 62b1f09f1a..0dc38f581f 100644 --- a/tests/deal.II/sparsity_pattern_04.cc +++ b/tests/deal.II/sparsity_pattern_04.cc @@ -98,8 +98,8 @@ check () int main () { std::ofstream logfile ("sparsity_pattern_04/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/sparsity_pattern_05.cc b/tests/deal.II/sparsity_pattern_05.cc index 48bd8596e0..98b533dfbe 100644 --- a/tests/deal.II/sparsity_pattern_05.cc +++ b/tests/deal.II/sparsity_pattern_05.cc @@ -183,8 +183,8 @@ check () int main () { std::ofstream logfile ("sparsity_pattern_05/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/sparsity_pattern_05_x.cc b/tests/deal.II/sparsity_pattern_05_x.cc index eaaf823863..b6cc981756 100644 --- a/tests/deal.II/sparsity_pattern_05_x.cc +++ b/tests/deal.II/sparsity_pattern_05_x.cc @@ -183,8 +183,8 @@ check () int main () { std::ofstream logfile ("sparsity_pattern_05_x/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/sparsity_pattern_x.cc b/tests/deal.II/sparsity_pattern_x.cc index 260e7de355..2b29eb916c 100644 --- a/tests/deal.II/sparsity_pattern_x.cc +++ b/tests/deal.II/sparsity_pattern_x.cc @@ -226,8 +226,8 @@ check () int main () { std::ofstream logfile ("sparsity_pattern_x/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/subdomain_ids.cc b/tests/deal.II/subdomain_ids.cc index 3b710e3cb4..3663dc0c74 100644 --- a/tests/deal.II/subdomain_ids.cc +++ b/tests/deal.II/subdomain_ids.cc @@ -175,7 +175,7 @@ void test () int main () { - logfile.precision(4); + deallog << std::setprecision(4); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/support_point_map.cc b/tests/deal.II/support_point_map.cc index e41e7a6f12..666c84a065 100644 --- a/tests/deal.II/support_point_map.cc +++ b/tests/deal.II/support_point_map.cc @@ -125,8 +125,8 @@ check () int main () { std::ofstream logfile ("support_point_map/output"); - logfile.precision (2); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (2); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/union_triangulation.cc b/tests/deal.II/union_triangulation.cc index 17a75e99f4..a64c96b30d 100644 --- a/tests/deal.II/union_triangulation.cc +++ b/tests/deal.II/union_triangulation.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2006 by the deal.II authors +// Copyright (C) 2006, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -25,6 +25,7 @@ #include #include +#include #include std::ofstream logfile("union_triangulation/output"); @@ -67,7 +68,8 @@ void test () int main () { - logfile.precision(2); + deallog << std::setprecision(2); + logfile << std::setprecision(2); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/deal.II/vectors_boundary_rhs_01.cc b/tests/deal.II/vectors_boundary_rhs_01.cc index 157678b4b7..23a58191ba 100644 --- a/tests/deal.II/vectors_boundary_rhs_01.cc +++ b/tests/deal.II/vectors_boundary_rhs_01.cc @@ -101,8 +101,8 @@ check () int main () { std::ofstream logfile ("vectors_boundary_rhs_01/output"); - logfile.precision (4); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (4); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/vectors_boundary_rhs_02.cc b/tests/deal.II/vectors_boundary_rhs_02.cc index cfa0f266e2..b639b8bb15 100644 --- a/tests/deal.II/vectors_boundary_rhs_02.cc +++ b/tests/deal.II/vectors_boundary_rhs_02.cc @@ -103,8 +103,8 @@ check () int main () { std::ofstream logfile ("vectors_boundary_rhs_02/output"); - logfile.precision (4); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (4); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/vectors_boundary_rhs_03.cc b/tests/deal.II/vectors_boundary_rhs_03.cc index b9e8b15d8e..922204969f 100644 --- a/tests/deal.II/vectors_boundary_rhs_03.cc +++ b/tests/deal.II/vectors_boundary_rhs_03.cc @@ -101,8 +101,8 @@ check () int main () { std::ofstream logfile ("vectors_boundary_rhs_03/output"); - logfile.precision (4); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (4); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/vectors_point_source_01.cc b/tests/deal.II/vectors_point_source_01.cc index 9a041b1007..909739fc4c 100644 --- a/tests/deal.II/vectors_point_source_01.cc +++ b/tests/deal.II/vectors_point_source_01.cc @@ -98,8 +98,8 @@ check () int main () { std::ofstream logfile ("vectors_point_source_01/output"); - logfile.precision (4); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (4); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/vectors_rhs_01.cc b/tests/deal.II/vectors_rhs_01.cc index b19f851d33..7e270a2a0d 100644 --- a/tests/deal.II/vectors_rhs_01.cc +++ b/tests/deal.II/vectors_rhs_01.cc @@ -101,8 +101,8 @@ check () int main () { std::ofstream logfile ("vectors_rhs_01/output"); - logfile.precision (4); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (4); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0); diff --git a/tests/deal.II/vectors_rhs_03.cc b/tests/deal.II/vectors_rhs_03.cc index cb7b430d09..339e76dfa2 100644 --- a/tests/deal.II/vectors_rhs_03.cc +++ b/tests/deal.II/vectors_rhs_03.cc @@ -100,8 +100,8 @@ check () int main () { std::ofstream logfile ("vectors_rhs_03/output"); - logfile.precision (4); - logfile.setf(std::ios::fixed); + deallog << std::setprecision (4); + deallog << std::fixed; deallog.attach(logfile); deallog.depth_console (0);