small corrections

benchmarks/extrude/vianew.geo

@@ -82,29 +82,28 @@ Transfinite Surface {28} = {  2,  3, 14, 13};
 Transfinite Surface {30} = {  3,  4,  5, 14};
 Transfinite Surface {32} = {  5,  6, 15, 14};
 Transfinite Surface {34} = {  6,  7,  8, 15};
-Transfinite Surface {36} = {  8,  9, 16, 15};
+Transfinite Surface {36} = {  15, 16, 9, 8};
+//Transfinite Surface {36} = {  8,  9, 16, 15}; causes swapping to fail in non-recombined case...
 Transfinite Surface {38} = {  9, 10, 11, 16};
 Transfinite Surface {40} = { 11, 12, 13, 16};
 Transfinite Surface {42} = { 13, 14, 15, 16};
 
-Recombine Surface {26,28,30,32,34,36,38,40,42};
-
 // number of layers:
 NLdn = 8;
 NLup = 3;
 
 // extrude down first:
-Extrude Surface {42, {0,0,-A*L}}{ Layers { {NLdn}, {9001}, {1} } ; Recombine; };
+Extrude Surface {42, {0,0,-A*L}}{ Layers { {NLdn}, {9001}, {1} } ; };
 // extrude up second:
-Extrude Surface {26, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; Recombine;};
-Extrude Surface {28, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; Recombine;};
-Extrude Surface {30, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; Recombine;};
-Extrude Surface {32, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; Recombine;};
-Extrude Surface {34, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; Recombine;};
-Extrude Surface {36, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; Recombine;};
-Extrude Surface {38, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; Recombine;};
-Extrude Surface {40, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; Recombine;};
-Extrude Surface {42, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; Recombine;};
+Extrude Surface {26, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; };
+Extrude Surface {28, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; };
+Extrude Surface {30, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; };
+Extrude Surface {32, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; };
+Extrude Surface {34, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; };
+Extrude Surface {36, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; };
+Extrude Surface {38, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; };
+Extrude Surface {40, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; };
+Extrude Surface {42, {0,0,L}}{ Layers { {NLup}, {9000}, {1} } ; };
 
 // wafer surface including surfaces that are extruded downwards:
 Physical Surface(1001) = {26,28,30,32,34,36,38,40, 51,55,59,63,64};

benchmarks/misc/500views.geo

@@ -2,7 +2,7 @@
 // this tests that we can still load as many views as we want.
 // (even if only 200 are allowed in the GUI)
 
-For i In {0:250}
+For i In {1:250}
 
 Include "../../tutorial/view1.pos" ;
 Include "../../tutorial/view2.pos" ;

demos/anim-all.script

@@ -67,7 +67,7 @@ System "mpeg_encode anim.par" ;
 
 // Call whirlgif
 
-System "whirlgif -loop -o anim.gif anim-*.gif" ;
+System "whirlgif -minimize -loop -o anim.gif anim-*.gif" ;
 
 // Clean-up all temp files
 

demos/anim-seq.script

@@ -87,7 +87,7 @@ System "mpeg_encode anim.par" ;
 
 // Call whirlgif
 
-System "whirlgif -loop -o anim.gif anim-*.gif" ;
+System "whirlgif -minimize -loop -o anim.gif anim-*.gif" ;
 
 // Clean-up all temp files
 

doc/FORMATS

-$Id: FORMATS,v 1.8 2001-03-01 08:04:15 geuzaine Exp $
+$Id: FORMATS,v 1.9 2001-08-31 07:08:47 geuzaine Exp $
 
 This document describes the mesh and post-processing file formats for
 Gmsh, version >= 1.0. 
@@ -46,7 +46,7 @@ The elm-region value is the number of the physical entity to which the
 element belongs.
 
 
-Gmsh Ascii Post-Processing File Format
+Gmsh ASCII Post-Processing File Format
 ======================================
    
 A post-processing file is divided in several sections: one format
@@ -82,7 +82,7 @@ pairs).
 version-number is a floating point number giving the version of
 Gmsh for which the file is destined (e.g. 1.0).
 
