diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 9cd44e3dc712ab7686ec78bebd0106fc88d70833..463a2ee8b0de95e54aa871d9232a548c66958d50 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.602 2007-03-18 12:05:16 geuzaine Exp $
+// $Id: GUI.cpp,v 1.603 2007-03-29 16:32:23 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -2255,7 +2255,9 @@ void GUI::create_option_window()
mesh_value[3] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 5 * BH, IW, BH, "Element order");
mesh_value[3]->minimum(1);
- mesh_value[3]->maximum(5);
+ // FIXME: this makes it possible to set > 2 by hand, but not by
+ // dragging (>2 is too buggy for general use)
+ mesh_value[3]->maximum(2);
mesh_value[3]->step(1);
mesh_value[3]->align(FL_ALIGN_RIGHT);
mesh_value[3]->callback(mesh_options_ok_cb);
diff --git a/doc/README.occ b/doc/README.occ
index 2b487f18ceaca04fdbe803ae879b17373f95e908..dbbf8dfc465934def3b4750d292506e9f423029b 100644
--- a/doc/README.occ
+++ b/doc/README.occ
@@ -1,21 +1,20 @@
-How to build OpenCascade 6.1 for Gmsh:
+How to build OpenCascade 6.2 for Gmsh:
-- get the linux distribution of occ
+- get the linux (source) distribution of occ
-- uncompress and apply patches (see below)
+- if you're using Cygwin/Mingw32 (Windows) define
-- go to the ros/ subdir and
+ export CC="gcc -mno-cygwin -DWNT=1 -DWIN32 -DHAVE_NO_DLL"
+ export CXX="g++ -mno-cygwin -DWNT=1 -DWIN32 -DHAVE_NO_DLL"
- ./configure --prefix=/usr/local/opencascade --enable-debug=no
- --enable-production=yes --enable-static=yes --enable-shared=no
+- go to the ros/ directory and type
- (adding '--disable-dependency-tracking' will speeds things up for
- one-time builds)
+ ./configure --prefix=/usr/local/opencascade --enable-debug=no
+ --enable-production=yes --enable-static=yes --enable-shared=no
+ --disable-dependency-tracking
-- then do
-
- cd adm/make;
+- then go to the adm/make/ directory and run
for lib in TKernel TKMath TKAdvTools TKG2d TKG3d TKGeomBase TKBRep
TKGeomAlgo TKTopAlgo TKPrim TKBO TKHLR TKMesh TKShHealing TKBool
@@ -40,41 +39,6 @@ How to build OpenCascade 6.1 for Gmsh:
cd $lib && make install; cd ..;
done
- (This is the same as a partial 'make install')
-
-*************************************************************************
-
-MINGW:
-
-1) export CC="gcc -mno-cygwin -DWNT=1 -DWIN32"
- export CXX="g++ -mno-cygwin -DWNT=1 -DWIN32"
-
-2) fix all OSD_* routines that throw MSVC-specific exceptions (__try,
- __leave, __finally) using #defines
-
-3) remove ALL the dllimport/dllexport stuff
-
-4) add __MINGW32__ case in OSD/OSD_Path.cxx (to avoid call to uname())
-
-*************************************************************************
-
-APPLE:
-
-1) guard all #include<malloc.h> with #ifdef HAVE_MALLOC_H
-
-2) add __APPLE__ case in OSD/OSD_Path.cxx (to avoid call to uname())
-
-3) IMPORTANT (mmap crashes): add this in Standard/Standard.cxx
-
-#if defined(__APPLE__)
- bMMap = atoi("0");
-#else
- bMMap = atoi((var = getenv("MMGT_MMAP" )) ? var : "1" );
-#endif
-
-*************************************************************************
-
-The above patches have been submitted to the OCC folks. Hopefully they
-will be integrated in their next release.
+ and copy config.h and inc/ to /usr/local/opencascade (This is the
+ same as a doing a partial 'make install')
-PS: to strip static libaries of debug symbols, use "strip -S *.a"
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 17efb0a233868548a366bf83677a881ea5018577..52008ee6615090020386307fcaa941df0b9ae266 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
-@c $Id: gmsh.texi,v 1.230 2007-02-26 08:25:46 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.231 2007-03-29 16:32:23 geuzaine Exp $
@c
@c Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
@c
@@ -2068,10 +2068,7 @@ mesh is not recombined.
Selects a five- or six-face volume @var{expression} to be meshed with
the 3D transfinite algorithm. The @var{expression-list} should contain
the identification numbers of the six or eight points on the boundary of
-the volume that define the corners of the transfinite interpolation. The
-ordering of these point numbers defines the ordering and orientation of
-the mesh elements, and should thus follow the node ordering for prisms
-or hexahedra given in @ref{Gmsh node ordering}.
+the volume that define the corners of the transfinite interpolation.
@end ftable
@@ -2817,13 +2814,9 @@ All non-parsed file formats have sections enclosed between @code{$Key} and
@cindex File format, mesh
@cindex @file{.msh} file
-Please note that the list of nodes and elements in Gmsh's mesh files do not
-have to be dense or ordered (i.e., the node and element numbers do not have
-to be given in a consecutive or even an ordered way). A sample C++ program
-to transform the formats so that all lists are dense and ordered is
-available in the source distribution (@file{utils/misc/mshsort.cpp}). This
-program is also a good example on how to read and write files in the
-@file{.msh} format.
+Please note that the list of nodes and elements in Gmsh's mesh files do
+not have to be dense or ordered (i.e., the node and element numbers do
+not have to be given in a consecutive or even an ordered way).
@menu
* Version 1.0::