Skip to content
Snippets Groups Projects
Commit 4b6d7aaa authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

typos

parent e456fbd8
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 3254 additions and 3154 deletions
Common/Colors.h
+ 1
− 2
View file @ 4b6d7aaa
/* $Id: Colors.h,v 1.3 2000-12-05 15:23:54 geuzaine Exp $ */
/* $Id: Colors.h,v 1.4 2000-12-08 22:17:47 geuzaine Exp $ */
#ifndef _COLORS_H_
#define _COLORS_H_
......@@ -17,7 +17,6 @@ StringX4Int ColorString[] = {
{ "BlanchedAlmond" , 255, 235, 205, 255 } ,
{ "Bisque" , 255, 228, 196, 255 } ,
{ "PeachPuff" , 255, 218, 185, 255 } ,
{ "Navajo white" , 255, 222, 173, 255 } ,
{ "NavajoWhite" , 255, 222, 173, 255 } ,
{ "Moccasin" , 255, 228, 181, 255 } ,
{ "Cornsilk" , 255, 248, 220, 255 } ,
......
Parser/Gmsh.l
+ 2
− 1
View file @ 4b6d7aaa
%{ /* $Id: Gmsh.l,v 1.14 2000-12-07 16:03:43 remacle Exp $ */
%{ /* $Id: Gmsh.l,v 1.15 2000-12-08 22:17:47 geuzaine Exp $ */
#include <stdio.h>
#include <stdlib.h>
......@@ -157,6 +157,7 @@ Printf return tPrintf ;
Recombine return tRecombine;
Rotate return tRotate;
Ruled return tRuled;
Rand return tRand;
Sqrt return tSqrt ;
Sin return tSin ;
......
Parser/Gmsh.tab.cpp
+ 2415
− 2326
View file @ 4b6d7aaa
This diff is collapsed.
Parser/Gmsh.tab.cpp.h
+ 17
− 16
View file @ 4b6d7aaa
......@@ -7,22 +7,23 @@ typedef union {
Shape s;
List_T *l;
} YYSTYPE;
#define tDOUBLE 258
#define tSTRING 259
#define tBIGSTR 260
#define tEND 261
#define tAFFECT 262
#define tDOTS 263
#define tPi 264
#define tExp 265
#define tLog 266
#define tLog10 267
#define tSqrt 268
#define tSin 269
#define tAsin 270
#define tCos 271
#define tAcos 272
#define tTan 273
#define tDOUBLE 257
#define tSTRING 258
#define tBIGSTR 259
#define tEND 260
#define tAFFECT 261
#define tDOTS 262
#define tPi 263
#define tExp 264
#define tLog 265
#define tLog10 266
#define tSqrt 267
#define tSin 268
#define tAsin 269
#define tCos 270
#define tAcos 271
#define tTan 272
#define tRand 273
#define tAtan 274
#define tAtan2 275
#define tSinh 276
......
Parser/Gmsh.y
+ 24
− 24
View file @ 4b6d7aaa
%{ /* $Id: Gmsh.y,v 1.30 2000-12-08 13:06:53 geuzaine Exp $ */
%{ /* $Id: Gmsh.y,v 1.31 2000-12-08 22:17:47 geuzaine Exp $ */
#include <stdarg.h>
......@@ -73,7 +73,7 @@ void vyyerror (char *fmt, ...);
%token <c> tSTRING tBIGSTR
%token tEND tAFFECT tDOTS tPi
%token tExp tLog tLog10 tSqrt tSin tAsin tCos tAcos tTan
%token tExp tLog tLog10 tSqrt tSin tAsin tCos tAcos tTan tRand
%token tAtan tAtan2 tSinh tCosh tTanh tFabs tFloor tCeil
%token tFmod tModulo tHypot tPrintf tDraw tSleep
%token tPoint tCircle tEllipsis tLine tSurface tSpline tVolume
......@@ -1655,34 +1655,32 @@ Macro :
Command :
tPrintf tBIGSTR tEND
{
if(!CTX.interactive){ // we're in interactive mode
char ext[6];
strcpy(ext,$2+(strlen($2)-4));
Replot();
extern void CreateImage (FILE *fp);
FILE *fp = 0;
if(!strcmp(ext,".gif"))
{
if(!strcmp(ext,".gif")){
fp = fopen($2,"wb");
CTX.print.type = PRINT_GL2GIF;
}
else if(!strcmp(ext,".eps"))
{
else if(!strcmp(ext,".eps")){
fp = fopen($2,"w");
CTX.print.type = PRINT_GL2PS_RECURSIVE;
}
else if(!strcmp(ext,".xpm"))
{
else if(!strcmp(ext,".xpm")){
fp = fopen($2,"wb");
CTX.print.type = PRINT_XDUMP;
CTX.print.format = FORMAT_XPM;
}
if(fp)
{
if(fp){
CreateImage(fp);
fclose(fp);
}
}
}
| tExit tEND
{
exit(0);
......@@ -1695,6 +1693,7 @@ Command :
}
| tDraw tEND
{
if(!CTX.interactive){ // we're in interactive mode
if(Tree_Nbr(THEM->Points) != Last_NumberOfPoints){
Last_NumberOfPoints = Tree_Nbr(THEM->Points);
Replot();
......@@ -1703,7 +1702,7 @@ Command :
Init();
Draw();
}
}
}
| tSleep FExpr tEND
{
......@@ -2102,6 +2101,7 @@ FExpr :
| tFmod '(' FExpr ',' FExpr ')' { $$ = fmod($3,$5); }
| tModulo '(' FExpr ',' FExpr ')' { $$ = fmod($3,$5); }
| tHypot '(' FExpr ',' FExpr ')' { $$ = sqrt($3*$3+$5*$5); }
| tRand '(' FExpr ')' { $$ = $3*(double)rand()/(double)RAND_MAX; }
;
FExpr_Single :
......
Parser/Gmsh.yy.cpp
+ 694
− 688
View file @ 4b6d7aaa
This diff is collapsed.
Unix/Main.cpp
+ 6
− 6
View file @ 4b6d7aaa
/* $Id: Main.cpp,v 1.25 2000-12-08 13:12:18 geuzaine Exp $ */
/* $Id: Main.cpp,v 1.26 2000-12-08 22:17:48 geuzaine Exp $ */
#include <signal.h>
......@@ -43,12 +43,12 @@ char gmsh_email[] = "E-Mail : Christophe.Geuzaine@ulg.ac.be\n"
char gmsh_help[] =
"Usage: %s [options] [files]\n"
"Geometry options:\n"
" -0 output flattened geometry and exit\n"
" -0 parse input files, output flattened geometry, and exit\n"
"Mesh options:\n"
" -1, -2, -3 perform batch 1D, 2D and 3D mesh generation\n"
" -script gmsh in script mode\n"
// " -script gmsh in script mode\n"
" -format msh|unv|gref set output mesh format (default: msh)\n"
" -algo iso|aniso select mesh algorithm (default: iso)\n"
" -algo iso|aniso select 2D mesh algorithm (default: iso)\n"
" -smooth int set mesh smoothing (default: 0)\n"
" -degree int set mesh degree (default: 1)\n"
" -scale float set global scaling factor (default: 1.0)\n"
......@@ -57,8 +57,8 @@ char gmsh_help[] =
" -interactive display 2D mesh construction interactively\n"
"Post Processing options:\n"
" -dl enable display lists\n"
" -noview hide all views at startup\n"
" -link link all views at startup\n"
" -noview hide all views on startup\n"
" -link link all views on startup\n"
"Display options:\n"
" -nodb disable double buffering\n"
" -noov disable overlay visual\n"
......
demos/demo-09.geo
+ 3
− 1
View file @ 4b6d7aaa
......@@ -426,7 +426,9 @@ Surface Loop(607) = {186,190,-184,174,172,192,-178,-176};
Complex Volume(608) = {607};
Surface Loop(6001) = {213,-239,-182,180,186,237,231,-229,227,-233,-188,-201,-199,-219,132,138,136,134,112,156,-114,162,-160,158,-140,101,-146,-144,-142,154,148,-105,-152,-150};
Surface Loop(6001) = {213,-239,-182,180,186,237,231,-229,227,-233,-188,
-201,-199,-219,132,138,136,134,112,156,-114,162,-160,158,-140,101,
-146,-144,-142,154,148,-105,-152,-150};
Complex Volume(6002) = {6001};
Delete { Line{169} ; }
......
demos/demo-10.geo
+ 33
− 61
View file @ 4b6d7aaa
......@@ -11,10 +11,11 @@ l1 = 1.;
l2 = .8;
l3 = .1;
r2 = 1.1;
lc = .08;
lc = .1;
lc2 = .05;
rint = .2;
rext = .3;
Point(1) = {0.0,0.0,0.0,lc};
Point(2) = {l1,0.0,0.0,lc2};
Point(3) = {l1-r1,0.0,0.0,lc2};
......@@ -38,55 +39,22 @@ Point(10) = { (l1 + r2) * Cos(r/2) , (l1 + r2) * Sin(r/2), 0.0, lc};
// Remember, all rotations are specified by the axis direction
// ({0,0,1}), an axis point ({0,0,0}) and a rotation angle (r)
Rotate {{0.0,0.0,1.0},{0.0,0.0,0.0},r} {
Duplicata {
Line{1};
Line{2};
Line{3};
Line{4};
Line{5};
Line{6};
Point{10};
}
}
Rotate{{0.0,0.0,1.0},{0.0,0.0,0.0},2*r} {
Duplicata {
Line{1};
Line{2};
Line{3};
Line{4};
Line{5};
Line{6};
Point{10};
}
}
i = 0 ;
Rotate{{0.0,0.0,1.0},{0.0,0.0,0.0},3*r} {
Duplicata {
Line{1};
Line{2};
Line{3};
Line{4};
Line{5};
Line{6};
Point{10};
}
}
For(1:4)
i+=1 ;
Rotate{{0.0,0.0,1.0},{0.0,0.0,0.0},4*r} {
Rotate {{0.0,0.0,1.0},{0.0,0.0,0.0}, i*r} {
Duplicata {
Line{1};
Line{2};
Line{3};
Line{4};
Line{5};
Line{6};
Line{1}; Line{2}; Line{3};
Line{4}; Line{5}; Line{6};
Point{10};
}
}
EndFor
Point(newp) = {rint,0,0,lc};
Point(newp) = {rext,0,0,lc};
Point(newp) = {-rint,0,0,lc};
......@@ -110,20 +78,24 @@ Circle(41) = {122,1,126};
Circle(42) = {126,1,120};
Circle(43) = {120,1,124};
Line Loop(44) = {36,37,38,39};
Line Loop(46) = {43,40,41,42};
Line Loop(48) = {-26,-25,29,30,28,27,35,-20,-19,23,24,22,21,34,
-14,-13,17,18,16,15,33,-8,-7,11,12,10,9,32,-2,
-1,5,6,4,3,31};
Plane Surface(49) = {48,46};
Line Loop(44) = {37,38,39,36};
Line Loop(46) = {40,41,42,43};
Plane Surface(47) = {46,44};
//Extrude Surface {45, {0,0,0.2}};
//Surface Loop(72) = {45,58,62,66,70,71};
//Volume(73) = {72};
Line Loop(48) = {-2,-1,5,6,4,3,31,-26,-25,29,30,28,27,35,-20,-19,
23,24,22,21,34,-14,-13,17,18,16,15,33,-8,-7,11,12,10,9,32};
Plane Surface(49) = {48,46};
Extrude Surface {47, {0,0,0.2}};
Extrude Surface {49, {0,0,0.2}};
Extrude Surface {91, {0,0,0.2}};
Extrude Surface {47, {0,0,-0.2}};
Surface Loop(373) = {90,371,359,78,82,363,367,86,325,329,317,
321,330,301,288,135,49,139,143,147,151,155,159,163,167,171,
175,179,183,187,191,195,199,203,207,211,215,219,223,227,231,
235,239,243,247,251,255,259,263,267,271,343,347,351,355,372,
305,309,313};
Volume(374) = {373};
Surface Loop(247) = {246,93,49,97,101,105,109,113,117,121,125,129,133,
137,141,145,149,153,157,161,165,169,173,177,181,185,189,193,197,
201,205,209,213,217,221,225,229,233,237,241,245};
Volume(248) = {247};
Physical Volume(1) = 374 ;
demos/demo-15.geo
+ 22
− 8
View file @ 4b6d7aaa
......@@ -8,6 +8,7 @@
Include "demo-01.geo" ;
Include "view-01.pos" ;
Include "view-01.pos" ;
General.Trackball = 0 ;
General.Rotation0 = 0 ;
......@@ -15,29 +16,42 @@ General.Rotation1 = 0 ;
General.Rotation2 = 0 ;
General.Color.Background = White ;
General.Color.Text = Black ;
General.Orthographic = 0 ;
General.Axes = 0 ;
PostProcessing.View[0].Name = "This is a very stupid demonstration..." ;
PostProcessing.View[0].IntervalsType = 2 ;
PostProcessing.View[0].Offset = {0,0,0.05} ;
PostProcessing.View[0].Raise = {0,0,0} ;
PostProcessing.View[0].Light = 1 ;
t = 0 ;
PostProcessing.View[1].Name = "...of Gmsh's scripting capabilities" ;
PostProcessing.View[1].IntervalsType = 1 ;
PostProcessing.View[1].Color = { Green, Blue } ;
PostProcessing.View[1].NbIso = 10 ;
For(1:100)
t = 0 ;
General.Rotation0 += 10 ;
General.Rotation1 = General.Rotation0 / 3 ;
General.Rotation2 += 0.1 ;
For(1:255)
PostProcessing.View[0].TimeStep = t ;
PostProcessing.View[1].TimeStep = t ;
t = (PostProcessing.View[0].TimeStep < PostProcessing.View[0].NbTimeStep-1) ? t+1 : 0 ;
PostProcessing.View[0].Raise += {0,0,0.0002*t} ;
PostProcessing.View[0].Raise += {0,0,0.001*t} ;
Sleep 0.1;
For(1:10)
General.Rotation0 += 10 ;
General.Rotation1 = General.Rotation0 / 3 ;
General.Rotation2 += 0.1 ;
Sleep 0.01;
Draw;
EndFor
EndFor
doc/gmsh.1
+ 37
− 21
View file @ 4b6d7aaa
......@@ -2,10 +2,10 @@
.\"
.\" This is the manual page for Gmsh
.\"
.\" Copyright (c) 2000 C. Geuzaine, J.-F. Remacle
.\" Copyright (c) 2000 J.-F. Remacle, C. Geuzaine
.\"
.\" ======================================================================
.TH Gmsh 0.995 "23 November 2000"
.TH Gmsh 0.995 "08 December 2000"
.UC 4
.\" ======================================================================
.SH NAME
......@@ -30,7 +30,7 @@ Parameterized geometries are created by successively defining points,
oriented curves (segments, circles, ellipsis, splines, etc.), oriented
surfaces (plane surfaces, ruled surfaces, etc.) and volumes. Compound
groups of geometrical entities can be defined, based on these elementary
parameterized geometric entities.
parameterized and scriptable geometric entities.
.SS Mesh Generation
A finite element mesh is a tessellation of a given subset of R^3 by
elementary geometrical elements of various shapes (in this case lines,
......@@ -89,16 +89,14 @@ mesh. Scalar fields are represented by iso-value curves or color maps
and vector fields by three-dimensional arrows or displacement
maps. Post-processor functions include offsets, elevation, interactive
color map modification, range clamping, interactive animation, vector
postscript output, etc.
postscript output, etc. All post-processing options can be accessed
either interactively or through the input ascii files.
.\" ======================================================================
.SH MESH OPTIONS
.TP 4
.B file[s]
one or more ASCII file(s) containing the geometrical, mesh or
post-processing descriptions.
.SH GEOMETRY OPTIONS
.TP 4
.B \-0
parse all input files and exit.
parse all input files, output flattened geometry, and exit.
.SH MESH OPTIONS
.TP 4
.B \-1
perform the one-dimensional mesh, i.e. discretize all the curves in
......@@ -112,6 +110,12 @@ the geometry.
perform the three-dimensional mesh, i.e. discretize all the volumes in
the geometry.
.TP 4
.B \-format msh|unv|gref
set output mesh format (default: msh)
.TP 4
.B \-algo iso|aniso
select the two-dimensional mesh algorithm (default: iso)
.TP 4
.B \-smooth int
set the number of smoothing passes (default value is 3).
.TP 4
......@@ -122,14 +126,16 @@ set the degree of the generated elements (default value is 1).
apply a global scaling factor to the generated mesh (default value is
1.0).
.TP 4
.B \-clscale float
apply a global scaling factor to all the characteristic lenghts in the
mesh (default value is 1.0).
.TP 4
.B \-bgm file
load view in file as current background mesh.
.TP 4
.B \-extrude
extrude 2-dimensional mesh (interactively)
.TP 4
.B \-recombine
recombine extruded meshes
.B \-interactive
display the 2D mesh construction interactively if the anisotropic mesh
algorithm is selected
.\" ======================================================================
.SH POST-PROCESSING OPTIONS
.TP 4
......@@ -138,6 +144,10 @@ enable OpenGL display lists.
.TP 4
.B \-noview
hide all views at startup.
.TP 4
.B \-link
link all views (all interactive option modifications will apply to all
views) at startup.
.\" ======================================================================
.SH DISPLAY OPTIONS
.TP 4
......@@ -151,8 +161,8 @@ suppress overlay visual.
.B \-alpha
enable alpha blending.
.TP 4
.B \-info
show visual info at startup.
.B \-notrack
don't use trackball mode for rotations.
.TP 4
.B \-geometry geom
specify main window geometry.
......@@ -174,21 +184,27 @@ force same visual for OpenGL and GUI.
.\" ======================================================================
.SH OTHER OPTIONS
.TP 4
.B \-threads
enable threads.
.B \-v int
set verbosity level (0=quiet, 3=debug; default:2).
.TP 4
.B \-nothreads
disable threads.
.TP 4
.B \-path string
set the path for included files.
.TP 4
.B \-version
show version information.
show version number.
.TP 4
.B \-info
show detailed version information.
.TP 4
.B \-help
show help message.
.\" ======================================================================
.SH AUTHORS
Christophe Geuzaine (Christope.Geuzaine@ulg.ac.be) and Jean-Francois
Remacle (remacle@scorec.rpi.edu).
Remacle (Remacle@scorec.rpi.edu).
.\" ======================================================================
.SH SEE ALSO
Gmsh homepage at \fIhttp://www.geuz.org/gmsh/\fR
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment