*** empty log message ***

Common/OpenFile.cpp

@@ -408,7 +408,7 @@ void OpenProject(const char *name)
 #endif
 #if !defined(HAVE_NO_PARSER)
   // reinitialize the variables defined in the parser (only if the
-  // current model is not empty: if it's empty it probably mean we
+  // current model is not empty: if it's empty it probably means we
   // just launched gmsh, and we don't want to delete variables set
   // e.g. using the -string command line option)
   if(GModel::current()->getNumVertices()) gmsh_yysymbols.clear();

benchmarks/3d/induction4.geo

@@ -173,33 +173,11 @@ Transfinite Line{1000108,-1000111,1000120,1000121,1000112,-1000109} =nbind Using
 Transfinite Line{1000123,1000124,1000171,1000169} = 6 Using Power 1.0;
 Transfinite Line{1000174,1000175,1000176,1000177,1000178,1000168,1000179,1000165} = nbext Using Power pwext;
 
-Transfinite Surface{1000160} = {1000017,1000019,1000018,1000016};
-Transfinite Surface{1000158} = {1000011,1000017,1000016,1000010};
-Transfinite Surface{1000150} = {1000011,1000010,1000024,1000023};
-Transfinite Surface{1000142} = {1000024,1000026,1000025,1000023};
-Transfinite Surface{1000140} = {1000023,1000025,1000002,1000004};
-Transfinite Surface{1000144} = {1000026,1000024,1000003,1000001};
-Transfinite Surface{1000146} = {1000003,1000007,1000005,1000001};
-Transfinite Surface{1000158} = {1000011,1000017,1000016,1000010};
-Transfinite Surface{1000156} = {1000011,1000008,1000015,1000017};
-Transfinite Surface{1000152} = {1000008,1000011,1000023,1000004};
-Transfinite Surface{1000154} = {1000008,1000006,1000013,1000015};
-Transfinite Surface{1000164} = {1000005,1000007,1000014,1000012};
-Transfinite Surface{1000162} = {1000007,1000010,1000016,1000014};
-Transfinite Surface{1000148} = {1000003,1000024,1000010,1000007};
-Transfinite Surface{1000138} = {1000006,1000008,1000004,1000002};
-Transfinite Surface{1000181} = {1000015,1000013,1000028,1000034};
-Transfinite Surface{1000183} = {1000017,1000015,1000034,1000030};
-Transfinite Surface{1000187} = {1000032,1000019,1000018,1000031};
-Transfinite Surface{1000191} = {1000029,1000033,1000014,1000016};
-Transfinite Surface{1000193} = {1000033,1000027,1000012,1000014};
-Transfinite Surface{1000185} = {1000019,1000017,1000030,1000032};
-Transfinite Surface{1000189} = {1000016,1000018,1000031,1000029};
-
 ss[] = {1000154,1000160,1000158,1000150,1000142,1000140,1000144,1000146,1000158,
         1000156,1000152,1000164,1000162,1000148,1000138,1000181,1000183,1000187,
         1000191,1000193,1000185,1000189};
 
+Transfinite Surface{ss[]};
 Recombine Surface{ss[]};
 
 

benchmarks/3d/sphere_hexa.geo

@@ -13,24 +13,10 @@ Line(1) = {2,3};
 Line(2) = {3,4};
 Line(3) = {4,5};
 Line(4) = {5,2};
-Transfinite Line{1:4} = n;
 Line Loop(5) = {4,1,2,3};
 Plane Surface(6) = {5};
-Transfinite Surface{6} = {2,3,4,5};
-Recombine Surface{6};
 Extrude Surface {6, {0.0,0.0,2*r1}};
 
-// force transfinite grid in interior cube
-Transfinite Line {3,22,11,13,8,4,14,9,1,18,10,2} = n;
-Transfinite Surface {6} = {4,5,2,3};
-Transfinite Surface {15} = {5,6,7,2};
-Transfinite Surface {19} = {11,7,2,3};
-Transfinite Surface {23} = {4,15,11,3};
-Transfinite Surface {27} = {15,6,5,4};
-Transfinite Surface {28} = {15,6,7,11};
-Recombine Surface{6,15,19,23,27,28};
-Transfinite Volume{1} = {4,5,2,3,15,6,7,11};
-
 // exterior shell
 Point(102) = {r2,r2,-r2,l};
 Point(103) = {-r2,r2,-r2,l};
@@ -74,35 +60,10 @@ Surface Loop(90) = {45,-77,-79,-27,83,81};Volume(91) = {90};
 Surface Loop(92) = {40,-81,-71,-28,73,-65};Volume(93) = {92};
 Surface Loop(94) = {34,61,-75,77,69,6};Volume(95) = {94};
 
