diff --git a/Geo/OCCEdge.cpp b/Geo/OCCEdge.cpp index 666b20505fc9467b800a3c7dd08fc6ed4efbc392..2e077ae935bd32aa3b766f3a24924f48fecd79b1 100644 --- a/Geo/OCCEdge.cpp +++ b/Geo/OCCEdge.cpp @@ -1,4 +1,4 @@ -// $Id: OCCEdge.cpp,v 1.22 2007-09-04 13:47:01 remacle Exp $ +// $Id: OCCEdge.cpp,v 1.23 2007-10-08 13:13:23 geuzaine Exp $ // // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // @@ -210,22 +210,22 @@ double OCCEdge::curvature(double par) const Standard_Real Crv; if (curve.IsNull()){ Geom2dLProp_CLProps2d aCLProps(curve2d, 2, eps); - aCLProps.SetParameter (par); + aCLProps.SetParameter(par); if(!aCLProps.IsTangentDefined()) - Crv =eps; + Crv = eps; else Crv = aCLProps.Curvature(); } else{ BRepAdaptor_Curve brepc(c); BRepLProp_CLProps prop(brepc, 2, eps); - prop.SetParameter (par); - if (!prop.IsTangentDefined()) + prop.SetParameter(par); + if(!prop.IsTangentDefined()) Crv = eps; else Crv = prop.Curvature(); } - if (Crv <= eps)Crv = eps; + if(Crv <= eps) Crv = eps; // std::list<GFace*> ff = faces(); // std::list<GFace *>::iterator it = ff.begin(); diff --git a/Geo/gmshEdge.cpp b/Geo/gmshEdge.cpp index 69f80226b12a33aa6a15ed86789bd9d4ad32fbed..502b5cde33531a060626fefc208bc817ff0935ce 100644 --- a/Geo/gmshEdge.cpp +++ b/Geo/gmshEdge.cpp @@ -1,4 +1,4 @@ -// $Id: gmshEdge.cpp,v 1.38 2007-09-26 20:51:58 geuzaine Exp $ +// $Id: gmshEdge.cpp,v 1.39 2007-10-08 13:13:23 geuzaine Exp $ // // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // @@ -124,7 +124,7 @@ int gmshEdge::minimumMeshSegments () const return (int)(fabs(c->Circle.t1 - c->Circle.t2) * (double)CTX.mesh.min_circ_points / Pi) - 1; else - return GEdge::minimumMeshSegments () ; + return GEdge::minimumMeshSegments(); } int gmshEdge::minimumDrawSegments () const diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi index 80bf8a434380bf624bd201fdc8cc5a0ccc8d4a57..bbd0630a74894e4f3e09a79610f4996b135e5a60 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.235 2007-09-10 04:47:10 geuzaine Exp $ +@c $Id: gmsh.texi,v 1.236 2007-10-08 13:13:23 geuzaine Exp $ @c @c Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle @c @@ -2876,9 +2876,10 @@ where is the number of nodes in the mesh. @item @var{node-number} -is the number (index) of the @var{n}-th node in the mesh. Note that the -@w{@var{node-number}s} do not have to be given in a consecutive (or even an -ordered) way. +is the number (index) of the @var{n}-th node in the mesh; +@var{node-number} must be a postive (non-zero) integer. Note that the +@w{@var{node-number}s} do not necessarily have to form a dense nor an +ordered sequence. @item @var{x-coord} @var{y-coord} @var{z-coord} are the floating point values giving the X, Y and Z coordinates of the @@ -2888,9 +2889,10 @@ are the floating point values giving the X, Y and Z coordinates of the is the number of elements in the mesh. @item @var{elm-number} -is the number (index) of the @var{n}-th element in the mesh. Note that the -@w{@var{elm-number}s} do not have to be given in a consecutive (or even an -ordered) way. +is the number (index) of the @var{n}-th element in the mesh; +@var{elm-number} must be a postive (non-zero) integer. Note that the +@w{@var{elm-number}s} do not necessarily have to form a dense nor an +ordered sequence. @item @var{elm-type} defines the geometrical type of the @var{n}-th element: @@ -2948,10 +2950,14 @@ with the edges). See below for the ordering of the nodes. @item @var{reg-phys} -is the number of the physical entity to which the element belongs. +is the number of the physical entity to which the element belongs; +@var{reg-phys} must be a postive integer, or zero. If @var{reg-phys} is +equal to zero, the element is considered not to belong to any physical +entity. @item @var{reg-elem} -is the number of the elementary entity to which the element belongs. +is the number of the elementary entity to which the element belongs; +@var{reg-elem} must be a postive (non-zero) integer. @item @var{number-of-nodes} is the number of nodes for the @var{n}-th element. This is redundant, but @@ -3016,9 +3022,10 @@ file (currently only @var{data-size} = sizeof(double) is supported). is the number of nodes in the mesh. @item @var{node-number} -is the number (index) of the @var{n}-th node in the mesh. Note that the -@w{@var{node-number}s} do not have to be given in a consecutive (or even an -ordered) way. +is the number (index) of the @var{n}-th node in the mesh; +@var{node-number} must be a postive (non-zero) integer. Note that the +@w{@var{node-number}s} do not necessarily have to form a dense nor an +ordered sequence. @item @var{x-coord} @var{y-coord} @var{z-coord} are the floating point values giving the X, Y and Z coordinates of the @@ -3028,9 +3035,10 @@ are the floating point values giving the X, Y and Z coordinates of the is the number of elements in the mesh. @item @var{elm-number} -is the number (index) of the @var{n}-th element in the mesh. Note that the -@w{@var{elm-number}s} do not have to be given in a consecutive (or even an -ordered) way. +is the number (index) of the @var{n}-th element in the mesh; +@var{elm-number} must be a postive (non-zero) integer. Note that the +@w{@var{elm-number}s} do not necessarily have to form a dense nor an +ordered sequence. @item @var{elm-type} defines the geometrical type of the @var{n}-th element: @@ -3093,11 +3101,12 @@ generates meshes with two tags and reads files with an arbitrary number of tags: see below. @item @var{tag} -is an integer tag associated with the @var{n}-th element. By default, the -first tag is the number of the physical entity to which the element belongs; -the second is the number of the elementary geometrical entity to which the -element belongs; the third is the number of a mesh partition to which the -element belongs. +is an integer tag associated with the @var{n}-th element. By default, +the first tag is the number of the physical entity to which the element +belongs; the second is the number of the elementary geometrical entity +to which the element belongs; the third is the number of a mesh +partition to which the element belongs. All tags must be postive +integers, or zero. A zero tag is equivalent to no tag. @item @var{node-number-list} is the list of the node numbers of the @var{n}-th element. The ordering of