From: kainan.wang Date: Mon, 18 Feb 2013 01:54:48 +0000 (+0000) Subject: changes in include/deal.II/multigrid/mg_coarse.h and include/deal.II/multigrid/mg_con... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afaa21eb93cdb8fd81bb5321419650aef934603e;p=dealii-svn.git changes in include/deal.II/multigrid/mg_coarse.h and include/deal.II/multigrid/mg_constrained_dofs.h git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28450 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/files b/deal.II/files index 782de750ca..4c1472e061 100644 --- a/deal.II/files +++ b/deal.II/files @@ -485,10 +485,10 @@ WOLFGANG include/deal.II/meshworker/output.h BRUNO include/deal.II/meshworker/simple.h BRUNO include/deal.II/meshworker/vector_selector.h BRUNO include/deal.II/meshworker/vector_selector.templates.h -include/deal.II/multigrid/mg_base.h -include/deal.II/multigrid/mg_block_smoother.h -include/deal.II/multigrid/mg_coarse.h -include/deal.II/multigrid/mg_constrained_dofs.h +KAINAN include/deal.II/multigrid/mg_base.h +KAINAN include/deal.II/multigrid/mg_block_smoother.h +KAINAN include/deal.II/multigrid/mg_coarse.h +KAINAN include/deal.II/multigrid/mg_constrained_dofs.h include/deal.II/multigrid/mg_dof_accessor.h include/deal.II/multigrid/mg_dof_handler.h include/deal.II/multigrid/mg_dof_iterator_selector.h diff --git a/deal.II/include/deal.II/multigrid/mg_coarse.h b/deal.II/include/deal.II/multigrid/mg_coarse.h index 8cfc4eb7d2..8d906eb399 100644 --- a/deal.II/include/deal.II/multigrid/mg_coarse.h +++ b/deal.II/include/deal.II/multigrid/mg_coarse.h @@ -308,9 +308,9 @@ MGCoarseGridHouseholder::initialize( template void MGCoarseGridHouseholder::operator() ( - const unsigned int, - VECTOR &dst, - const VECTOR &src) const + const unsigned int /*level*/, + VECTOR &dst, + const VECTOR &src) const { householder.least_squares(dst, src); } @@ -339,9 +339,9 @@ MGCoarseGridSVD::initialize( template void MGCoarseGridSVD::operator() ( - const unsigned int, - VECTOR &dst, - const VECTOR &src) const + const unsigned int /*level*/, + VECTOR &dst, + const VECTOR &src) const { matrix.vmult(dst, src); } diff --git a/deal.II/include/deal.II/multigrid/mg_constrained_dofs.h b/deal.II/include/deal.II/multigrid/mg_constrained_dofs.h index c442ae7d67..5587527497 100644 --- a/deal.II/include/deal.II/multigrid/mg_constrained_dofs.h +++ b/deal.II/include/deal.II/multigrid/mg_constrained_dofs.h @@ -35,6 +35,8 @@ template struct FunctionMap; class MGConstrainedDoFs : public Subscriptor { public: + + typedef std::vector >::size_type size_dof; /** * Fill the internal data * structures with values @@ -72,7 +74,7 @@ public: * constraint. */ bool is_boundary_index (const unsigned int level, - const unsigned int index) const; + const types::global_dof_index index) const; /** * Determine whether a dof index @@ -80,14 +82,14 @@ public: * a refinement edge. */ bool non_refinement_edge_index (const unsigned int level, - const unsigned int index) const; + const types::global_dof_index index) const; /** * Determine whether a dof index * is at the refinement edge. */ bool at_refinement_edge (const unsigned int level, - const unsigned int index) const; + const types::global_dof_index index) const; /** * Determine whether a dof index @@ -96,14 +98,14 @@ public: * constraint . */ bool at_refinement_edge_boundary (const unsigned int level, - const unsigned int index) const; + const types::global_dof_index index) const; /** * Return the indices of dofs for each * level that lie on the boundary of the * domain. */ - const std::vector > & + const std::vector > & get_boundary_indices () const; /** @@ -111,7 +113,7 @@ public: * level that lie on the boundary of the * domain. */ - const std::vector > & + const std::vector > & get_non_refinement_edge_indices () const; /** @@ -152,7 +154,7 @@ private: * The indices of boundary dofs * for each level. */ - std::vector > boundary_indices; + std::vector > boundary_indices; /** * The degrees of freedom on egdges @@ -160,7 +162,7 @@ private: * refinement edge between a * level and coarser cells. */ - std::vector > non_refinement_edge_indices; + std::vector > non_refinement_edge_indices; /** * The degrees of freedom on the @@ -252,7 +254,7 @@ MGConstrainedDoFs::clear() inline bool MGConstrainedDoFs::is_boundary_index (const unsigned int level, - const unsigned int index) const + const types::global_dof_index index) const { AssertIndexRange(level, boundary_indices.size()); if (boundary_indices[level].find(index) != boundary_indices[level].end()) @@ -264,7 +266,7 @@ MGConstrainedDoFs::is_boundary_index (const unsigned int level, inline bool MGConstrainedDoFs::non_refinement_edge_index (const unsigned int level, - const unsigned int index) const + const types::global_dof_index index) const { AssertIndexRange(level, non_refinement_edge_indices.size()); @@ -277,7 +279,7 @@ MGConstrainedDoFs::non_refinement_edge_index (const unsigned int level, inline bool MGConstrainedDoFs::at_refinement_edge (const unsigned int level, - const unsigned int index) const + const types::global_dof_index index) const { AssertIndexRange(level, refinement_edge_indices.size()); AssertIndexRange(index, refinement_edge_indices[level].size()); @@ -289,7 +291,7 @@ MGConstrainedDoFs::at_refinement_edge (const unsigned int level, inline bool MGConstrainedDoFs::at_refinement_edge_boundary (const unsigned int level, - const unsigned int index) const + const types::global_dof_index index) const { AssertIndexRange(level, refinement_edge_boundary_indices.size()); AssertIndexRange(index, refinement_edge_boundary_indices[level].size()); @@ -298,14 +300,14 @@ MGConstrainedDoFs::at_refinement_edge_boundary (const unsigned int level, } inline -const std::vector > & +const std::vector > & MGConstrainedDoFs::get_boundary_indices () const { return boundary_indices; } inline -const std::vector > & +const std::vector > & MGConstrainedDoFs::get_non_refinement_edge_indices () const { return non_refinement_edge_indices;