From 2395e4e59be235388e6ab40d06f9be4999735f03 Mon Sep 17 00:00:00 2001 From: kanschat Date: Wed, 27 Feb 2013 15:20:34 +0000 Subject: [PATCH] avoid deprecated functions and files git-svn-id: https://svn.dealii.org/trunk@28614 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/integrators/cells_and_faces_01.cc | 7 +++---- tests/integrators/empty_info.h | 4 ++-- tests/integrators/functional_01.cc | 7 +++---- tests/integrators/laplacian_01.cc | 7 ++----- tests/integrators/mesh_worker_01.cc | 9 ++++----- tests/integrators/mesh_worker_02.cc | 13 ++++++------- tests/integrators/mesh_worker_03.cc | 13 ++++++------- 7 files changed, 26 insertions(+), 34 deletions(-) diff --git a/tests/integrators/cells_and_faces_01.cc b/tests/integrators/cells_and_faces_01.cc index c2f706ce1f..2f7b908d2b 100644 --- a/tests/integrators/cells_and_faces_01.cc +++ b/tests/integrators/cells_and_faces_01.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2009, 2010, 2011 by the deal.II authors +// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2009, 2010, 2011, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -15,9 +15,8 @@ #include "../tests.h" #include "empty_info.h" -#include -#include -#include +#include +#include #include #include diff --git a/tests/integrators/empty_info.h b/tests/integrators/empty_info.h index 7110c2f7cc..0e9e59c99a 100644 --- a/tests/integrators/empty_info.h +++ b/tests/integrators/empty_info.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2009, 2010, 2011 by the deal.II authors +// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2009, 2010, 2011, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -13,7 +13,7 @@ // Provide scratch data objects with no contents for the MeshWorker::loop() -#include +#include class EmptyInfo { diff --git a/tests/integrators/functional_01.cc b/tests/integrators/functional_01.cc index b493a4c3b1..1c96dee869 100644 --- a/tests/integrators/functional_01.cc +++ b/tests/integrators/functional_01.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2009, 2010, 2011 by the deal.II authors +// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2009, 2010, 2011, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -15,9 +15,8 @@ #include "../tests.h" #include "empty_info.h" -#include -#include -#include +#include +#include #include #include diff --git a/tests/integrators/laplacian_01.cc b/tests/integrators/laplacian_01.cc index 8632894875..cb21c94d0d 100644 --- a/tests/integrators/laplacian_01.cc +++ b/tests/integrators/laplacian_01.cc @@ -1,7 +1,7 @@ //-------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2012 by the deal.II authors +// Copyright (C) 2012, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -230,10 +230,7 @@ test(Triangulation& tr) int main() { - const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output"); - std::ofstream logfile(logname.c_str()); - deallog.attach(logfile); - deallog.depth_console(0); + initlog(__FILE__); deallog.threshold_double(1.e-10); Triangulation<2> tr2; diff --git a/tests/integrators/mesh_worker_01.cc b/tests/integrators/mesh_worker_01.cc index 1b04271e46..4389fdf1b0 100644 --- a/tests/integrators/mesh_worker_01.cc +++ b/tests/integrators/mesh_worker_01.cc @@ -1,7 +1,7 @@ //---------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2009, 2010, 2012 by the deal.II authors +// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -14,9 +14,8 @@ // right place. #include "../tests.h" -#include -#include -#include +#include +#include #include #include @@ -142,7 +141,7 @@ test_simple(MGDoFHandler& mgdofs) assembler; assembler.initialize(matrix, v); - MeshWorker::integration_loop + MeshWorker::loop, MeshWorker::IntegrationInfoBox > (dofs.begin_active(), dofs.end(), dof_info, info_box, std_cxx1x::bind (&Local::cell, local, std_cxx1x::_1, std_cxx1x::_2), diff --git a/tests/integrators/mesh_worker_02.cc b/tests/integrators/mesh_worker_02.cc index 2fe4464ce0..9df5e5a0d2 100644 --- a/tests/integrators/mesh_worker_02.cc +++ b/tests/integrators/mesh_worker_02.cc @@ -1,7 +1,7 @@ //---------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2009, 2010, 2012 by the deal.II authors +// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -13,9 +13,8 @@ // Test consistency of assemblers MatrixSimple and MGMatrixSimple #include "../tests.h" -#include -#include -#include +#include +#include #include #include @@ -147,7 +146,7 @@ assemble(const DoFHandler& dof_handler, SparseMatrix& matrix) MeshWorker::Assembler::MatrixSimple > assembler; assembler.initialize(matrix); - MeshWorker::integration_loop + MeshWorker::loop, MeshWorker::IntegrationInfoBox > (dof_handler.begin_active(), dof_handler.end(), dof_info, @@ -229,8 +228,8 @@ test_simple(MGDoFHandler& mgdofs) mg_matrix_dg_up.resize(0, n_levels-1); mg_matrix_dg_down.resize(0, n_levels-1); - for (unsigned int level=mg_sparsity.get_minlevel(); - level<=mg_sparsity.get_maxlevel();++level) + for (unsigned int level=mg_sparsity.min_level(); + level<=mg_sparsity.max_level();++level) { CompressedSparsityPattern c_sparsity(mgdofs.n_dofs(level)); CompressedSparsityPattern ci_sparsity; diff --git a/tests/integrators/mesh_worker_03.cc b/tests/integrators/mesh_worker_03.cc index 09caabd3b1..f2b119f308 100644 --- a/tests/integrators/mesh_worker_03.cc +++ b/tests/integrators/mesh_worker_03.cc @@ -1,7 +1,7 @@ //---------------------------------------------------------------------- // $Id$ // -// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2009, 2010, 2012 by the deal.II authors +// Copyright (C) 2000, 2001, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -13,9 +13,8 @@ // Test consistency of assemblers MatrixSimple with and without local blocks #include "../tests.h" -#include -#include -#include +#include +#include #include #include @@ -160,7 +159,7 @@ assemble(const DoFHandler& dof_handler, SparseMatrix& matrix) MeshWorker::Assembler::MatrixSimple > assembler; assembler.initialize(matrix); - MeshWorker::integration_loop + MeshWorker::loop, MeshWorker::IntegrationInfoBox > (dof_handler.begin_active(), dof_handler.end(), dof_info, @@ -242,8 +241,8 @@ test_simple(MGDoFHandler& mgdofs) mg_matrix_dg_up.resize(0, n_levels-1); mg_matrix_dg_down.resize(0, n_levels-1); - for (unsigned int level=mg_sparsity.get_minlevel(); - level<=mg_sparsity.get_maxlevel();++level) + for (unsigned int level=mg_sparsity.min_level(); + level<=mg_sparsity.max_level();++level) { CompressedSparsityPattern c_sparsity(mgdofs.n_dofs(level)); CompressedSparsityPattern ci_sparsity; -- 2.39.5