diff --git a/Common/GetOptions.cpp b/Common/GetOptions.cpp
index beed4bc2a6685c6054a3f2ed92ea0d65779c6cdc..ab63703f9dbe2cf99bc86333a78808bf9d131993 100644
--- a/Common/GetOptions.cpp
+++ b/Common/GetOptions.cpp
@@ -1,4 +1,4 @@
-// $Id: GetOptions.cpp,v 1.38 2001-08-28 20:40:21 geuzaine Exp $
+// $Id: GetOptions.cpp,v 1.39 2001-09-01 15:19:05 geuzaine Exp $
#include <unistd.h>
#include "Gmsh.h"
@@ -39,7 +39,7 @@ void Print_Usage(char *name){
Msg(DIRECT, " -format msh|unv|gref set output mesh format (default: msh)");
Msg(DIRECT, " -algo iso|tri|aniso select 2D mesh algorithm (default: iso)");
Msg(DIRECT, " -smooth int set mesh smoothing (default: 0)");
- Msg(DIRECT, " -degree int set mesh degree (default: 1)");
+ // Msg(DIRECT, " -degree int set mesh degree (default: 1)");
Msg(DIRECT, " -scale float set global scaling factor (default: 1.0)");
Msg(DIRECT, " -meshscale float set mesh scaling factor (default: 1.0)");
Msg(DIRECT, " -clscale float set characteristic length scaling factor (default: 1.0)");
@@ -255,13 +255,8 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
}
else if(!strcmp(argv[i]+1, "degree")){
i++;
- if(argv[i]!=NULL){
- CTX.mesh.degree = atoi(argv[i++]);
- if(CTX.mesh.degree != 1 && CTX.mesh.degree != 2){
- fprintf(stderr, ERROR_STR "Wrong degree\n");
- exit(1);
- }
- }
+ if(argv[i]!=NULL)
+ opt_mesh_degree(0, GMSH_SET, atof(argv[i++]));
else {
fprintf(stderr, ERROR_STR "Missing number\n");
exit(1);
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 5cbabacb3c53e7f89f7958bb4b7a99b6436eec9f..be0cc57ea225fb3ed61b42868ae6378f521c1375 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.44 2001-08-28 20:40:21 geuzaine Exp $
+// $Id: Options.cpp,v 1.45 2001-09-01 15:19:05 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -1418,8 +1418,8 @@ double opt_mesh_constrained_bgmesh(OPT_ARGS_NUM){
return CTX.mesh.constrained_bgmesh;
}
double opt_mesh_degree(OPT_ARGS_NUM){
- if(action & GMSH_SET)
- CTX.mesh.degree = (int)val;
+ if(action & GMSH_SET)
+ CTX.mesh.degree = 1; //(int)val; INTERDIT POUR LE MOMENT !!!
#ifdef _FLTK
if(WID && (action & GMSH_GUI))
WID->mesh_butt[3]->value(CTX.mesh.degree==2);
diff --git a/Makefile b/Makefile
index a7f0e0282fc63b7cc1683af07d0e83c72dbe086e..b9574729747d2edc06b4498840bdbdfbf79837cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.144 2001-08-31 09:23:40 geuzaine Exp $
+# $Id: Makefile,v 1.145 2001-09-01 15:19:05 geuzaine Exp $
GMSH_RELEASE = 1.25
@@ -523,8 +523,3 @@ link_solaris_scorec:
-L/usr/X11R6/lib -lX11 -lm -ldl -lsocket
solaris_scorec : compile_solaris_scorec link_solaris_scorec strip_bin
-
-
-
-
-
diff --git a/doc/VERSIONS b/doc/VERSIONS
index afe49352a46e4174ace95ba65fe09a5403926fc2..c4fe6068d88c197ea6896eca896703fd1ee73d4e 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,6 +1,8 @@
-$Id: VERSIONS,v 1.64 2001-08-31 09:23:40 geuzaine Exp $
+$Id: VERSIONS,v 1.65 2001-09-01 15:19:05 geuzaine Exp $
-New in 1.25:
+New in 1.25: Fixed bug with mixed recombined/non-recombined extruded
+meshes; Linux versions are build with no optimization, due to bugs in
+gcc 2.95.X;
New in 1.24: Fixed characteristic length interpolation for Splines;
fixed edge swapping bug in 3D initial mesh; fixed degenerated case in
diff --git a/doc/gmsh.1 b/doc/gmsh.1
index d7a9bee5e3dc4d13306227440ea53750db8a292f..b86f6c5f8f6e96ed5d7a51e703ca0920787a7938 100644
--- a/doc/gmsh.1
+++ b/doc/gmsh.1
@@ -5,7 +5,7 @@
.\" Copyright (c) 2000-2001 J.-F. Remacle, C. Geuzaine
.\"
.\" ======================================================================
-.TH Gmsh 1 "31 August 2001" "Version 1.25" "Gmsh Manual Pages"
+.TH Gmsh 1 "1 Semptember 2001" "Version 1.25" "Gmsh Manual Pages"
.UC 4
.\" ======================================================================
.SH NAME
diff --git a/www/gmsh.html b/www/gmsh.html
index 6946a4a600eee2ff13ace200f0b01bfbf7ec3d2f..1d336fb4e6d4bee234d52f23875061fff7124ffb 100644
--- a/www/gmsh.html
+++ b/www/gmsh.html
@@ -46,7 +46,7 @@ cat << EOM
page requests since<br>1998/05/24<p>
ENDSCRIPT--->
-<!---BEGINDATE$Date: 2001-09-01 09:27:34 $ENDDATE--->
+<!---BEGINDATE$Date: 2001-09-01 15:19:05 $ENDDATE--->
Copyright © 1998-2001<br>
Jean-François Remacle and
@@ -314,7 +314,7 @@ ENDSCRIPT--->
<td bgcolor="#ededed"><font face="Helvetica, Arial" size=-1>
-<b>Version 1.24 (August 30, 2001)</b>
+<b>Version 1.25 (September 1, 2001)</b>
<p>
Executable versions of Gmsh are available for Windows and for most of
the classical UNIX platforms. These versions are free, and are all
@@ -323,14 +323,14 @@ name="opengl-footmark"><sup>1</sup></a>. The only thing required if
you use Gmsh is to mention it in your work. The tutorial and demo
files are included in the archives.
<ul>
-<li><A href="/gmsh/bin/gmsh-1.24-Windows.zip">Windows zip archive (95/98/NT)</A>
-<li><A href="/gmsh/bin/gmsh-1.24-2.i386.rpm">Linux RPM (Red Hat 6.2 and compatible, i386, glibc 2.1)</A>
-<li><A href="/gmsh/bin/gmsh-1.24-2-Linux.tgz">Linux tarball (i386, glibc 2.1)</A>
-<li><A href="/gmsh/bin/gmsh-1.24-OSF1.tgz">Compaq Tru64 tarball (OSF 4.0)</A>
-<li><A href="/gmsh/bin/gmsh-1.24-SunOS.tgz">Sun tarball (SunOS 5.5)</A>
-<li><A href="/gmsh/bin/gmsh-1.24-AIX.tgz">IBM tarball (AIX)</A>
-<li><A href="/gmsh/bin/gmsh-1.24-IRIX.tgz">SGI IRIX tarball (IRIX 6.5)</A>
-<li><A href="/gmsh/bin/gmsh-1.24-HP-UX.tgz">HP tarball (HPUX 10.20)</A>
+<li><A href="/gmsh/bin/gmsh-1.25-Windows.zip">Windows zip archive (95/98/NT)</A>
+<li><A href="/gmsh/bin/gmsh-1.25-1.i386.rpm">Linux RPM (Red Hat 6.2 and compatible, i386, glibc 2.1)</A>
+<li><A href="/gmsh/bin/gmsh-1.25-Linux.tgz">Linux tarball (i386, glibc 2.1)</A>
+<li><A href="/gmsh/bin/gmsh-1.25-OSF1.tgz">Compaq Tru64 tarball (OSF 4.0)</A>
+<li><A href="/gmsh/bin/gmsh-1.25-SunOS.tgz">Sun tarball (SunOS 5.5)</A>
+<li><A href="/gmsh/bin/gmsh-1.25-AIX.tgz">IBM tarball (AIX)</A>
+<li><A href="/gmsh/bin/gmsh-1.25-IRIX.tgz">SGI IRIX tarball (IRIX 6.5)</A>
+<li><A href="/gmsh/bin/gmsh-1.25-HP-UX.tgz">HP tarball (HPUX 10.20)</A>
</ul>