]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
changes in include/deal.II/multigrid/mg_coarse.h and include/deal.II/multigrid/mg_con...
authorkainan.wang <kainan.wang@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 18 Feb 2013 01:54:48 +0000 (01:54 +0000)
committerkainan.wang <kainan.wang@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 18 Feb 2013 01:54:48 +0000 (01:54 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28450 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/files
deal.II/include/deal.II/multigrid/mg_coarse.h
deal.II/include/deal.II/multigrid/mg_constrained_dofs.h

index 782de750ca9164367b7788276be9f2338f26a9b0..4c1472e0610132552ffb94461f60f44fb9f86a90 100644 (file)
@@ -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
index 8cfc4eb7d2c300a07261ac25be13fc37409c5ed4..8d906eb3990b0b36ff9b2b7b3ab38b88b6c1c225 100644 (file)
@@ -308,9 +308,9 @@ MGCoarseGridHouseholder<number, VECTOR>::initialize(
 template<typename number, class VECTOR>
 void
 MGCoarseGridHouseholder<number, VECTOR>::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<number, VECTOR>::initialize(
 template<typename number, class VECTOR>
 void
 MGCoarseGridSVD<number, VECTOR>::operator() (
-  const unsigned int,
-  VECTOR       &dst,
-  const VECTOR &src) const
+                                            const unsigned int /*level*/,
+                                            VECTOR       &dst,
+                                            const VECTOR &src) const
 {
   matrix.vmult(dst, src);
 }
index c442ae7d671a7c3d103236fc2dbd08d6c67a9bd9..5587527497f2d94a197341b1e84b9260cadb617e 100644 (file)
@@ -35,6 +35,8 @@ template <int dim> struct FunctionMap;
 class MGConstrainedDoFs : public Subscriptor
 {
 public:
+       
+  typedef std::vector<std::set<types::global_dof_index> >::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<std::set<unsigned int> > &
+  const std::vector<std::set<types::global_dof_index> > &
   get_boundary_indices () const;
 
   /**
@@ -111,7 +113,7 @@ public:
    * level that lie on the boundary of the
    * domain.
    */
-  const std::vector<std::set<unsigned int> > &
+  const std::vector<std::set<types::global_dof_index> > &
   get_non_refinement_edge_indices () const;
 
   /**
@@ -152,7 +154,7 @@ private:
    * The indices of boundary dofs
    * for each level.
    */
-  std::vector<std::set<unsigned int> > boundary_indices;
+  std::vector<std::set<types::global_dof_index> > boundary_indices;
 
   /**
    * The degrees of freedom on egdges
@@ -160,7 +162,7 @@ private:
    * refinement edge between a
    * level and coarser cells.
    */
-  std::vector<std::set<unsigned int> > non_refinement_edge_indices;
+  std::vector<std::set<types::global_dof_index> > 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<std::set<unsigned int> > &
+const std::vector<std::set<types::global_dof_index> > &
 MGConstrainedDoFs::get_boundary_indices () const
 {
   return boundary_indices;
 }
 
 inline
-const std::vector<std::set<unsigned int> > &
+const std::vector<std::set<types::global_dof_index> > &
 MGConstrainedDoFs::get_non_refinement_edge_indices () const
 {
   return non_refinement_edge_indices;

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.