diff --git a/Common/GetOptions.cpp b/Common/GetOptions.cpp
index 557468dbb8d0aaa392f610e114fabe715d65c100..3ca43c96d299a795ee7805f40d0f18990f9b8b8f 100644
--- a/Common/GetOptions.cpp
+++ b/Common/GetOptions.cpp
@@ -1,4 +1,4 @@
-// $Id: GetOptions.cpp,v 1.46 2002-03-31 00:50:39 geuzaine Exp $
+// $Id: GetOptions.cpp,v 1.47 2002-04-24 22:12:43 geuzaine Exp $
#include <unistd.h>
#include "Gmsh.h"
@@ -39,7 +39,7 @@ char gmsh_email[] = "Mailing list : gmsh@geuz.org" ;
void Print_Usage(char *name){
Msg(DIRECT, "Usage: %s [options] [files]", name);
Msg(DIRECT, "Geometry options:");
- Msg(DIRECT, " -0 parse input files, output flattened geometry, and exit");
+ Msg(DIRECT, " -0 parse input files, output unrolled geometry, and exit");
Msg(DIRECT, "Mesh options:");
Msg(DIRECT, " -1, -2, -3 perform batch 1D, 2D and 3D mesh generation");
Msg(DIRECT, " -saveall save all elements (discard physical group definitions)");
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 02d4c4a810d9effb3c6b0b58e06e5fa6e252770f..a88a06bad57de7a42cac64cdff01f2c0ffc0ca7d 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.165 2002-04-23 23:07:23 geuzaine Exp $
+// $Id: GUI.cpp,v 1.166 2002-04-24 22:12:43 geuzaine Exp $
// To make the interface as visually consistent as possible, please:
// - use the IW, BB, BH, BW and WB values
@@ -56,29 +56,29 @@ Fl_Menu_Item m_menubar_table[] = {
{"Save as", 0, 0, 0, FL_MENU_DIVIDER|FL_SUBMENU},
{"By extension...", FL_CTRL+'e', (Fl_Callback *)file_save_as_auto_cb, 0, FL_MENU_DIVIDER},
{"Geometry", 0, 0, 0, FL_SUBMENU},
- {"Gmsh flattened geometry (geo)...", 0, (Fl_Callback *)file_save_as_geo_cb, 0},
{"Gmsh current options (opt)...", 0, (Fl_Callback *)file_save_as_geo_options_cb, 0},
+ {"Gmsh unrolled geometry (geo)...", 0, (Fl_Callback *)file_save_as_geo_cb, 0},
{0},
{"Mesh", 0, 0, 0, FL_SUBMENU},
- {"Gmsh mesh format (msh)...", 0, (Fl_Callback *)file_save_as_msh_cb, 0},
- {"Gmsh mesh format, all elements...", 0, (Fl_Callback *)file_save_as_msh_all_cb, 0},
- {"Universal mesh format (unv)...", 0, (Fl_Callback *)file_save_as_unv_cb, 0},
- {"Gref mesh format (gref)...", 0, (Fl_Callback *)file_save_as_gref_cb, 0},
- {"Vrml surface mesh (wrl)...", 0, (Fl_Callback *)file_save_as_vrml_cb, 0},
+ {"Gmsh (msh)...", 0, (Fl_Callback *)file_save_as_msh_cb, 0},
+ {"Gmsh all elements...", 0, (Fl_Callback *)file_save_as_msh_all_cb, 0},
+ {"GREF (gref)...", 0, (Fl_Callback *)file_save_as_gref_cb, 0},
+ {"I-DEAS universal file (unv)...", 0, (Fl_Callback *)file_save_as_unv_cb, 0},
+ {"VRML lines/surfaces (wrl)...", 0, (Fl_Callback *)file_save_as_vrml_cb, 0},
{0},
{"Image", 0, 0, 0, FL_SUBMENU},
- {"PostScript, fast (ps)...", 0, (Fl_Callback *)file_save_as_ps_simple_cb, 0},
- {"PostScript, accurate...", 0, (Fl_Callback *)file_save_as_ps_accurate_cb, 0},
- {"Jpeg (jpg)...", 0, (Fl_Callback *)file_save_as_jpeg_cb, 0},
- {"LaTeX, PS part, fast...", 0, (Fl_Callback *)file_save_as_pstex_simple_cb, 0},
- {"LaTeX, PS part, accurate...", 0, (Fl_Callback *)file_save_as_pstex_accurate_cb, 0},
- {"LaTeX, Jpeg part...", 0, (Fl_Callback *)file_save_as_jpegtex_cb, 0},
- {"LaTeX, TeX part (tex)...", 0, (Fl_Callback *)file_save_as_tex_cb, 0},
- {"GIF (gif)...", 0, (Fl_Callback *)file_save_as_gif_cb, 0},
- {"GIF, dithered...", 0, (Fl_Callback *)file_save_as_gif_dithered_cb, 0},
- {"GIF, transparent...", 0, (Fl_Callback *)file_save_as_gif_transparent_cb, 0},
- {"PPM (ppm)...", 0, (Fl_Callback *)file_save_as_ppm_cb, 0},
- {"UCB YUV (yuv)...", 0, (Fl_Callback *)file_save_as_yuv_cb, 0},
+ {"GIF (gif)...", 0, (Fl_Callback *)file_save_as_gif_cb, 0},
+ {"GIF dithered...", 0, (Fl_Callback *)file_save_as_gif_dithered_cb, 0},
+ {"GIF transparent...", 0, (Fl_Callback *)file_save_as_gif_transparent_cb, 0},
+ {"JPEG (jpg)...", 0, (Fl_Callback *)file_save_as_jpeg_cb, 0},
+ {"PostScript fast (ps)...", 0, (Fl_Callback *)file_save_as_ps_simple_cb, 0},
+ {"PostScript accurate...", 0, (Fl_Callback *)file_save_as_ps_accurate_cb, 0},
+ {"PPM (ppm)...", 0, (Fl_Callback *)file_save_as_ppm_cb, 0},
+ {"LaTeX JPEG...", 0, (Fl_Callback *)file_save_as_jpegtex_cb, 0},
+ {"LaTeX PostScript fast...", 0, (Fl_Callback *)file_save_as_pstex_simple_cb, 0},
+ {"LaTeX PostScript accurate...", 0, (Fl_Callback *)file_save_as_pstex_accurate_cb, 0},
+ {"LaTeX TeX (tex)...", 0, (Fl_Callback *)file_save_as_tex_cb, 0},
+ {"UCB YUV (yuv)...", 0, (Fl_Callback *)file_save_as_yuv_cb, 0},
{0},
{0},
{"Visibility...", FL_SHIFT+'v', (Fl_Callback *)opt_visibility_cb, 0},
diff --git a/doc/FAQ b/doc/FAQ
index a7513d05948cbaf750cfe7b386b596ae3c9a64d0..ffdd3757785716ea584a6f814fb62b2593e34fbf 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,4 +1,4 @@
-GMSH FREQUENTLY ASKED QUESTIONS ($Date: 2002-03-05 00:28:04 $)
+GMSH FREQUENTLY ASKED QUESTIONS ($Date: 2002-04-24 22:12:43 $)
1. GENERAL
==========
@@ -74,7 +74,7 @@ entities (points, lines and surfaces) each time a transformation
command is issued. This can slow down things a lot if many
transformations are performed. There are two solutions to this
problem:
-- you may save the flattened geometry in another file (e.g. with
+- you may save the unrolled geometry in another file (e.g. with
gmsh file.geo -0 > flat.geo), and use this new file for subsequent
computations;
- you may set the 'Geometry.AutoCoherence' option to 0. This will
@@ -103,10 +103,10 @@ Send us your geometry, and we will investigate. Please keep the
following in mind though: 2D (surface) meshes are generated by
projecting a 2D mesh in the mean plane of the surface. This gives nice
results only if the surface curvature is small enough. Otherwise you
-_have_ to cut the surface in pieces. For example, using use half
-circles to define a cylinder will fail with the unstructured algorithm
-(you should define arcs with angles smaller than Pi, and thus
-define the cylinder with at least three patch surfaces).
+_have_ to cut the surface in pieces. For example, using half circles
+to define a cylinder will fail with the unstructured algorithm (you
+should define arcs with angles smaller than Pi, and thus define the
+cylinder with at least three patch surfaces).
5.3) What should I do when the 3D unstructured algorithm fails?
diff --git a/doc/gmsh.1 b/doc/gmsh.1
index e7d3d2f98eae1e4352e612ef6cb7c7a22a82197b..293eee12c0019e48d0cc4bd132851f9e8e93956c 100644
--- a/doc/gmsh.1
+++ b/doc/gmsh.1
@@ -100,7 +100,7 @@ either interactively or through the input ascii files.
.SH GEOMETRY OPTIONS
.TP 4
.B \-0
-parse all input files, output flattened geometry, and exit.
+parse all input files, output unrolled geometry, and exit.
.\" ======================================================================
.SH MESH OPTIONS
.TP 4
diff --git a/tutorial/README b/tutorial/README
index 9ceb7a6136b6a968e3eed4d95db2508ec480220c..e1b410ef8c652aa13410ba13ec6d3e24f1379e37 100644
--- a/tutorial/README
+++ b/tutorial/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.14 2001-08-18 12:43:41 geuzaine Exp $
+$Id: README,v 1.15 2002-04-24 22:12:43 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
@@ -95,10 +95,10 @@ all the other views, select the 'Apply next changes to all views' or
[NOTE: All the options specified interactively can also be directly
specified in the ascii input files. All available options, with their
current values, can be saved into a file by selecting 'File->Save
-as->GEO complete options', or simply viewed by pressing the '?' button
-in the status bar. To save the current options as your default
-preferences for all future Gmsh sessions, use the 'Options->Save
-options now' menu.]
+as->Geometry->Gmsh current options', or simply viewed by pressing the
+'?' button in the status bar. To save the current options as your
+default preferences for all future Gmsh sessions, use the
+'Options->Save options now' menu.]
OK, that's all, folks. Enjoy the tutorial.
diff --git a/tutorial/t2.geo b/tutorial/t2.geo
index a3a1f7b9e37b7f85d7ba23b87e235fe32518190f..cbc277b4a257dac85662a5d30e215e4e21a14a0d 100644
--- a/tutorial/t2.geo
+++ b/tutorial/t2.geo
@@ -57,8 +57,8 @@ Characteristic Length{6,22,2,3,16,12} = lc * 2 ;
// If the transformation tools are handy to create complex geometries,
// it is sometimes useful to generate the flat geometry, consisting
// only of the explicit list elementary entities. This can be achieved
-// by selecting the 'File->Save as->GEO flattened geometry' menu or
-// by typing
+// by selecting the 'File->Save as->Geometry->Gmsh unrolled geometry'
+// menu or by typing
//
// > gmsh t2.geo -0
//
diff --git a/tutorial/t3.geo b/tutorial/t3.geo
index 4cc73e36a92145029d93984ae6fd555ee41acb1b..ef2dd573741940f72e08c57edf29d2517d0c7a9d 100644
--- a/tutorial/t3.geo
+++ b/tutorial/t3.geo
@@ -74,7 +74,7 @@ Geometry.Color.Surfaces = Geometry.Color.Points;
// A click on the '?' button in the status bar of the graphic window
// will dump all current options to the terminal. To save all
-// available options to a file, use the 'File->Save as->GEO complete
-// options' menu. To save the current options as the default options
-// for all future Gmsh sessions, use the 'Options->Save options now'
-// menu.
+// available options to a file, use the 'File->Save as->Geometry->Gmsh
+// current options' menu. To save the current options as the default
+// options for all future Gmsh sessions, use the 'Options->Save
+// options now' menu.
diff --git a/tutorial/t8.geo b/tutorial/t8.geo
index c36eff35043b6704b3edb7e7a80f3fc58096a2d3..9b7223f2b5d643d953bf1ffcdbf8988ee042c88a 100644
--- a/tutorial/t8.geo
+++ b/tutorial/t8.geo
@@ -17,7 +17,7 @@ Include "view4.pos" ;
// Some general options are set (all the options specified
// interactively can be directly specified in the ascii input
// files. The current options can be saved into a file by selecting
-// 'File->Save as->GEO complete options').
+// 'File->Save as->Geometry->Gmsh current options').
General.Trackball = 0 ;
General.RotationX = 0 ;
diff --git a/tutorial/tutorial.html b/tutorial/tutorial.html
index d7d7acb9cda063909938fb2813dff4f3eca99b9b..81a4393d7b546f90f639af72adb0307f712c4e7f 100644
--- a/tutorial/tutorial.html
+++ b/tutorial/tutorial.html
@@ -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.32 2001-12-06 10:34:04 geuzaine Exp $
+$Id: tutorial.html,v 1.33 2002-04-24 22:12:43 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
@@ -120,10 +120,10 @@ all the other views, select the 'Apply next changes to all views' or
[NOTE: All the options specified interactively can also be directly
specified in the ascii input files. All available options, with their
current values, can be saved into a file by selecting 'File->Save
-as->GEO complete options', or simply viewed by pressing the '?' button
-in the status bar. To save the current options as your default
-preferences for all future Gmsh sessions, use the 'Options->Save
-options now' menu.]
+as->Geometry->Gmsh current options', or simply viewed by pressing the
+'?' button in the status bar. To save the current options as your
+default preferences for all future Gmsh sessions, use the
+'Options->Save options now' menu.]
OK, that's all, folks. Enjoy the tutorial.
@@ -304,8 +304,8 @@ Characteristic Length{6,22,2,3,16,12} = lc * 2 ;
<I><FONT COLOR="#B22222">// If the transformation tools are handy to create complex geometries,
</FONT></I><I><FONT COLOR="#B22222">// it is sometimes useful to generate the flat geometry, consisting
</FONT></I><I><FONT COLOR="#B22222">// only of the explicit list elementary entities. This can be achieved
-</FONT></I><I><FONT COLOR="#B22222">// by selecting the 'File->Save as->GEO flattened geometry' menu or
-</FONT></I><I><FONT COLOR="#B22222">// by typing
+</FONT></I><I><FONT COLOR="#B22222">// by selecting the 'File->Save as->Geometry->Gmsh unrolled geometry'
+</FONT></I><I><FONT COLOR="#B22222">// menu or by typing
</FONT></I><I><FONT COLOR="#B22222">//
</FONT></I><I><FONT COLOR="#B22222">// > gmsh t2.geo -0
</FONT></I><I><FONT COLOR="#B22222">//
@@ -413,10 +413,10 @@ Geometry.Color.Surfaces = Geometry.Color.Points;
</FONT></I>
<I><FONT COLOR="#B22222">// A click on the '?' button in the status bar of the graphic window
</FONT></I><I><FONT COLOR="#B22222">// will dump all current options to the terminal. To save all
-</FONT></I><I><FONT COLOR="#B22222">// available options to a file, use the 'File->Save as->GEO complete
-</FONT></I><I><FONT COLOR="#B22222">// options' menu. To save the current options as the default options
-</FONT></I><I><FONT COLOR="#B22222">// for all future Gmsh sessions, use the 'Options->Save options now'
-</FONT></I><I><FONT COLOR="#B22222">// menu.
+</FONT></I><I><FONT COLOR="#B22222">// available options to a file, use the 'File->Save as->Geometry->Gmsh
+</FONT></I><I><FONT COLOR="#B22222">// current options' menu. To save the current options as the default
+</FONT></I><I><FONT COLOR="#B22222">// options for all future Gmsh sessions, use the 'Options->Save
+</FONT></I><I><FONT COLOR="#B22222">// options now' menu.
</FONT></I></PRE>
<HR>
<A NAME="file5">
@@ -1073,7 +1073,7 @@ Include "view4.pos" ;
<I><FONT COLOR="#B22222">// Some general options are set (all the options specified
</FONT></I><I><FONT COLOR="#B22222">// interactively can be directly specified in the ascii input
</FONT></I><I><FONT COLOR="#B22222">// files. The current options can be saved into a file by selecting
-</FONT></I><I><FONT COLOR="#B22222">// 'File->Save as->GEO complete options').
+</FONT></I><I><FONT COLOR="#B22222">// 'File->Save as->Geometry->Gmsh current options').
</FONT></I>
General.Trackball = 0 ;
General.RotationX = 0 ;