diff --git a/Numeric/GmshPredicates.cpp b/Numeric/GmshPredicates.cpp
index c4c305d82343cf6f0a0ca8a04593d6da9064f080..768f8db47d3d1e4c7521295b0de2e5d7f1d7a576 100644
--- a/Numeric/GmshPredicates.cpp
+++ b/Numeric/GmshPredicates.cpp
@@ -2638,7 +2638,7 @@ REAL incircleadapt(REAL *pa, REAL *pb, REAL *pc, REAL *pd, REAL permanent)
REAL cxtaa[8], cxtbb[8], cytaa[8], cytbb[8];
int cxtaalen, cxtbblen, cytaalen, cytbblen;
REAL axtbc[8], aytbc[8], bxtca[8], bytca[8], cxtab[8], cytab[8];
- int axtbclen, aytbclen, bxtcalen, bytcalen, cxtablen, cytablen;
+ int axtbclen=0, aytbclen=0, bxtcalen=0, bytcalen=0, cxtablen=0, cytablen=0;
REAL axtbct[16], aytbct[16], bxtcat[16], bytcat[16], cxtabt[16], cytabt[16];
int axtbctlen, aytbctlen, bxtcatlen, bytcatlen, cxtabtlen, cytabtlen;
REAL axtbctt[8], aytbctt[8], bxtcatt[8];
diff --git a/doc/CREDITS.txt b/doc/CREDITS.txt
index 4b6066438e141f7147e727fbf0e3e513e8544242..b3b13dd9418e05ceb3f25e4bc6587c00d9d901c5 100644
--- a/doc/CREDITS.txt
+++ b/doc/CREDITS.txt
@@ -8,22 +8,19 @@
Jean-Francois Remacle
<jean-francois.remacle at uclouvain.be>
-Major code contributions to Gmsh have been provided by Nicolas Tardieu
-(help with Netgen integration), Stephen Guzik (CGNS and partitioner
-integration), Pascale Noyret (MED integration) and Jonathan Lambrechts
-(Fields).
-
-Other code contributors include: David Colignon for new colormaps and
-lots of testing and bug reports; Patrick Dular for transfinite mesh
-bug fixes; Laurent Stainier for the eigenvalue solvers and for help
-with the MacOS port and the tensor display code; Pierre Badel for help
-with root finding and minimization routines; Marc Ume for the original
-list code; Matt Gundry for the Plot3d mesh format; Jozef Vesely for
-help with the Tetgen integration; Koen Hillewaert for high order
-element mappings and other improvements; Jacques Lechelle for the
-DIFFPACK mesh format; Ruth Sabariego for pyramids; Gaetan Bricteux for
-Gauss integration routines; Emilie Marchandise for edge compounds;
-Mark van Doesburg for OpenCascade face connection code.
+Code contributions to Gmsh have been provided by David Colignon
+(colormaps), Emilie Marchandise (compound geometrical entities),
+Gaetan Bricteux (Gauss integration and levelsets), Jacques Lechelle
+(DIFFPACK mesh format), Jonathan Lambrechts (fields), Jozef Vesely
+(Tetgen), Koen Hillewaert (high order elements), Laurent Stainier
+(eigenvalue solvers, tensor display and MacOS bits), Marc Ume
+(original list code), Mark van Doesburg (OpenCascade face connection),
+Matt Gundry (Plot3d mesh format), Matti Pellikka (Homology), Nicolas
+Tardieu (Netgen), Pascale Noyret (MED mesh format), Pierre Badel (root
+finding and minimization), Ruth Sabariego (pyramids), Stephen Guzik
+(CGNS and partitioners). See comments in the sources for more
+information. If we forgot to list your contributions please send us an
+email!
The AVL tree code (Common/avl.*) and the YUV image code
(Graphics/gl2yuv.*) are copyright (C) 1988-1993, 1995 The Regents of
@@ -71,9 +68,18 @@ National Laboratories under US Department of Energy contract
DE-AC04-76DP00789 and is copyrighted by Sandia Corporation: check the
configuration options.
-This version of Gmsh may contain code (in the contrib/MathEval
-subdirectory) based on GNU libmatheval, copyright (C) 1999, 2002, 2003
-Free Software Foundation, Inc: check the configuration options.
+This version of Gmsh may contain code (in the contrib/Fl_Tree
+subdirectory), copyright (C) 2009 Greg Ercolano: check the
+configuration options.
+
+This version of Gmsh may contain code (in the contrib/gmm
+subdirectory) copyright (C) 2002-2008 Yves Renard: check the
+configuration options.
+
+This version of Gmsh may contain code (in the contrib/MathEx
+subdirectory) based in part on the work of the SSCILIB Library,
+copyright (C) 2000-2003 Sadao Massago: check the configuration
+options.
This version of Gmsh may contain code (in the contrib/Metis
subdirectory) written by George Karypis (karypis at cs.umn.edu),
@@ -92,18 +98,10 @@ This version of Gmsh may contain code (in the contrib/Tetgen
subdirectory) copyright (C) 2002-2007 Hang Si: check the configuration
options.
-This version of Gmsh may contain code (in the contrib/TreeBrowser
-subdirectory), copyright (C) 2002 Jason Bryan, Ohio Supercomputer
-Center, Ohio State University: check the configuration options.
-
-This version of Gmsh may contain code (in the contrib/gmm
-subdirectory) copyright (C) 2002-2008 Yves Renard: check the
-configuration options.
-
-Special thanks to Bill Spitzak, Michael Sweet, Matthias Melcher and
-others for the Fast Light Tool Kit on which Gmsh's GUI is based. See
-http://www.fltk.org for more info on this excellent object-oriented,
-cross-platform toolkit.
+Special thanks to Bill Spitzak, Michael Sweet, Matthias Melcher, Greg
+Ercolano and others for the Fast Light Tool Kit on which Gmsh's GUI is
+based. See http://www.fltk.org for more info on this excellent
+object-oriented, cross-platform toolkit.
Special thanks also to EDF for funding the OpenCascade and MED
integration.
@@ -112,9 +110,9 @@ Thanks to the following folks who have contributed by providing fresh
ideas on theoretical or programming topics, who have sent patches,
requests for changes or improvements, or who gave us access to exotic
machines for testing Gmsh: Juan Abanto, Olivier Adam, Guillaume
-Alleon, Eric Bechet, Laurent Champaney, Pascal Dupuis, Philippe
-Geuzaine, Johan Gyselinck, Francois Henrotte, Benoit Meys, Nicolas
-Moes, Osamu Nakamura, Chad Schmutzer, Jean-Luc Fl'ejou, Xavier
+Alleon, Eric Bechet, Laurent Champaney, Pascal Dupuis, Patrick Dular,
+Philippe Geuzaine, Johan Gyselinck, Francois Henrotte, Benoit Meys,
+Nicolas Moes, Osamu Nakamura, Chad Schmutzer, Jean-Luc Fl'ejou, Xavier
Dardenne, Christophe Prud'homme, Sebastien Clerc, Jose Miguel Pasini,
Philippe Lussou, Jacques Kools, Bayram Yenikaya, Peter Hornby, Krishna
Mohan Gundu, Christopher Stott, Timmy Schumacher, Carl Osterwisch,
@@ -122,4 +120,5 @@ Bruno Frackowiak, Philip Kelleners, Romuald Conty, Renaud Sizaire,
Michel Benhamou, Tom De Vuyst, Kris Van den Abeele, Simon Vun, Simon
Corbin, Thomas De-Soza, Marcus Drosson, Antoine Dechaume, Jose Paulo
Moitinho de Almeida, Thomas Pinchard, Corrado Chisari, Axel Hackbarth,
-Peter Wainwright, Jiri Hnidek, Thierry Thomas, Konstantinos Poulios.
+Peter Wainwright, Jiri Hnidek, Thierry Thomas, Konstantinos Poulios,
+Laurent Van Miegroet.
diff --git a/doc/gmsh.html b/doc/gmsh.html
index 2efc2ede9741d1bd7dce05c9f48e990a243191c9..b4747f70ae3bcb1ea1a089e593b0d94a229f512e 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -9,9 +9,10 @@ built-in pre- and post-processing facilities</title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="keywords" content="free, finite elements, mesh generator, fem,
-unstructured grids, delaunay, discontinuous galerkin, triangulation, automatic,
-maillages, mailleur 3D, mesh adaptation, postprocessing, post processing,
-post-processor, postprocessor, post-processeur, CAD, CAO, OpenGL, GL2PS, Gmesh">
+unstructured grids, delaunay, discontinuous galerkin, triangulation,
+automatic, maillages, mailleur 3D, mesh adaptation, postprocessing,
+post processing, post-processor, postprocessor, post-processeur, CAD,
+CAO, OpenGL, GL2PS, Gmesh">
<link href="/general.css" rel="stylesheet" type="text/css">
<link href="/favicon.ico" rel="shortcut icon" type="image/x-icon">
@@ -29,7 +30,7 @@ generator with built-in pre- and post-processing facilities</h1>
<p>
<center>
<a href="#Description">Description</a> |
- <a href="#Download"><b>Download</b></a> |
+ <a href="#Download"><strong>Download</strong></a> |
<a href="#Authors">Authors and credits</a> |
<a href="#Documentation">Documentation</a> |
<a href="#Licensing">Licensing</a> |
@@ -64,11 +65,13 @@ Intel). Tutorial and demos files are included in all the archives.
<ul>
<li>
+<span style="border: 1px dotted; padding: 3px;">
<strong>Current stable release</strong>:
<a href="/gmsh/bin/Windows/gmsh-2.4.0-Windows.zip"><strong>Windows</strong></a>,
<a href="/gmsh/bin/Linux/gmsh-2.4.0-Linux.tgz"><strong>Linux</strong></a>,
<a href="/gmsh/bin/MacOSX/gmsh-2.4.0-MacOSX.dmg"><strong>Mac OS X</strong></a> and
<a href="/gmsh/src/gmsh-2.4.0-source.tgz"><strong>source code</strong></a>
+</span>
<p>
<li>Experimental versions (these might be buggy, or might not even
launch: use at your own risk!):
@@ -137,14 +140,14 @@ questions or bug reports.
<p>
-<form method=GET action="http://www.geuz.org/search/search-geuz.cgi">
-<input size=30 name="q" value="">
+<form method="get" action="http://www.geuz.org/search/search-geuz.cgi">
+<input size="30" name="q" value="">
<input type="submit" value="Search!">
-<input type=HIDDEN name="ps" value=10>
+<input type="hidden" name="ps" value="10">
<select name="ul">
-<option value="/gmsh" SELECTED>All Gmsh resources
-<option value="/gmsh/doc/">Gmsh documentation
-<option value="/pipermail/gmsh">Gmsh mailing list archives
+ <option value="/gmsh" SELECTED>All Gmsh resources
+ <option value="/gmsh/doc/">Gmsh documentation
+ <option value="/pipermail/gmsh">Gmsh mailing list archives
</select>
</form>
diff --git a/utils/api_demos/Makefile b/utils/api_demos/Makefile
index d30163172a702a89506f6ff2f18531dcffcbe182..78b237b59799455e561ff5f81b18e21923a82896 100644
--- a/utils/api_demos/Makefile
+++ b/utils/api_demos/Makefile
@@ -1,29 +1,28 @@
-LIB = -L/usr/local/lib -lGmsh -L.
-INC = -I/usr/local/include -I.
FLAGS = -g -O2
+INC = -I/usr/local/include -I.
+GMSH = -L/usr/local/lib -lGmsh
+GLUT = -framework OpenGL -framework GLUT -framework Cocoa -framework ApplicationServices
+#GLUT = -lGLUT -lGLU -lGL -lX11
mainSimple: mainSimple.cpp
- g++ ${FLAGS} -o mainSimple ${INC} mainSimple.cpp ${LIB}\
- -llapack -lblas -lm
+ g++ ${FLAGS} -o mainSimple ${INC} mainSimple.cpp\
+ ${GMSH} -llapack -lblas -lm
mainAntTweakBar: mainAntTweakBar.cpp
- g++ ${FLAGS} -o mainAntTweakBar ${INC} mainAntTweakBar.cpp ${LIB}\
- -lAntTweakBar -framework OpenGL -framework GLUT -framework Cocoa\
- -framework ApplicationServices -llapack -lblas -lz -lm
+ g++ ${FLAGS} -o mainAntTweakBar ${INC} mainAntTweakBar.cpp\
+ ${GMSH} -lAntTweakBar ${GLUT} -llapack -lblas -lz -lm
mainGlut: mainGlut.cpp
- g++ ${FLAGS} -o mainGlut ${INC} mainGlut.cpp ${LIB}\
- -framework OpenGL -framework GLUT -framework Cocoa\
- -framework ApplicationServices -llapack -lblas -lz -lm
+ g++ ${FLAGS} -o mainGlut ${INC} mainGlut.cpp\
+ ${GMSH} ${GLUT} -llapack -lblas -lz -lm
mainPost: mainPost.cpp
- g++ ${FLAGS} -o mainPost -Iinclude mainPost.cpp ${LIB}\
- -framework ApplicationServices -llapack -lblas -lm
-
+ g++ ${FLAGS} -o mainPost ${INC} mainPost.cpp\
+ ${GMSH} -llapack -lblas -lm
mainLevelset: mainLevelset.cpp
- g++ ${FLAGS} $(INC) -DHAVE_GSL -DHAVE_GLEVELSETS -DHAVE_GMM -DHAVE_SPARSKIT \
- -o mainLevelset mainLevelset.cpp ${LIB} -lgsl -lgslcblas -llapack -lblas
+ g++ ${FLAGS} -o mainLevelset ${INC} mainLevelset.cpp\
+ ${GMSH} -llapack -lblas
clean:
rm -rf mainSimple mainAntTweakBar mainGlut mainPost mainLevelset\
diff --git a/utils/api_demos/mainAntTweakBar.cpp b/utils/api_demos/mainAntTweakBar.cpp
index 6492dd0217e1d7f947cf2a9ec4cf2d18cf66bc43..e1936db9a2f369dd9631fb30824baec4bbfbe974 100644
--- a/utils/api_demos/mainAntTweakBar.cpp
+++ b/utils/api_demos/mainAntTweakBar.cpp
@@ -16,7 +16,7 @@
drawContext *ctx = 0;
-// Gmsh redefinitions (reimplement stuff in Fltk/Draw.h)
+// Gmsh redefinitions (implement all functions from Graphics/Draw.h)
void Draw(){ ctx->draw3d(); ctx->draw2d(); }
void DrawCurrentOpenglWindow(bool make_current){}
int GetFontIndex(const char *fontname){ return 0; }
diff --git a/utils/api_demos/mainGlut.cpp b/utils/api_demos/mainGlut.cpp
index 8f303953894d629a3806294125cd2c0cdc94f761..f0b01ab1c4c032e72857a6435a19e772f99bbfec 100644
--- a/utils/api_demos/mainGlut.cpp
+++ b/utils/api_demos/mainGlut.cpp
@@ -14,7 +14,7 @@
drawContext *ctx = 0;
-// reimplement functions in Fltk/Draw.h
+// Gmsh redefinitions (implement all functions from Graphics/Draw.h)
void Draw(){ ctx->draw3d(); ctx->draw2d(); }
void DrawCurrentOpenglWindow(bool make_current){}
int GetFontIndex(const char *fontname){ return 0; }
@@ -35,6 +35,7 @@ void DrawString(const char *str)
glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, str[i]);
}
+// GLUT callbacks
void display()
{
glViewport(ctx->viewport[0], ctx->viewport[1],