-// force transfinite grid in exterior shell
-Transfinite Line{29:59} = n;
-Transfinite Surface {34} = {102,103,104,105};
-Transfinite Surface {35} = {106,108,102,103};
-Transfinite Surface {40} = {109,111,108,106};
-Transfinite Surface {45} = {104,105,111,109};
-Transfinite Surface {50} = {104,109,106,103};
-Transfinite Surface {51} = {105,111,108,102};
-Recombine Surface{34,35,40,45,50,51};
-Transfinite Surface {61} = {3,2,102,103};
-Transfinite Surface {63} = {2,7,108,102};
-Transfinite Surface {65} = {11,7,108,106};
-Transfinite Surface {67} = {3,11,106,103};
-Transfinite Surface {69} = {104,4,3,103};
-Transfinite Surface {71} = {109,15,11,106};
-Transfinite Surface {73} = {6,111,108,7};
-Transfinite Surface {75} = {5,105,102,2};
-Transfinite Surface {77} = {104,105,5,4};
-Transfinite Surface {79} = {104,109,15,4};
-Transfinite Surface {81} = {109,111,6,15};
-Transfinite Surface {83} = {6,111,105,5};
-Recombine Surface{61:83:2};
-Transfinite Volume{85} = {105,111,108,102, 5,6,7,2}; // x+
-Transfinite Volume{87} = {15,11,3,4,109,106,103,104}; // x-
-Transfinite Volume{89} = {11,7,2,3,106,108,102,103}; // y+
-Transfinite Volume{91} = {15,4,5,6,109,104,105,111}; // y-
-Transfinite Volume{93} = {15,6,7,11,109,111,108,106}; // z+
-Transfinite Volume{95} = {4,3,2,5,104,103,102,105}; // z-
+Transfinite Line "*" = n;
+Transfinite Surface "*";
+Recombine Surface "*";
+Transfinite Volume "*";
 
 // group all hexas in a single volume
 Physical Volume(1) = {1, 85:95:2};
-

benchmarks/3d/sphere_in_cube_hexa.geo

 l = 1;
-r1 = 3;
+r1 = 2;
 r2 = 0.5;
 n = 10;
 n2 = n;
-progr = 1.4;
+progr = 2;
 
 // exterior cube
 Point(1) = {0,0,0,l};
@@ -15,24 +15,11 @@ Line(1) = {2,3};
 Line(2) = {3,4};
 Line(3) = {4,5};
 Line(4) = {5,2};
-Transfinite Line{1:4} = n;
 Line Loop(5) = {4,1,2,3};
 Plane Surface(6) = {5};
-Transfinite Surface{6} = {2,3,4,5};
-Recombine Surface{6};
 Extrude Surface {6, {0.0,0.0,2*r1}};
 Delete { Volume{1}; }
 
-// force transfinite grid on exterior cube
-Transfinite Line {3,22,11,13,8,4,14,9,1,18,10,2} = n;
-Transfinite Surface {6} = {4,5,2,3};
-Transfinite Surface {15} = {5,6,7,2};
-Transfinite Surface {19} = {11,7,2,3};
-Transfinite Surface {23} = {4,15,11,3};
-Transfinite Surface {27} = {15,6,5,4};
-Transfinite Surface {28} = {15,6,7,11};
-Recombine Surface{6,15,19,23,27,28};
-
 // interior sphere
 Point(102) = {r2,r2,-r2,l};
 Point(103) = {-r2,r2,-r2,l};
@@ -50,16 +37,6 @@ Rotate { {1,0,0},{0,0,0}, 3*Pi/2 } { Duplicata{ Surface{34}; } }
 Rotate { {0,1,0},{0,0,0}, Pi/2 } { Duplicata { Surface{34}; } }
 Rotate { {0,1,0},{0,0,0}, -Pi/2 } { Duplicata { Surface{34}; } }
 
-// force transfinite grid on interior sphere
-Transfinite Line{29:59} = n;
-Transfinite Surface {34} = {102,103,104,105};
-Transfinite Surface {35} = {106,108,102,103};
-Transfinite Surface {40} = {109,111,108,106};
-Transfinite Surface {45} = {104,105,111,109};
-Transfinite Surface {50} = {104,109,106,103};
-Transfinite Surface {51} = {105,111,108,102};
-Recombine Surface{34,35,40,45,50,51};
-
 // connect sphere and cube
 Line(52) = {102,2};
 Line(53) = {108,7};
@@ -69,7 +46,6 @@ Line(56) = {109,15};
 Line(57) = {104,4};
 Line(58) = {103,3};
 Line(59) = {106,11};
-Transfinite Line{52:59} = n2 Using Progression progr;
 
 Line Loop(60) = {58,-1,-52,-29};Plane Surface(61) = {60};
 Line Loop(62) = {58,18,-59,-39};Plane Surface(63) = {62};
