From fe61dd4f763f617a0c251a1fdf5cc41df97c51e1 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Tue, 24 Apr 2018 16:19:36 +0200 Subject: [PATCH] Capitalize Gmsh appropriately --- cmake/modules/FindGMSH.cmake | 2 +- include/deal.II/base/config.h.in | 2 +- include/deal.II/grid/grid_in.h | 6 +++--- include/deal.II/grid/grid_out.h | 14 +++++++------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmake/modules/FindGMSH.cmake b/cmake/modules/FindGMSH.cmake index 5108d784d4..769c4b512e 100644 --- a/cmake/modules/FindGMSH.cmake +++ b/cmake/modules/FindGMSH.cmake @@ -21,7 +21,7 @@ # GMSH_EXECUTABLE # -SET(GMSH_DIR "" CACHE PATH "An optional hint to a GMSH installation containing the gmsh executable") +SET(GMSH_DIR "" CACHE PATH "An optional hint to a Gmsh installation containing the gmsh executable") SET_IF_EMPTY(GMSH_DIR "$ENV{GMSH_DIR}") DEAL_II_FIND_PROGRAM(GMSH_EXE gmsh${CMAKE_EXECUTABLE_SUFFIX} diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index 151371bdc4..ee542a1f62 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -200,7 +200,7 @@ /* - * gmsh: + * Gmsh: */ #ifdef DEAL_II_WITH_GMSH # define DEAL_II_GMSH_EXECUTABLE_PATH "@GMSH_EXECUTABLE@" diff --git a/include/deal.II/grid/grid_in.h b/include/deal.II/grid/grid_in.h index ea801023f6..2bdb215258 100644 --- a/include/deal.II/grid/grid_in.h +++ b/include/deal.II/grid/grid_in.h @@ -139,8 +139,8 @@ template struct CellData; * several example files. If the reader does not grok your files, it should be * fairly simple to extend it. * - *
  • Gmsh 1.0 mesh format: this format is used by the @p GMSH mesh - * generator (see http://www.geuz.org/gmsh/). The documentation in the @p GMSH + *
  • Gmsh 1.0 mesh 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 @@ -435,7 +435,7 @@ public: /** * Read grid data from an msh file, either version 1 or version 2 of that - * file format. The GMSH formats are documented at + * file format. The Gmsh formats are documented at * http://www.geuz.org/gmsh/. * * @note The input function of deal.II does not distinguish between newline diff --git a/include/deal.II/grid/grid_out.h b/include/deal.II/grid/grid_out.h index ffb732022c..144e7dffc8 100644 --- a/include/deal.II/grid/grid_out.h +++ b/include/deal.II/grid/grid_out.h @@ -924,7 +924,7 @@ public: /** * Write the triangulation in the msh format. * - * Msh is the format used by Gmsh and it is described in the gmsh user's + * Msh is the format used by Gmsh and it is described in the Gmsh user's * guide. Besides the usual output of the grid only, you can decide through * additional flags (see below, and the documentation of the * GridOutFlags::Msh() class) whether boundary faces with non-zero boundary @@ -1172,7 +1172,7 @@ public: void set_flags (const GridOutFlags::DX &flags); /** - * Set flags for GMSH output + * Set flags for Gmsh output */ void set_flags (const GridOutFlags::Msh &flags); @@ -1303,7 +1303,7 @@ private: GridOutFlags::DX dx_flags; /** - * Flags for GMSH output. Can be changed by using the set_flags(const + * Flags for Gmsh output. Can be changed by using the set_flags(const * GridOutFlags::Msh&) function. */ GridOutFlags::Msh msh_flags; @@ -1368,7 +1368,7 @@ private: * printed which are on the boundary and which have a boundary indicator not * equal to zero, since the latter is the default for boundary faces. * - * Since, in GMSH, geometric elements are continuously numbered, this + * Since, in Gmsh, geometric elements are continuously numbered, this * function requires a parameter @p next_element_index providing the next * geometric element number. This index should have a numerical value equal * to one more than the index previously used to write a geometric element @@ -1378,7 +1378,7 @@ private: * * @warning @p next_element_index should be (at least) one larger than the * current number of triangulation elements (lines, cells, faces) that have - * been written to @p out. GMSH will not load the saved file correctly if + * been written to @p out. Gmsh will not load the saved file correctly if * there are repeated indices. * * This function unfortunately can not be included in the regular @p @@ -1421,7 +1421,7 @@ private: * printed which are on the boundary and which have a boundary indicator not * equal to zero, since the latter is the default for boundary faces. * - * Since, in GMSH, geometric elements are continuously numbered, this + * Since, in Gmsh, geometric elements are continuously numbered, this * function requires a parameter @p next_element_index providing the next * geometric element number. This index should have a numerical value equal * to one more than the index previously used to write a geometric element @@ -1431,7 +1431,7 @@ private: * * @warning @p next_element_index should be (at least) one larger than the * current number of triangulation elements (lines, cells, faces) that have - * been written to @p out. GMSH will not load the saved file correctly if + * been written to @p out. Gmsh will not load the saved file correctly if * there are repeated indices. * * This function unfortunately can not be included in the regular @p -- 2.39.5