From d7a5f50b8960cfd3236138742cb75ba1b072e71b Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 28 Dec 2008 10:37:10 +0000
Subject: [PATCH] *** empty log message ***
---
Common/OpenFile.cpp | 2 +-
doc/texinfo/gmsh.texi | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index 8aef3223a7..e21234a9da 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -360,7 +360,7 @@ int MergeFile(const char *name, int warn_if_missing)
CTX.geom.draw = 1;
if(!strncmp(header, "$PTS", 4) || !strncmp(header, "$NO", 3) ||
!strncmp(header, "$PARA", 5) || !strncmp(header, "$ELM", 4) ||
- !strncmp(header, "$MeshFormat", 11)) {
+ !strncmp(header, "$MeshFormat", 11) || !strncmp(header, "$Comments", 9)) {
status = model->readMSH(name);
#if !defined(HAVE_NO_POST)
if(status > 1) status = PView::readMSH(name);
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 67d0b1b7f4..4a51d96704 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -549,8 +549,8 @@ preceding rule.
@findex /*, */
@findex //
-All parsed input files (@file{.geo}, @file{.pos}) support both C and C++
-style comments:
+All parsed input files (@file{.geo}) support both C and C++ style
+comments:
@enumerate
@item
@@ -563,9 +563,10 @@ These commands won't have the described effects inside double quotes or
inside keywords. Also note that `white space' (spaces, tabs, new line
characters) is ignored inside all expressions.
-You can add comments in a mesh file (@file{.msh}) by creating a section
-with an unrecognized label (e.g. @code{$Comments}/@code{$EndComments}):
-see @ref{MSH ASCII file format}.
+You can add comments in a mesh file (@file{.msh}) by adding a section
+with an unrecognized label (e.g., @code{$Comments}/@code{$EndComments})
+after the @code{$MeshFormat}/@code{$EndMeshFormat} section: see @ref{MSH
+ASCII file format}.
@c =========================================================================
@c General tools
@@ -2992,7 +2993,8 @@ information about the file (@code{$MeshFormat}), followed by several
optional sections defining the nodes (@code{$Nodes}), elements
(@code{$Elements}), region names (@code{$PhysicalName}) and
post-processing datasets (@code{$NodeData}, @code{$ElementData},
-@code{$ElementNodeData}). Sections can be repeated in the same file, and
+@code{$ElementNodeData}). Any section with an unrecognized header is
+simply ignored. Sections can be repeated in the same file, and
post-processing sections can be put into separate files (e.g. one file
per time step).
--
GitLab