@@ -84,21 +60,6 @@ Line Loop(78) = {58,2,-57,32};Plane Surface(79) = {78};
 Line Loop(80) = {52,-4,-54,-30};Plane Surface(81) = {80};
 Line Loop(82) = {42,53,-8,-55};Plane Surface(83) = {82};
 
-// force transfinite grid on connection surfaces
-Transfinite Surface {61} = {103,102,2,3};
-Transfinite Surface {63} = {106,103,3,11};
-Transfinite Surface {65} = {11,7,108,106};
-Transfinite Surface {67} = {102,108,7,2};
-Transfinite Surface {69} = {4,15,109,104};
-Transfinite Surface {71} = {5,4,104,105};
-Transfinite Surface {73} = {6,5,105,111};
-Transfinite Surface {75} = {15,6,111,109};
-Transfinite Surface {77} = {15,109,106,11};
-Transfinite Surface {79} = {4,104,103,3};
-Transfinite Surface {81} = {105,5,2,102};
-Transfinite Surface {83} = {111,6,7,108};
-Recombine Surface{61:83:2};
-
 // connection volumes
 Surface Loop(84) = {19,61,-63,-65,67,-35}; Volume(85) = {84};
 Surface Loop(86) = {34,61,-79,6,81,-71}; Volume(87) = {86};
@@ -107,13 +68,13 @@ Surface Loop(90) = {28,83,-40,75,-77,65}; Volume(91) = {90};
 Surface Loop(92) = {15,81,-67,-51,-83,73}; Volume(93) = {92};
 Surface Loop(94) = {27,-71,-45,-73,-75,-69}; Volume(95) = {94};
 
-// force transfinite grid on connection volume
-Transfinite Volume{85} = {106,108,102,103,11,7,2,3};
-Transfinite Volume{87} = {104,105,102,103,4,5,2,3};
-Transfinite Volume{89} = {104,109,106,103,4,15,11,3};
-Transfinite Volume{91} = {109,111,108,106,15,6,7,11};
-Transfinite Volume{93} = {111,105,102,108,6,5,2,7};
-Transfinite Volume{95} = {109,104,105,111,15,4,5,6};
+// define transfinite mesh
+Transfinite Line {53, 59, 52, 58, 55, 56, 54, 57} = n Using Progression progr;
+Transfinite Line {42, 44, 30, 32, 36, 41, 29, 31, 9, 1, 8, 4, 11, 3, 10, 2,
+                  18, 22, 14, 13, 39, 49, 37, 47} = n2;
+Transfinite Surface "*";
+Recombine Surface "*";
+Transfinite Volume "*";
 
 Physical Volume(1) = {85:95:2}; // ext volume
 Physical Surface(100) = {34,35,40,45,50,51}; // int surf

benchmarks/3d/sphere_in_sphere_hexa.geo

@@ -39,13 +39,6 @@ s4 = news; Ruled Surface(s4) = {l4};
 s5 = news; Ruled Surface(s5) = {l5};
 s6 = news; Ruled Surface(s6) = {l6};
 Transfinite Line{c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12} = n_patch;
-Transfinite Surface{s1} = {p1,p2,p3,p4};
-Transfinite Surface{s2} = {p5,p6,p7,p8};
-Transfinite Surface{s3} = {p1,p2,p6,p5};
-Transfinite Surface{s4} = {p2,p3,p7,p6};
-Transfinite Surface{s5} = {p3,p4,p8,p7};
-Transfinite Surface{s6} = {p4,p1,p5,p8};
-Recombine Surface{s1,s2,s3,s4,s5,s6};
 Return
 
 p0 = newp; Point(p0) = {0,0,0,lc};

doc/VERSIONS.txt

-$Id: VERSIONS.txt,v 1.27 2008-12-28 15:21:33 geuzaine Exp $
+$Id: VERSIONS.txt,v 1.28 2008-12-28 17:23:39 geuzaine Exp $
 
 2.3.0 (?): restored full-quad recombine algorithm; fixed clipping
 planes when more than 32 views are present ({Geometry,Mesh,View}.Clip
-replaces General.Clip); modified arrow size (View.ArrowSize{Min,Max}
-replaces View.ArrowSize) and Transform options; improved visibility
-browser; major graphics and GUI code refactoring; improved automatic
-transfinite corner selection (now also for volumes); many small
-improvements and small bug fixes.
+replaces General.Clip); modified arrow size and Transform options;
+improved visibility browser; major graphics and GUI code refactoring;
+improved automatic transfinite corner selection (now also for
+volumes); many small improvements and small bug fixes.
 
 2.2.6 (Nov 21, 2008): better transfinite smoothing and automatic
 corner selection; fixed high order meshing crashes on Windows and