diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h index cf548d9eedeca1cb3370833314c9d8002edd0cb9..a9d457af839e49b11f830ead8751def4f6c14cb7 100644 --- a/Common/DefaultOptions.h +++ b/Common/DefaultOptions.h @@ -789,7 +789,7 @@ StringXNumber MeshOptions_Number[] = { "Point insertion method for isotropic 2D algorithm (1=center of circumscribed circle, 2=voronoi, 3=cog)" }, { F|O, "PointsNumbers" , opt_mesh_points_num , 0. , "Display mesh vertex numbers?" }, - { F|O, "PointSize" , opt_mesh_point_size , 2. , + { F|O, "PointSize" , opt_mesh_point_size , 3. , "Display size of points (in pixels)" }, { F|O, "PointType" , opt_mesh_point_type , 0. , "Display points as solid color dots (0) or 3D spheres (1)" }, @@ -988,7 +988,7 @@ StringXNumber ViewOptions_Number[] = { { F, "OffsetZ" , opt_view_offset2 , 0. , "Translation of the view along Z-axis (in model coordinates)" }, - { F|O, "PointSize" , opt_view_point_size , 2. , + { F|O, "PointSize" , opt_view_point_size , 3. , "Display size of points (in pixels)" }, { F|O, "PointType" , opt_view_point_type , 0. , "Display points as solid color dots (0) or 3D spheres (1)" }, @@ -1201,8 +1201,8 @@ StringXColor GeometryOptions_Color[] = { StringXColor MeshOptions_Color[] = { { F|O, "Points" , opt_mesh_color_points , - PACK_COLOR(0 , 123, 59 , 255), - PACK_COLOR(0 , 123, 59 , 255), + PACK_COLOR(0 , 200, 70 , 255), + PACK_COLOR(0 , 200, 70 , 255), PACK_COLOR(0, 0, 0, 255), "Mesh vertex color" }, { F|O, "PointsSup" , opt_mesh_color_points_deg2 , diff --git a/Mesh/3D_Coherence.cpp b/Mesh/3D_Coherence.cpp index eaa147f49d2990ce968a33cd5df2dd518847aa22..3a1585402c6223d55af9fcbc8ebcd68a47551d9e 100644 --- a/Mesh/3D_Coherence.cpp +++ b/Mesh/3D_Coherence.cpp @@ -1,4 +1,4 @@ -// $Id: 3D_Coherence.cpp,v 1.32 2004-04-18 17:45:39 geuzaine Exp $ +// $Id: 3D_Coherence.cpp,v 1.33 2004-04-19 00:18:07 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -29,6 +29,8 @@ extern Mesh *THEM; extern int FACE_DIMENSION; extern Simplex MyNewBoundary; +extern int edges_tetra[6][2]; +extern int edges_non[3]; static Volume *THEVOL; static Edge *TheEdge; @@ -38,16 +40,6 @@ static List_T *Teti; List_T *Missing, *MissingF, *MissingS; Tree_T *EdgesTree, *FacesTree, *swaps, *touchedvertex; -int edges_tetra[6][2] = { - {0, 1}, - {1, 2}, - {2, 0}, - {3, 0}, - {3, 2}, - {3, 1} -}; -int edges_non[3] = { 2, 0, 1 }; - int memesens(Vertex * v1, Vertex * v2, Vertex * v3, Vertex * c1, Vertex * c2, Vertex * c3) { diff --git a/Mesh/Edge.cpp b/Mesh/Edge.cpp index be099ea408276cc9260516e9ff0b4de674d4ac6e..4eaa3d932ef47df643b071ded4e6401e1c49a1d1 100644 --- a/Mesh/Edge.cpp +++ b/Mesh/Edge.cpp @@ -1,4 +1,4 @@ -// $Id: Edge.cpp,v 1.14 2004-04-18 03:20:53 geuzaine Exp $ +// $Id: Edge.cpp,v 1.15 2004-04-19 00:18:07 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -25,13 +25,7 @@ #include "Edge.h" #include "Tools.h" -static int edges_quad[4][2] = { - {0, 1}, - {1, 2}, - {2, 3}, - {3, 0} -}; -static int edges_tetra[6][2] = { +int edges_tetra[6][2] = { {0, 1}, {1, 2}, {2, 0}, @@ -39,7 +33,15 @@ static int edges_tetra[6][2] = { {3, 2}, {3, 1} }; -static int edges_non[3] = { 2, 0, 1 }; + +int edges_quad[4][2] = { + {0, 1}, + {1, 2}, + {2, 3}, + {3, 0} +}; + +int edges_non[3] = { 2, 0, 1 }; int compareedge(const void *a, const void *b) { diff --git a/Mesh/SecondOrder.cpp b/Mesh/SecondOrder.cpp index 846387595986c560edbe7e4ce02ba6f8519291b7..2f88c1336768857f671bc29fc295ab86f89408cf 100644 --- a/Mesh/SecondOrder.cpp +++ b/Mesh/SecondOrder.cpp @@ -1,4 +1,4 @@ -// $Id: SecondOrder.cpp,v 1.21 2004-04-18 21:47:29 geuzaine Exp $ +// $Id: SecondOrder.cpp,v 1.22 2004-04-19 00:18:07 geuzaine Exp $ // // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle // @@ -36,6 +36,8 @@ // Element, and dynamic cast to Simplex, Quandrangle, Hexahdra, etc. extern Mesh *THEM; +extern int edges_tetra[6][2]; +extern int edges_quad[4][2]; static Surface *THES = NULL; static Curve *THEC = NULL; @@ -120,22 +122,6 @@ Vertex *onsurface(Vertex * v1, Vertex * v2) return pv; } -static int edges_tetra[6][2] = { - {0, 1}, - {1, 2}, - {2, 0}, - {3, 0}, - {3, 2}, - {3, 1} -}; - -static int edges_quad[4][2] = { - {0, 1}, - {1, 2}, - {2, 3}, - {3, 0} -}; - void PutMiddlePoint(void *a, void *b) { Edge *ed; diff --git a/tutorial/t1.geo b/tutorial/t1.geo index 404c9c0029dbe7735f0affdb082c74f0240023d2..8761b856825e7606bb483187dc189ba625483127 100644 --- a/tutorial/t1.geo +++ b/tutorial/t1.geo @@ -10,7 +10,7 @@ // The simplest construction of Gmsh's scripting language is the // `affectation'. The following command defines a new variable `lc': -lc = 0.007; +lc = 0.009; // This variable can then for example be used in the definition of // Gmsh's simplest `elementary entity', a `Point'. A Point is defined diff --git a/tutorial/t2.geo b/tutorial/t2.geo index bb32000c44c752d818fcfd959a77454895f31f0e..0ba1e40ed8cb6d2dcde4fe8f26825c5dbfbf920c 100644 --- a/tutorial/t2.geo +++ b/tutorial/t2.geo @@ -53,7 +53,7 @@ Extrude Surface { 11, {0, 0, h} }; // elementary entities. The following command permits to manually // specify a characteristic length for some of the new points: -Characteristic Length {tmp[0], 22, 2, 3, 16, 12} = lc * 2; +Characteristic Length {tmp[0], 22, 2, 3, 16, 12} = lc * 4; // Note that, if the transformation tools are handy to create complex // geometries, it is also sometimes useful to generate the `flat'