-file-type is an integer equal to 0 in the ascii file format.
+file-type is an integer equal to 0 in the ASCII file format.
 
 data-size is an integer equal to the size of the floating point
 numbers used in the file (usually, data-size == sizeof(double)).
@@ -119,8 +119,8 @@ defined as
 Gmsh Binary Post-Processing File Format
 =======================================
 
-The binary post-processing file format is the same as the ascii file format,
-except that:
+The binary post-processing file format is the same as the ASCII file
+format, except that:
 
 1) file-type equals 1.
 
@@ -164,7 +164,7 @@ Gmsh Parsed Post-Processing Format
 
 For testing purposes (or with very small data sets, e.g. in the
 tutorials), there is an additional post-processing format which is
-parsed by the same grammar analyser as the geometry. You can thus, for
+parsed by the same grammar analyzer as the geometry. You can thus, for
 example, embed small post-processing views into your geometrical
 descriptions. The format of the parsed post-processing files is the
 following:
@@ -191,11 +191,11 @@ following:
    vector tetrahedron  VS                12                     12 * nb-time-steps
    tensor tetrahedron  TS                12                     36 * nb-time-steps
 
-Contrary to the ascii post-processing file format, the coordinates are
+Contrary to the ASCII post-processing file format, the coordinates are
 given by node, i.e. (coord1, coord2, coord3) for a point,
 (coord1-node1, coord2-node1, coord3-node1, coord1-node2, coord2-node2,
 coord3-node2) for a line, (coord1-node1, coord2-node1, coord3-node1,
 coord1-node2, coord2-node2, coord3-node2, coord1-node3, coord2-node3,
 coord3-node3) for a triangle, etc. The values are given in the same
-order as for the ascii post-processing file format.
+order as for the ASCII post-processing file format.
 

tutorial/t2.geo

@@ -2,8 +2,8 @@
  *
  *  Gmsh tutorial 2
  * 
- *  Includes, Geometrical transformations, Elementary entities
- *  (Volumes), Physical entities (Volumes)
+ *  Includes, Geometrical transformations, Extruded geometries,
+ *  Elementary entities (Volumes), Physical entities (Volumes)
  *
  *********************************************************************/
 

tutorial/t4.geo

@@ -45,7 +45,7 @@ Lc2 = 0.003 ;
 // Grouping is done, as usual, with parentheses.
 //
 // In addition to these operators, all C mathematical functions can
-// also be used (note the first capital letter):
+// also be used (note the first capital letter), i.e.
 // 
 //   Exp(x)
 //   Log(x)
@@ -65,11 +65,11 @@ Lc2 = 0.003 ;
 //   Floor(x)
 //   Ceil(x)
 //   Fmod(x,y)
-//   Hypot(x,y)
-
-// An additional function 'Rand(x)' generates a random number in [0,x]
+// 
+// as well as a series of other functions:
 //
-//   Rand(x)
+//   Hypot(x,y)   computes Sqrt(x^2+y^2)
+//   Rand(x)      generates a random number in [0,x]
 //
 // The only predefined constant in Gmsh is Pi.
 

tutorial/t5.geo

@@ -14,8 +14,9 @@ lcar3 = .075;
 
 // In order to change these lengths globally (without changing the
 // file), a global scaling factor for all characteristic lengths can
-// be specified on the command line with the option '-clscale'. For
-// example, with:
+// be specified on the command line with the option '-clscale' (or
+// with the option Mesh.CharacteristicLengthFactor). For example,
+// with:
 //
 // > gmsh t5 -clscale 1
 //

tutorial/t9.geo

@@ -16,18 +16,14 @@
 
 Include "view3.pos" ;
 
