From: Baerbel Jannsen Date: Thu, 26 Aug 2010 15:55:24 +0000 (+0000) Subject: change the MGConstraints to MGConstrainedDoFs X-Git-Tag: v8.0.0~5664 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39920cfba474723d9352bf4648e8bd23597071f9;p=dealii.git change the MGConstraints to MGConstrainedDoFs git-svn-id: https://svn.dealii.org/trunk@21734 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/numerics/mesh_worker_assembler.h b/deal.II/deal.II/include/numerics/mesh_worker_assembler.h index b70558904f..dddff77ecb 100644 --- a/deal.II/deal.II/include/numerics/mesh_worker_assembler.h +++ b/deal.II/deal.II/include/numerics/mesh_worker_assembler.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include DEAL_II_NAMESPACE_OPEN @@ -560,7 +560,7 @@ namespace MeshWorker * Initialize the multilevel * constraints. */ - void initialize(const MGConstraints& mg_constraints); + void initialize(const MGConstrainedDoFs& mg_constrained_dofs); /** * Initialize the matrices @@ -693,7 +693,7 @@ namespace MeshWorker /** * A pointer to the object containing constraints. */ - SmartPointer > mg_constraints; + SmartPointer > mg_constrained_dofs; /** * The smallest positive @@ -1445,9 +1445,9 @@ namespace MeshWorker template inline void - MGMatrixSimple::initialize(const MGConstraints& c) + MGMatrixSimple::initialize(const MGConstrainedDoFs& c) { - mg_constraints = &c; + mg_constrained_dofs = &c; } template @@ -1493,7 +1493,7 @@ namespace MeshWorker AssertDimension(M.m(), i1.size()); AssertDimension(M.n(), i2.size()); - if(mg_constraints == 0) + if(mg_constrained_dofs == 0) { for (unsigned int j=0; j= threshold) - if(mg_constraints->at_refinement_edge(level, i1[j])==false && - mg_constraints->at_refinement_edge(level, i2[k])==false) - if((mg_constraints->is_boundary_index(level, i1[j])==false && - mg_constraints->is_boundary_index(level, i2[k])==false) + if(mg_constrained_dofs->at_refinement_edge(level, i1[j])==false && + mg_constrained_dofs->at_refinement_edge(level, i2[k])==false) + if((mg_constrained_dofs->is_boundary_index(level, i1[j])==false && + mg_constrained_dofs->is_boundary_index(level, i2[k])==false) || - (mg_constraints->is_boundary_index(level, i1[j])==true && - mg_constraints->is_boundary_index(level, i2[k])==true + (mg_constrained_dofs->is_boundary_index(level, i1[j])==true && + mg_constrained_dofs->is_boundary_index(level, i2[k])==true && i1[j] == i2[k]) ) @@ -1531,7 +1531,7 @@ namespace MeshWorker AssertDimension(M.m(), i1.size()); AssertDimension(M.n(), i2.size()); - if(mg_constraints == 0) + if(mg_constrained_dofs == 0) { for (unsigned int j=0; j= threshold) - if(mg_constraints->at_refinement_edge(level, i1[j])==true && - mg_constraints->at_refinement_edge(level, i2[k])==false) - if((mg_constraints->at_refinement_edge_boundary(level, i1[j])==false && - mg_constraints->at_refinement_edge_boundary(level, i2[k])==false) + if(mg_constrained_dofs->at_refinement_edge(level, i1[j])==true && + mg_constrained_dofs->at_refinement_edge(level, i2[k])==false) + if((mg_constrained_dofs->at_refinement_edge_boundary(level, i1[j])==false && + mg_constrained_dofs->at_refinement_edge_boundary(level, i2[k])==false) || - (mg_constraints->at_refinement_edge_boundary(level, i1[j])==true && - mg_constraints->at_refinement_edge_boundary(level, i2[k])==true + (mg_constrained_dofs->at_refinement_edge_boundary(level, i1[j])==true && + mg_constrained_dofs->at_refinement_edge_boundary(level, i2[k])==true && i1[j] == i2[k]) ) @@ -1569,7 +1569,7 @@ namespace MeshWorker AssertDimension(M.n(), i1.size()); AssertDimension(M.m(), i2.size()); - if(mg_constraints == 0) + if(mg_constrained_dofs == 0) { for (unsigned int j=0; j= threshold) - if(mg_constraints->at_refinement_edge(level, i1[j])==true && - mg_constraints->at_refinement_edge(level, i2[k])==false) - if((mg_constraints->at_refinement_edge_boundary(level, i1[j])==false && - mg_constraints->at_refinement_edge_boundary(level, i2[k])==false) + if(mg_constrained_dofs->at_refinement_edge(level, i1[j])==true && + mg_constrained_dofs->at_refinement_edge(level, i2[k])==false) + if((mg_constrained_dofs->at_refinement_edge_boundary(level, i1[j])==false && + mg_constrained_dofs->at_refinement_edge_boundary(level, i2[k])==false) || - (mg_constraints->at_refinement_edge_boundary(level, i1[j])==true && - mg_constraints->at_refinement_edge_boundary(level, i2[k])==true + (mg_constrained_dofs->at_refinement_edge_boundary(level, i1[j])==true && + mg_constrained_dofs->at_refinement_edge_boundary(level, i2[k])==true && i1[j] == i2[k]) ) @@ -1603,7 +1603,7 @@ namespace MeshWorker { const unsigned int level = info.cell->level(); assemble((*matrix)[level], info.matrix(0,false).matrix, info.indices, info.indices, level); - if(mg_constraints != 0) + if(mg_constrained_dofs != 0) { assemble_transpose((*interface_down)[level],info.matrix(0,false).matrix, info.indices, info.indices, level); assemble_down((*interface_up)[level], info.matrix(0,false).matrix, info.indices, info.indices, level); @@ -1622,7 +1622,7 @@ namespace MeshWorker if (level1 == level2) { - if(mg_constraints == 0) + if(mg_constrained_dofs == 0) { assemble((*matrix)[level1], info1.matrix(0,false).matrix, info1.indices, info1.indices); assemble((*matrix)[level1], info1.matrix(0,true).matrix, info1.indices, info2.indices);