remove FaceInfo

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

diff --git a/tests/deal.II/mesh_worker_01.cc b/tests/deal.II/mesh_worker_01.cc
index da59ce01d6216d15da5ab8bf4bb94b624c4289e0..b4cbe552c5b4ce8dbc3469b956884407ec5723e4 100644 (file)
--- a/tests/deal.II/mesh_worker_01.cc
+++ b/tests/deal.II/mesh_worker_01.cc
@@ -42,12 +42,11 @@ class Local : public Subscriptor
 {
   public:
     typedef typename MeshWorker::IntegrationWorker<dim>::CellInfo CellInfo;
-    typedef typename MeshWorker::IntegrationWorker<dim>::FaceInfo FaceInfo;
-
+    
     void cell(MeshWorker::DoFInfo<dim>& dinfo, CellInfo& info) const;
-    void bdry(MeshWorker::DoFInfo<dim>& dinfo, FaceInfo& info) const;
+    void bdry(MeshWorker::DoFInfo<dim>& dinfo, CellInfo& info) const;
     void face(MeshWorker::DoFInfo<dim>& dinfo1, MeshWorker::DoFInfo<dim>& dinfo2,
-             FaceInfo& info1, FaceInfo& info2) const;
+             CellInfo& info1, CellInfo& info2) const;
 
     bool cells;
     bool faces;
@@ -103,7 +102,7 @@ Local<dim>::cell(MeshWorker::DoFInfo<dim>& info, CellInfo&) const
 
 template <int dim>
 void
-Local<dim>::bdry(MeshWorker::DoFInfo<dim>& info, FaceInfo&) const
+Local<dim>::bdry(MeshWorker::DoFInfo<dim>& info, CellInfo&) const
 {
   const unsigned int cell = info.cell->user_index();
   deallog << "Bdry " << std::setw(2) << cell;
@@ -114,7 +113,7 @@ Local<dim>::bdry(MeshWorker::DoFInfo<dim>& info, FaceInfo&) const
 template <int dim>
 void
 Local<dim>::face(MeshWorker::DoFInfo<dim>& info1, MeshWorker::DoFInfo<dim>& info2,
-                FaceInfo&, FaceInfo&) const
+                CellInfo&, CellInfo&) const
 {
   const unsigned int cell1 = info1.cell->user_index();
   const unsigned int cell2 = info2.cell->user_index();
@@ -147,9 +146,7 @@ test_simple(MGDoFHandler<dim>& mgdofs)
 
   MeshWorker::IntegrationWorker<dim> integrator;
   integrator.initialize_gauss_quadrature(1, 1, 1);
-  integrator.boundary_fluxes = local.faces;
-  integrator.interior_fluxes = local.faces;
-
+  
   MeshWorker::Assembler::SystemSimple<SparseMatrix<double>, Vector<double> >
     assembler;
   assembler.initialize(matrix, v);

diff --git a/tests/deal.II/mesh_worker_02.cc b/tests/deal.II/mesh_worker_02.cc
index bc76870c39fe303dd9024eafb890d5b6bf73c2b6..753e946ffb8f6d5e255924afa3d86f56fb3365a6 100644 (file)
--- a/tests/deal.II/mesh_worker_02.cc
+++ b/tests/deal.II/mesh_worker_02.cc
@@ -43,11 +43,11 @@ class MatrixIntegrator : public Subscriptor
     static void cell(MeshWorker::DoFInfo<dim>& dinfo,
                     typename MeshWorker::IntegrationWorker<dim>::CellInfo& info);
     static void bdry(MeshWorker::DoFInfo<dim>& dinfo,
-                    typename MeshWorker::IntegrationWorker<dim>::FaceInfo& info);
+                    typename MeshWorker::IntegrationWorker<dim>::CellInfo& info);
     static void face(MeshWorker::DoFInfo<dim>& dinfo1,
                     MeshWorker::DoFInfo<dim>& dinfo2,
-                    typename MeshWorker::IntegrationWorker<dim>::FaceInfo& info1,
-                    typename MeshWorker::IntegrationWorker<dim>::FaceInfo& info2);
+                    typename MeshWorker::IntegrationWorker<dim>::CellInfo& info1,
+                    typename MeshWorker::IntegrationWorker<dim>::CellInfo& info2);
 };
 
 
@@ -68,7 +68,7 @@ void MatrixIntegrator<dim>::cell(MeshWorker::DoFInfo<dim>& dinfo,
 
 template <int dim>
 void MatrixIntegrator<dim>::bdry(MeshWorker::DoFInfo<dim>& dinfo,
-                                typename MeshWorker::IntegrationWorker<dim>::FaceInfo& info)
+                                typename MeshWorker::IntegrationWorker<dim>::CellInfo& info)
 {
   const FEValuesBase<dim>& fe = info.fe_values();
   FullMatrix<double>& local_matrix = dinfo.matrix(0).matrix;
@@ -89,8 +89,8 @@ void MatrixIntegrator<dim>::bdry(MeshWorker::DoFInfo<dim>& dinfo,
 template <int dim>
 void MatrixIntegrator<dim>::face(MeshWorker::DoFInfo<dim>& dinfo1,
                                 MeshWorker::DoFInfo<dim>& dinfo2,
-                                typename MeshWorker::IntegrationWorker<dim>::FaceInfo& info1,
-                                typename MeshWorker::IntegrationWorker<dim>::FaceInfo& info2)
+                                typename MeshWorker::IntegrationWorker<dim>::CellInfo& info1,
+                                typename MeshWorker::IntegrationWorker<dim>::CellInfo& info2)
 {
   const FEValuesBase<dim>& fe1 = info1.fe_values();
   const FEValuesBase<dim>& fe2 = info2.fe_values();