1.25

Common/GetOptions.cpp

-// $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);

Common/Options.cpp

-// $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"
@@ -1419,7 +1419,7 @@ double opt_mesh_constrained_bgmesh(OPT_ARGS_NUM){
 }
 double opt_mesh_degree(OPT_ARGS_NUM){
   if(action & GMSH_SET)
-    CTX.mesh.degree = (int)val;
+    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);

Makefile

-# $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 
 
-
-
-
-
-

doc/VERSIONS

-$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

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

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 &copy; 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>