-// Plugins can be controlled as other options in Gmsh. For example,
-// the CutMap plugin extracts an isovalue surface from a 3D scalar
-// view. The plugin can either be called from the graphical interface
-// (right click on the view button, then Plugins->CutMap), or from
-// the command file, as is shown below.
-
-// This sets the optional parameter A of the CutMap plugin to the
-// value 0.67 (see the About in the graphical interface for the
-// documentation of each plugin), and runs the plugin:
-
-Plugin(CutMap).A = 0.67 ; 
-Plugin(CutMap).iView = 0 ; //select View[0] as the working view
+// Plugins can be controlled in the same way as other options in
+// Gmsh. For example, the CutMap plugin (which extracts an isovalue
+// surface from a 3D scalar view) can either be called from the
+// graphical interface (right click on the view button, then
+// Plugins->CutMap), or from the command file:
+
+Plugin(CutMap).A = 0.67 ; // iso-value level
+Plugin(CutMap).iView = 0 ; // source view is View[0]
 Plugin(CutMap).Run ; 
 
 // The following runs the CutPlane plugin:

tutorial/tutorial.html

 <!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">
 <HTML>
 <HEAD>
-<TITLE>Enscript Output</TITLE>
+<TITLE>Gmsh tutorial</TITLE>
 </HEAD>
 <BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#1F00FF" ALINK="#FF0000" VLINK="#9900DD">
 <A NAME="top">
@@ -23,7 +23,7 @@
 <H1>README 1/10</H1>
 [<A HREF="#top">top</A>][prev][<A HREF="#file2">next</A>]
 <PRE>
-$Id: tutorial.html,v 1.20 2001-08-18 12:43:41 geuzaine Exp $
+$Id: tutorial.html,v 1.21 2001-08-31 07:08:47 geuzaine Exp $
 
 Here are the examples in the Gmsh tutorial. These examples are
 commented (both C and C++-style comments can be used in Gmsh input
@@ -368,8 +368,8 @@ Extrude Surface { 6, {0,0,h} } {
 </FONT></I><I><FONT COLOR="#B22222">// extruded 3D mesh can be recombined into prisms (wedges) if the
 </FONT></I><I><FONT COLOR="#B22222">// surface elements are triangles, or hexahedra if the surface
 </FONT></I><I><FONT COLOR="#B22222">// elements are quadrangles. All rotations are specified by an axis
-</FONT></I><I><FONT COLOR="#B22222">// direction ({0,1,0}), an axis point ({0,0,0}) and a rotation angle
-</FONT></I><I><FONT COLOR="#B22222">// (Pi/2):
+</FONT></I><I><FONT COLOR="#B22222">// direction ({0,1,0}), an axis point ({-0.1,0,0.1}) and a rotation
+</FONT></I><I><FONT COLOR="#B22222">// angle (-Pi/2):
 </FONT></I>
 Extrude Surface { 122, {0,1,0} , {-0.1,0,0.1} , -Pi/2 } { 
   Recombine ; Layers { 7, 9004, 1 } ; 

tutorial/view1.pos

@@ -6,8 +6,13 @@
  *
  *********************************************************************/
 
-// In this view, there are only scalar triangles.
-// There are 5 time steps -> 3*5 = 15 values for each triangle.
+// In this view, there are only scalar triangles. There are 5 time
+// steps -> 3*5 = 15 values for each triangle.
+//
+// Warning: this (parsed) post-processing view format is only designed
+// for small post-processing views. For bigger views (>100000
+// elements), you should consider using the native ASCII or binary
+// file formats described in the FORMATS file.
 
 View "a scalar map" {
 ST(0.079090117,0.19794942,0,0.06966854,0.20076802,0,0.071449289,0.19423207,0){1206859.6,1570520.4,1594804.6,-2368529.7,-3162888.4,-3019964.8,1073015.3,1636334.6,1103926.4,1335740.9,1503948.1,2033518.7,-2359414.1,-3161601.9,-2921575.1};

utils/tut2html

 #!/bin/sh
 
-#if [ $# = 0 ] ; then
-#  echo "Usage: tut2html files"
-#  exit 1
-#fi
-
-#enscript -Ecpp --color -Whtml --toc -pt.html $*
-enscript -Ecpp --color -Whtml --toc -pt.html README *.geo
+enscript -t "Gmsh tutorial" -Ecpp --color -Whtml --toc -pt.html README *.geo
 
 cat t.html | \
 sed "s/<FONT COLOR=\"#BC8F8F\"><B>//g" | \