From 44e98f3e05abcb7c0f1ce966ea51a1ccbf0609ad Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 17 Apr 2008 21:05:52 +0000
Subject: [PATCH] prepare release
---
Makefile | 6 +++---
Mesh/Generator.cpp | 15 ++++++++-------
doc/VERSIONS | 8 ++++----
doc/gmsh.1 | 4 ++--
doc/gmsh.html | 10 +++++-----
doc/texinfo/gmsh.texi | 4 ++--
6 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/Makefile b/Makefile
index 45afd231e3..04353bea5c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.476 2008-03-20 14:55:58 geuzaine Exp $
+# $Id: Makefile,v 1.477 2008-04-17 21:05:51 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -22,8 +22,8 @@
include variables
GMSH_MAJOR_VERSION = 2
-GMSH_MINOR_VERSION = 1
-GMSH_PATCH_VERSION = 2
+GMSH_MINOR_VERSION = 2
+GMSH_PATCH_VERSION = 0
GMSH_EXTRA_VERSION =
GMSH_VERSION = ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}${GMSH_EXTRA_VERSION}
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index bf1217ef46..1c7fde7fe8 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -1,4 +1,4 @@
-// $Id: Generator.cpp,v 1.139 2008-03-20 11:44:08 geuzaine Exp $
+// $Id: Generator.cpp,v 1.140 2008-04-17 21:05:51 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -232,12 +232,13 @@ static void Mesh2D(GModel *m)
{
if(TooManyElements(m, 2)) return;
- if(CTX.mesh.algo2d == ALGO_2D_DELAUNAY && !CTX.expert_mode){
- if(!GetBinaryAnswer("The 2D Delaunay algorithm is still highly experimental\n"
- "and produces triangles with random orientations. Do you\n"
- "really want to continue?\n\n"
- "(To disable this warning in the future, select `Enable\n"
- "expert mode' in the option dialog.)",
+ if(!CTX.expert_mode && (CTX.mesh.algo2d == ALGO_2D_DELAUNAY ||
+ CTX.mesh.algo2d == ALGO_2D_FRONTAL)){
+ if(!GetBinaryAnswer("The 2D Delaunay and Frontal algorithms are still experimental\n"
+ "and produce triangles with random orientations. Do you really\n"
+ "want to continue?\n\n"
+ "(To disable this warning in the future, select `Enable expert\n"
+ "mode' in the option dialog.)",
"Continue", "Cancel")) return;
}
diff --git a/doc/VERSIONS b/doc/VERSIONS
index 0dc97d75b3..1bcdbd706f 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,11 +1,11 @@
-$Id: VERSIONS,v 1.404 2008-04-13 20:54:42 geuzaine Exp $
+$Id: VERSIONS,v 1.405 2008-04-17 21:05:52 geuzaine Exp $
-2.1.2 (xx): new model-based post-processing backend; added MED I/O for
+2.2.0 (xx): new model-based post-processing backend; added MED I/O for
mesh and post-processing; fixed BDF vertex ordering for 2nd order
elements; replaced Mesh.ConstrainedBackgroundMesh with
Mesh.CharacteristicLength{FromPoints,ExtendFromBoundary}; new Fields
-interface; control windows are now non-modal by default; fixed various
-bugs.
+interface; control windows are now non-modal by default; new
+experimental 2D frontal algorithm; fixed various bugs.
2.1.1 (Mar 1, 2008): small bug fixes (second order meshes, combine
views, divide and conquer crash, ...).
diff --git a/doc/gmsh.1 b/doc/gmsh.1
index 9959e03037..551bd2caaf 100644
--- a/doc/gmsh.1
+++ b/doc/gmsh.1
@@ -1,5 +1,5 @@
-.\" $Id: gmsh.1,v 1.82 2008-02-23 19:49:35 geuzaine Exp $
-.TH Gmsh 1 "23 February 2008" "Gmsh 2.1" "Gmsh Manual Pages"
+.\" $Id: gmsh.1,v 1.83 2008-04-17 21:05:52 geuzaine Exp $
+.TH Gmsh 1 "23 February 2008" "Gmsh 2.2" "Gmsh Manual Pages"
.UC 4
.\" ********************************************************************
.SH NAME
diff --git a/doc/gmsh.html b/doc/gmsh.html
index 86e6db765a..51ecfbe424 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -25,7 +25,7 @@ generator with built-in pre- and post-processing facilities</h1>
<p>
<h3 align="center">Christophe Geuzaine and Jean-Fran�ois Remacle</h3>
<p>
-<h3 align=center>Version 2.1.1, March 1 2008</h3>
+<h3 align=center>Version 2.2.0, April 19 2008</h3>
<p>
<center>
<a href="#Description">Description</a> |
@@ -66,10 +66,10 @@ binary). Tutorial and demos files are included in all the archives.
<ul>
<li>
<strong>Current stable release</strong>:
-<a href="/gmsh/bin/Windows/gmsh-2.1.1-Windows.zip"><strong>Windows</strong></a>,
-<a href="/gmsh/bin/Linux/gmsh-2.1.1-Linux.tgz"><strong>Linux</strong></a>,
-<a href="/gmsh/bin/MacOSX/gmsh-2.1.1-MacOSX.tgz"><strong>Mac OS X</strong></a> and
-<a href="/gmsh/src/gmsh-2.1.1-source.tgz"><strong>source code</strong></a>
+<a href="/gmsh/bin/Windows/gmsh-2.2.0-Windows.zip"><strong>Windows</strong></a>,
+<a href="/gmsh/bin/Linux/gmsh-2.2.0-Linux.tgz"><strong>Linux</strong></a>,
+<a href="/gmsh/bin/MacOSX/gmsh-2.2.0-MacOSX.tgz"><strong>Mac OS X</strong></a> and
+<a href="/gmsh/src/gmsh-2.2.0-source.tgz"><strong>source code</strong></a>
<a href="#build-footnote" name="build-footmark"><sup>2</sup></a>
<p>
<li>Experimental versions (these might be buggy, or might not even
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 7fef17561f..e5ab74a622 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.246 2008-04-07 07:54:03 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.247 2008-04-17 21:05:52 geuzaine Exp $
@c
@c Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
@c
@@ -37,7 +37,7 @@
@c =========================================================================
@c %**start of header
@setfilename gmsh.info
-@set GMSH-VERSION 2.1
+@set GMSH-VERSION 2.2
@set COPYRIGHT @copyright{} 1997-2008 Christophe Geuzaine, Jean-Fran@,{c}ois Remacle
@c
@settitle Gmsh @value{GMSH-VERSION}
--
GitLab