avoid deprecated functions and files

git-svn-id: https://svn.dealii.org/trunk@28614 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/integrators/cells_and_faces_01.cc b/tests/integrators/cells_and_faces_01.cc
index c2f706ce1f9938be969e407453b20d2b7eea2dfd..2f7b908d2ba71a44901f468bad3f1aea24035736 100644 (file)
--- 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 <deal.II/numerics/mesh_worker.h>
-#include <deal.II/numerics/mesh_worker_assembler.h>
-#include <deal.II/numerics/mesh_worker_loop.h>
+#include <deal.II/meshworker/assembler.h>
+#include <deal.II/meshworker/loop.h>
 
 #include <deal.II/base/std_cxx1x/function.h>
 #include <deal.II/base/logstream.h>

diff --git a/tests/integrators/empty_info.h b/tests/integrators/empty_info.h
index 7110c2f7ccfc74c7232d63415a7e0e0f302a953b..0e9e59c99a6e3e5005c89d6dcf69b170b2156727 100644 (file)
--- 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 <deal.II/numerics/mesh_worker_info.h>
+#include <deal.II/meshworker/dof_info.h>
 
 class EmptyInfo
 {

diff --git a/tests/integrators/functional_01.cc b/tests/integrators/functional_01.cc
index b493a4c3b15c831efeeed55f733eea641faf65dd..1c96dee869df09349924bb9ebcd7414198cb865f 100644 (file)
--- 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 <deal.II/numerics/mesh_worker.h>
-#include <deal.II/numerics/mesh_worker_assembler.h>
-#include <deal.II/numerics/mesh_worker_loop.h>
+#include <deal.II/meshworker/assembler.h>
+#include <deal.II/meshworker/loop.h>
 
 #include <deal.II/base/std_cxx1x/function.h>
 #include <deal.II/base/logstream.h>

diff --git a/tests/integrators/laplacian_01.cc b/tests/integrators/laplacian_01.cc
index 8632894875483ef408e31ffa7353bfad5e1f972a..cb21c94d0dbac18ef333cd8a03d2a62e878c0f23 100644 (file)
--- 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<dim>& 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 1b04271e462070e0a573688b0e31e79854eab43d..4389fdf1b01e028ee6534f9d9550391c5fac6ad9 100644 (file)
--- 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 <deal.II/numerics/mesh_worker.h>
-#include <deal.II/numerics/mesh_worker_assembler.h>
-#include <deal.II/numerics/mesh_worker_loop.h>
+#include <deal.II/meshworker/assembler.h>
+#include <deal.II/meshworker/loop.h>
 
 #include <deal.II/base/std_cxx1x/function.h>
 #include <deal.II/base/logstream.h>
@@ -142,7 +141,7 @@ test_simple(MGDoFHandler<dim>& mgdofs)
     assembler;
   assembler.initialize(matrix, v);
   
-  MeshWorker::integration_loop<dim, dim>
+  MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> >
     (dofs.begin_active(), dofs.end(),
      dof_info, info_box,
      std_cxx1x::bind (&Local<dim>::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 2fe4464ce08b30277602604b40dd87434f4a8834..9df5e5a0d2725503b8a99c880ab711d6a7251acd 100644 (file)
--- 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 <deal.II/numerics/mesh_worker.h>
-#include <deal.II/numerics/mesh_worker_assembler.h>
-#include <deal.II/numerics/mesh_worker_loop.h>
+#include <deal.II/meshworker/assembler.h>
+#include <deal.II/meshworker/loop.h>
 
 #include <deal.II/base/logstream.h>
 #include <deal.II/lac/compressed_sparsity_pattern.h>
@@ -147,7 +146,7 @@ assemble(const DoFHandler<dim>& dof_handler, SparseMatrix<double>& matrix)
   MeshWorker::Assembler::MatrixSimple<SparseMatrix<double> > assembler;
   assembler.initialize(matrix);
   
-  MeshWorker::integration_loop<dim, dim>
+  MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> >
     (dof_handler.begin_active(),
      dof_handler.end(),
      dof_info,
@@ -229,8 +228,8 @@ test_simple(MGDoFHandler<dim>& 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 09caabd3b1ae49eba678e9293d468b03ee506739..f2b119f308c2486c489022ccc0addb015136e6d1 100644 (file)
--- 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 <deal.II/numerics/mesh_worker.h>
-#include <deal.II/numerics/mesh_worker_assembler.h>
-#include <deal.II/numerics/mesh_worker_loop.h>
+#include <deal.II/meshworker/assembler.h>
+#include <deal.II/meshworker/loop.h>
 
 #include <deal.II/base/logstream.h>
 #include <deal.II/lac/compressed_sparsity_pattern.h>
@@ -160,7 +159,7 @@ assemble(const DoFHandler<dim>& dof_handler, SparseMatrix<double>& matrix)
   MeshWorker::Assembler::MatrixSimple<SparseMatrix<double> > assembler;
   assembler.initialize(matrix);
   
-  MeshWorker::integration_loop<dim, dim>
+  MeshWorker::loop<dim, dim, MeshWorker::DoFInfo<dim>, MeshWorker::IntegrationInfoBox<dim> >
     (dof_handler.begin_active(),
      dof_handler.end(),
      dof_info,
@@ -242,8 +241,8 @@ test_simple(MGDoFHandler<dim>& 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;