From b3b2864fea1994f5f43b0f4dd0f4dd117e16f715 Mon Sep 17 00:00:00 2001
From: heltai <heltai@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 29 Aug 2007 15:58:10 +0000
Subject: [PATCH] Updated heltai's contributions

git-svn-id: https://svn.dealii.org/trunk@15088 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/deal.II/include/grid/grid_generator.h |  2 +-
 deal.II/deal.II/include/grid/grid_in.h        | 15 +++++++++------
 deal.II/doc/authors.html                      | 11 ++++++++---
 deal.II/lac/include/lac/solver_minres.h       |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/deal.II/deal.II/include/grid/grid_generator.h b/deal.II/deal.II/include/grid/grid_generator.h
index b28fe3e837..c1fd6359bf 100644
--- a/deal.II/deal.II/include/grid/grid_generator.h
+++ b/deal.II/deal.II/include/grid/grid_generator.h
@@ -45,7 +45,7 @@ template <typename number> class SparseMatrix;
  *
  * @ingroup grid
  * @author Wolfgang Bangerth, Ralf Hartmann, Guido Kanschat, Stefan
- * Nauber, Joerg Weimar, Yaqi Wang, 1998, 1999, 2000, 2001, 2002,
+ * Nauber, Joerg Weimar, Yaqi Wang, Luca Heltai, 1998, 1999, 2000, 2001, 2002,
  * 2003, 2006, 2007.
  */
 class GridGenerator
diff --git a/deal.II/deal.II/include/grid/grid_in.h b/deal.II/deal.II/include/grid/grid_in.h
index ab850bc110..0b526f7ee5 100644
--- a/deal.II/deal.II/include/grid/grid_in.h
+++ b/deal.II/deal.II/include/grid/grid_in.h
@@ -119,10 +119,13 @@ class SubCellData;
  * can read in several example files. If the reader does not grok your files,
  * it should be fairly simple to extend it.
  *
- * <li> <tt>Gmsh mesh</tt> format: this format is used by the @p GMSH
- * mesh generator (see http://www.geuz.org/gmsh/ ). The documentation
- * in the @p GMSH manual explains how to generate meshes compatible with
- * the deal.II library (i.e. quads rather than triangles).
+ * <li> <tt>Gmsh 1.0 mesh</tt> format: this format is used by the @p
+ * GMSH mesh generator (see http://www.geuz.org/gmsh/ ). The
+ * documentation in the @p GMSH manual explains how to generate meshes
+ * compatible with the deal.II library (i.e. quads rather than
+ * triangles). In order to use this format, Gmsh has to output the
+ * file in the old format 1.0. This is done adding the line
+ * "Mesh.MshFileVersion = 1" to the input file.
  *
  * <li> <tt>Tecplot</tt> format: this format is used by @p TECPLOT and often
  * serves as a basis for data exchange between different applications. Note,
@@ -133,7 +136,7 @@ class SubCellData;
  * Cubit at this time. However, Cubit can export in UCD format using a simple
  * plugin, and the resulting UCD file can then be read by this class. The
  * plugin script can be found on the deal.II wiki page,
- * http://www-dimat.unipv.it/heltai/wikideal/index.php/Main_Page, in the
+ * http://www-dimat.unipv.it/heltai/wikideal/, in the
  * section on external tools.
  * </ul>
  *
@@ -193,7 +196,7 @@ class SubCellData;
  *
  * @ingroup grid
  * @ingroup input
- * @author Wolfgang Bangerth, 1998, 2000, Luca Heltai, 2004
+ * @author Wolfgang Bangerth, 1998, 2000, Luca Heltai, 2004, 2007
  */
 template <int dim>
 class GridIn
diff --git a/deal.II/doc/authors.html b/deal.II/doc/authors.html
index c5bd41e2e4..e4a40a724a 100644
--- a/deal.II/doc/authors.html
+++ b/deal.II/doc/authors.html
@@ -64,12 +64,17 @@ alphabetical order):
 	random fixes and enhancements.
 
 <li><em>Luca Heltai:</em>
-    Gmsh format mesh reader; &nbsp; 
-    integration of the function parser library.
+    Gmsh format mesh reader and writer; &nbsp;
+    some of the meshes in the GridGenerator class; &nbsp;
+    generalization of FilteredMatrix; &nbsp;
+    integration of the function parser library; &nbsp;
+    cubit journal file to export to ucd mesh format; &nbsp;
+    FEFunction and ParsedFunction classes; &nbsp;
+    random bug fixes and enhancements.
 
 <li><em>Oliver Kayser-Herold:</em>
     Lots of work on hp finite elements; &nbsp;
-    integration of PETSc's LU decomposition; &nbsp
+    integration of PETSc's LU decomposition; &nbsp;
 	hanging node constraints for higher order elements in 3d.
 
 <li><em>Benjamin Shelton Kirk:</em>
diff --git a/deal.II/lac/include/lac/solver_minres.h b/deal.II/lac/include/lac/solver_minres.h
index 24b9b316e0..6cd97f9ee4 100644
--- a/deal.II/lac/include/lac/solver_minres.h
+++ b/deal.II/lac/include/lac/solver_minres.h
@@ -53,7 +53,7 @@ DEAL_II_NAMESPACE_OPEN
  * The full text can be found at
  * <tt>http://scholar.lib.vt.edu/theses/public/etd-12164379662151/etd-title.html</tt>
  *
- * @author Thomas Richter, 2000
+ * @author Thomas Richter, 2000, Luca Heltai, 2006
  */
 template <class VECTOR = Vector<double> >
 class SolverMinRes : public Solver<VECTOR>
-- 
2.39.5