From 7f1146ca8ff986a7d88c141ac9b2eca4f2ea6b81 Mon Sep 17 00:00:00 2001 From: Ralf Hartmann Date: Tue, 21 Feb 2006 15:24:53 +0000 Subject: [PATCH] Use hp::StaticMappingQ1::mapping_collection. Fix refinement indicator. git-svn-id: https://svn.dealii.org/trunk@12442 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-21/step-21.cc | 33 ++++++++++------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/deal.II/examples/step-21/step-21.cc b/deal.II/examples/step-21/step-21.cc index ffd63f02da..14df5458b0 100644 --- a/deal.II/examples/step-21/step-21.cc +++ b/deal.II/examples/step-21/step-21.cc @@ -598,15 +598,6 @@ class DGMethod void output_results (const unsigned int cycle) const; Triangulation triangulation; - - // Currently this example code - // works on a rectangular domain. - // Hence a linear mapping of degree - // 1 is sufficient. If irregular - // boundaries come into play, this - // object should be replaced by - // a MappingCollection. - hp::MappingCollection mapping_collection; // In contrast to the example code // of step-12, this time DG elements @@ -672,9 +663,6 @@ DGMethod::DGMethod () quadratures.push_back (QGauss (i+2)); face_quadratures.push_back (QGauss (i+2)); } - - static const MappingQ1 mapping; - mapping_collection.push_back (mapping); } @@ -829,7 +817,8 @@ void DGMethod::assemble_system1 () // assumes a ``MappingQ1'' mapping) // and makes it easier to change // the mapping object later. - hp::FEValues fe_v_x (mapping_collection, fe_collection, quadratures, update_flags); + hp::FEValues fe_v_x (hp::StaticMappingQ1::mapping_collection, + fe_collection, quadratures, update_flags); // Similarly we create the // ``FEFaceValues'' and @@ -842,13 +831,13 @@ void DGMethod::assemble_system1 () // current cell and the face (and // subface) number. hp::FEFaceValues fe_v_face_x ( - mapping_collection, fe_collection, face_quadratures, face_update_flags); + hp::StaticMappingQ1::mapping_collection, fe_collection, face_quadratures, face_update_flags); hp::FESubfaceValues fe_v_subface_x ( - mapping_collection, fe_collection, face_quadratures, face_update_flags); + hp::StaticMappingQ1::mapping_collection, fe_collection, face_quadratures, face_update_flags); hp::FEFaceValues fe_v_face_neighbor_x ( - mapping_collection, fe_collection, face_quadratures, neighbor_face_update_flags); + hp::StaticMappingQ1::mapping_collection, fe_collection, face_quadratures, neighbor_face_update_flags); hp::FESubfaceValues fe_v_subface_neighbor_x ( - mapping_collection, fe_collection, face_quadratures, neighbor_face_update_flags); + hp::StaticMappingQ1::mapping_collection, fe_collection, face_quadratures, neighbor_face_update_flags); // Now we create the cell matrices // and vectors. Here we need two @@ -1323,13 +1312,13 @@ void DGMethod::assemble_system2 () // ``fe_v_face_neighbor'' as case 4 // does not occur. hp::FEValues fe_v_x ( - mapping_collection, fe_collection, quadratures, update_flags); + hp::StaticMappingQ1::mapping_collection, fe_collection, quadratures, update_flags); hp::FEFaceValues fe_v_face_x ( - mapping_collection, fe_collection, face_quadratures, face_update_flags); + hp::StaticMappingQ1::mapping_collection, fe_collection, face_quadratures, face_update_flags); hp::FESubfaceValues fe_v_subface_x ( - mapping_collection, fe_collection, face_quadratures, face_update_flags); + hp::StaticMappingQ1::mapping_collection, fe_collection, face_quadratures, face_update_flags); hp::FEFaceValues fe_v_face_neighbor_x ( - mapping_collection, fe_collection, face_quadratures, neighbor_face_update_flags); + hp::StaticMappingQ1::mapping_collection, fe_collection, face_quadratures, neighbor_face_update_flags); const unsigned int max_dofs_per_cell = fe_collection.max_dofs_per_cell (); @@ -1619,7 +1608,7 @@ void DGMethod::refine_grid () // gradient_indicator); for (unsigned int i=0; i