From: heltai <heltai@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 8 Jan 2014 09:29:32 +0000 (+0000)
Subject: Merged from trunk.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e1fa06817e198b2223f37b34768134cb8afde3c;p=dealii-svn.git

Merged from trunk.

git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@32177 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/doc/publications/index.html b/deal.II/doc/publications/index.html
index cbcfc73874..8850757a45 100644
--- a/deal.II/doc/publications/index.html
+++ b/deal.II/doc/publications/index.html
@@ -5,7 +5,7 @@
   <head>
     <link href="../screen.css" rel="StyleSheet" media="screen">
     <title>The deal.II Publication List</title>
-    <meta name="copyright" content="Copyright (C) 1998 - 2013 by the deal.II Authors">
+    <meta name="copyright" content="Copyright (C) 1998 - 2014 by the deal.II Authors">
     <meta name="keywords" content="dealII publications">
     <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
     <style type="text/css">
@@ -280,6 +280,14 @@
 	  Powder Technology, vol. 253, pp. 311-324, 2014.
         </li>
 
+	<li> C.-C. Chueh, A. Bertei, J. Pharoah, C. Nicolella
+ 	  <br>
+	  <strong>Effective Conductivity in Random Porous Media with Convex and Non-Convex Porosity
+	  </strong>
+	  <br>
+	  International Journal of Heat and Mass Transfer, vol. 71, pp. 183-188, 2014.
+        </li>
+
 	<li> T. Wick, G. Singh, M.F. Wheeler
  	  <br>
 	  <strong>Pressurized-Fracture propagation using a phase-field approach coupled to a reservoir simulator
diff --git a/deal.II/include/deal.II/grid/grid_refinement.h b/deal.II/include/deal.II/grid/grid_refinement.h
index 50564a586b..20162cd07d 100644
--- a/deal.II/include/deal.II/grid/grid_refinement.h
+++ b/deal.II/include/deal.II/grid/grid_refinement.h
@@ -60,7 +60,7 @@ namespace GridRefinement
    *
    * <ol>
    *
-   *  <li> Sort the cells according to descenting values of @p criteria.
+   *  <li> Sort the cells according to descending values of @p criteria.
    *
    *  <li> Set the refinement threshold to be the criterion belonging to
    *  the cell at position @p top_fraction_of_cells times
diff --git a/deal.II/include/deal.II/numerics/vector_tools.templates.h b/deal.II/include/deal.II/numerics/vector_tools.templates.h
index bd85dd0cb0..8d2ed0861c 100644
--- a/deal.II/include/deal.II/numerics/vector_tools.templates.h
+++ b/deal.II/include/deal.II/numerics/vector_tools.templates.h
@@ -2885,7 +2885,7 @@ namespace VectorTools
               fe_index_old = fe_index;
               fe_index += fe.element_multiplicity (i) * fe.base_element (i).n_components ();
 
-              if (fe_index >= first_vector_component)
+              if (fe_index > first_vector_component)
                 break;
             }
 
@@ -2946,8 +2946,8 @@ namespace VectorTools
                  && (fe.base_element (base_indices.first).face_to_cell_index (line * fe.degree, face)
                      <= fe.system_to_base_index (fe.face_to_cell_index (i, face)).second)
                  && (fe.system_to_base_index (fe.face_to_cell_index (i, face)).second
-                     <= fe.base_element (base_indices.first).face_to_cell_index
-                     ((line + 1) * fe.degree - 1, face)))
+                     < fe.base_element (base_indices.first).face_to_cell_index
+                     ((line + 1) * fe.degree, face)))
                 || ((dynamic_cast<const FE_Nedelec<dim>*> (&fe) != 0) && (line * fe.degree <= i)
                     && (i < (line + 1) * fe.degree)))
               {
@@ -3027,7 +3027,7 @@ namespace VectorTools
               fe_index_old = fe_index;
               fe_index += fe.element_multiplicity (i) * fe.base_element (i).n_components ();
 
-              if (fe_index >= first_vector_component)
+              if (fe_index > first_vector_component)
                 break;
             }
 
diff --git a/deal.II/source/multigrid/mg_tools.cc b/deal.II/source/multigrid/mg_tools.cc
index 85bf569a4f..7321c64d2e 100644
--- a/deal.II/source/multigrid/mg_tools.cc
+++ b/deal.II/source/multigrid/mg_tools.cc
@@ -1502,7 +1502,7 @@ namespace MGTools
   template <int dim, int spacedim>
   void
   extract_non_interface_dofs (const DoFHandler<dim,spacedim> &mg_dof_handler,
-                              std::vector<std::set<unsigned int> >  &non_interface_dofs)
+                              std::vector<std::set<types::global_dof_index> >  &non_interface_dofs)
   {
     Assert (non_interface_dofs.size() == mg_dof_handler.get_tria().n_global_levels(),
             ExcDimensionMismatch (non_interface_dofs.size(),
