From 5c139d6ac707642f6d6d3bc43c27172b56280167 Mon Sep 17 00:00:00 2001 From: kanschat Date: Thu, 17 Jun 2010 14:44:58 +0000 Subject: [PATCH] oops, I did not know we use MeshWorker here git-svn-id: https://svn.dealii.org/trunk@21221 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/multigrid/mg_renumbered_02.cc | 27 ++++++++++++--------------- tests/multigrid/mg_renumbered_03.cc | 29 +++++++++++++---------------- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/tests/multigrid/mg_renumbered_02.cc b/tests/multigrid/mg_renumbered_02.cc index 9eb462bb47..82521f0829 100644 --- a/tests/multigrid/mg_renumbered_02.cc +++ b/tests/multigrid/mg_renumbered_02.cc @@ -153,14 +153,14 @@ class OutputCreator : public Subscriptor { public: void cell(MeshWorker::DoFInfo& dinfo, - typename MeshWorker::IntegrationWorker::CellInfo& info); + MeshWorker::IntegrationInfo& info); }; template void OutputCreator::cell( MeshWorker::DoFInfo& dinfo, - typename MeshWorker::IntegrationWorker::CellInfo& info) + MeshWorker::IntegrationInfo& info) { const FEValuesBase& fe = info.fe_values(); const std::vector >& uh = info.values[0]; @@ -183,7 +183,7 @@ template class LaplaceProblem { public: - typedef typename MeshWorker::IntegrationWorker::CellInfo CellInfo; + typedef MeshWorker::IntegrationInfo CellInfo; LaplaceProblem (const unsigned int deg); void run (); @@ -247,26 +247,23 @@ void LaplaceProblem::output_gpl(const MGDoFHandler &dof, MGLevelObject > &v) { - MeshWorker::IntegrationWorker integration_worker; - MeshWorker::Assembler::GnuplotPatch assembler; - + MeshWorker::IntegrationInfoBox info_box; const unsigned int n_gauss_points = dof.get_fe().tensor_degree(); QTrapez<1> trapez; QIterated quadrature(trapez, n_gauss_points); - integration_worker.cell_quadrature = quadrature; + info_box.cell_quadrature = quadrature; UpdateFlags update_flags = update_quadrature_points | update_values | update_gradients; - integration_worker.add_update_flags(update_flags, true, true, true, true); - + info_box.add_update_flags(update_flags, true, true, true, true); + NamedData >* > data; data.add(&v, "mg_vector"); - MeshWorker::VectorSelector cs; - cs.add("mg_vector"); - integration_worker.cell_selector = cs; + info_box.cell_selector.add("mg_vector"); + info_box.initialize(fe, mapping, data); - assembler.initialize(dim, quadrature.size(), dim+dof.get_fe().n_components()); - MeshWorker::IntegrationInfoBox info_box; MeshWorker::DoFInfo dof_info(dof); - info_box.initialize(integration_worker, fe, mapping, data); + + MeshWorker::Assembler::GnuplotPatch assembler; + assembler.initialize(dim, quadrature.size(), dim+dof.get_fe().n_components()); for(unsigned int l=0; l& dinfo, - typename MeshWorker::IntegrationWorker::CellInfo& info); + MeshWorker::IntegrationInfo& info); }; template void OutputCreator::cell( MeshWorker::DoFInfo& dinfo, - typename MeshWorker::IntegrationWorker::CellInfo& info) + MeshWorker::IntegrationInfo& info) { const FEValuesBase& fe = info.fe_values(); const std::vector >& uh = info.values[0]; @@ -201,7 +201,7 @@ template class LaplaceProblem { public: - typedef typename MeshWorker::IntegrationWorker::CellInfo CellInfo; + typedef MeshWorker::IntegrationInfo CellInfo; LaplaceProblem (const unsigned int deg); void run (); @@ -273,26 +273,23 @@ void LaplaceProblem::output_gpl(const MGDoFHandler &dof, MGLevelObject > &v) { - MeshWorker::IntegrationWorker integration_worker; - MeshWorker::Assembler::GnuplotPatch assembler; - + MeshWorker::IntegrationInfoBox info_box; const unsigned int n_gauss_points = dof.get_fe().tensor_degree(); QTrapez<1> trapez; QIterated quadrature(trapez, n_gauss_points); - integration_worker.cell_quadrature = quadrature; - UpdateFlags update_flags = update_quadrature_points | update_values | update_gradients; - integration_worker.add_update_flags(update_flags, true, true, true, true); - + info_box.cell_quadrature = quadrature; NamedData >* > data; data.add(&v, "mg_vector"); - MeshWorker::VectorSelector cs; - cs.add("mg_vector"); - integration_worker.cell_selector = cs; + info_box.cell_selector.add("mg_vector"); + info_box.initialize_update_flags(); + UpdateFlags update_flags = update_quadrature_points | update_values | update_gradients; + info_box.add_update_flags(update_flags, true, true, true, true); + info_box.initialize(fe, mapping, data); + + MeshWorker::DoFInfo dof_info(dof); + MeshWorker::Assembler::GnuplotPatch assembler; assembler.initialize(dim, quadrature.size(), dim+dof.get_fe().n_components()); - MeshWorker::IntegrationInfoBox info_box; - MeshWorker::DoFInfo dof_info(dof); - info_box.initialize(integration_worker, fe, mapping, data); for(unsigned int l=0; l