From: kanschat Date: Wed, 25 Nov 2009 06:45:10 +0000 (+0000) Subject: consistency bug removed X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6a9bdb8b9b094805047c583083926bad02aace3;p=dealii-svn.git consistency bug removed git-svn-id: https://svn.dealii.org/trunk@20165 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/examples/step-39/step-39.cc b/deal.II/examples/step-39/step-39.cc index 1ab4b2f563..20e4163ac2 100644 --- a/deal.II/examples/step-39/step-39.cc +++ b/deal.II/examples/step-39/step-39.cc @@ -111,7 +111,7 @@ void MatrixIntegrator::cell(typename MeshWorker::IntegrationWorker::Ce for (unsigned int k=0; k::bdry(typename MeshWorker::IntegrationWorker::Fa { const FEFaceValuesBase& fe = info.fe(); FullMatrix& local_matrix = info.M1[0].matrix; - + const unsigned int deg = fe.get_fe().tensor_degree(); const double penalty = 2. * deg * (deg+1) * info.face->measure() / info.cell->measure(); @@ -139,37 +139,38 @@ template void MatrixIntegrator::face(typename MeshWorker::IntegrationWorker::FaceInfo& info1, typename MeshWorker::IntegrationWorker::FaceInfo& info2) const { - const FEFaceValuesBase& fe = info1.fe(); + const FEFaceValuesBase& fe1 = info1.fe(); + const FEFaceValuesBase& fe2 = info2.fe(); FullMatrix& matrix_v1u1 = info1.M1[0].matrix; FullMatrix& matrix_v1u2 = info1.M2[0].matrix; FullMatrix& matrix_v2u1 = info2.M2[0].matrix; FullMatrix& matrix_v2u2 = info2.M1[0].matrix; - const unsigned int deg = fe.get_fe().tensor_degree(); + const unsigned int deg = fe1.get_fe().tensor_degree(); const double penalty1 = deg * (deg+1) * info1.face->measure() / info1.cell->measure(); const double penalty2 = deg * (deg+1) * info2.face->measure() / info2.cell->measure(); const double penalty = penalty1 + penalty2; - for (unsigned k=0;k::run(unsigned int n_steps) deallog << ' ' << dof_handler.n_dofs(l); deallog << std::endl; + deallog << "Assemble matrix" << std::endl; assemble_matrix(); + deallog << "Assemble multilevel matrix" << std::endl; assemble_mg_matrix(); + deallog << "Assemble right hand side" << std::endl; assemble_right_hand_side(); solve(); @@ -509,7 +513,7 @@ Step39::run(unsigned int n_steps) int main() { - FE_Q<2> dgq1(1); + FE_DGQ<2> dgq1(1); Step39<2> test1(dgq1); test1.run(7); }