diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 5f2cb8bc3e77011cf049f9052b5b996a7df43424..e5885785b9393550a0422acda0ef5a2f3d707350 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -121,7 +121,7 @@
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.304 2007-02-12 08:36:11 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.305 2007-02-13 07:51:47 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -516,27 +516,27 @@ static const short yyrline[] = { 0,
1436, 1474, 1496, 1512, 1532, 1549, 1566, 1586, 1592, 1597,
1602, 1609, 1611, 1612, 1615, 1620, 1624, 1640, 1656, 1672,
1692, 1707, 1713, 1719, 1730, 1740, 1750, 1766, 1784, 1798,
- 1805, 1811, 1820, 1833, 1879, 1894, 1905, 1925, 1935, 1957,
- 1961, 1966, 1971, 1981, 1998, 2014, 2040, 2067, 2099, 2106,
- 2111, 2117, 2121, 2129, 2138, 2146, 2154, 2159, 2167, 2172,
- 2180, 2185, 2195, 2202, 2209, 2216, 2223, 2230, 2237, 2244,
- 2251, 2258, 2263, 2270, 2275, 2282, 2287, 2294, 2299, 2306,
- 2311, 2318, 2323, 2330, 2335, 2342, 2347, 2354, 2359, 2369,
- 2373, 2378, 2388, 2410, 2434, 2442, 2461, 2479, 2497, 2526,
- 2561, 2566, 2593, 2607, 2625, 2632, 2638, 2641, 2649, 2659,
- 2661, 2662, 2663, 2664, 2665, 2666, 2667, 2668, 2675, 2676,
- 2677, 2678, 2679, 2680, 2681, 2682, 2683, 2684, 2685, 2686,
- 2687, 2688, 2689, 2690, 2691, 2692, 2693, 2694, 2695, 2696,
- 2697, 2698, 2699, 2700, 2701, 2702, 2703, 2704, 2705, 2706,
- 2708, 2709, 2710, 2711, 2712, 2713, 2714, 2715, 2716, 2717,
- 2718, 2719, 2720, 2721, 2722, 2723, 2724, 2725, 2726, 2727,
- 2728, 2733, 2738, 2739, 2740, 2741, 2742, 2743, 2747, 2763,
- 2778, 2798, 2812, 2825, 2848, 2866, 2884, 2902, 2920, 2927,
- 2932, 2936, 2940, 2944, 2950, 2955, 2959, 2963, 2969, 2975,
- 2982, 2988, 2992, 2997, 3001, 3012, 3019, 3030, 3050, 3060,
- 3070, 3080, 3097, 3116, 3140, 3168, 3174, 3178, 3182, 3194,
- 3199, 3211, 3218, 3239, 3244, 3258, 3264, 3270, 3275, 3283,
- 3291, 3305, 3319, 3323, 3342, 3364
+ 1805, 1811, 1820, 1833, 1884, 1899, 1910, 1930, 1940, 1962,
+ 1966, 1971, 1976, 1986, 2003, 2019, 2045, 2072, 2104, 2111,
+ 2116, 2122, 2126, 2134, 2143, 2151, 2159, 2164, 2172, 2177,
+ 2185, 2190, 2200, 2207, 2214, 2221, 2228, 2235, 2242, 2249,
+ 2256, 2263, 2268, 2275, 2280, 2287, 2292, 2299, 2304, 2311,
+ 2316, 2323, 2328, 2335, 2340, 2347, 2352, 2359, 2364, 2374,
+ 2378, 2383, 2393, 2415, 2439, 2447, 2466, 2484, 2502, 2531,
+ 2566, 2571, 2598, 2612, 2630, 2637, 2643, 2646, 2654, 2664,
+ 2666, 2667, 2668, 2669, 2670, 2671, 2672, 2673, 2680, 2681,
+ 2682, 2683, 2684, 2685, 2686, 2687, 2688, 2689, 2690, 2691,
+ 2692, 2693, 2694, 2695, 2696, 2697, 2698, 2699, 2700, 2701,
+ 2702, 2703, 2704, 2705, 2706, 2707, 2708, 2709, 2710, 2711,
+ 2713, 2714, 2715, 2716, 2717, 2718, 2719, 2720, 2721, 2722,
+ 2723, 2724, 2725, 2726, 2727, 2728, 2729, 2730, 2731, 2732,
+ 2733, 2738, 2743, 2744, 2745, 2746, 2747, 2748, 2752, 2768,
+ 2783, 2803, 2817, 2830, 2853, 2871, 2889, 2907, 2925, 2932,
+ 2937, 2941, 2945, 2949, 2955, 2960, 2964, 2968, 2974, 2980,
+ 2987, 2993, 2997, 3002, 3006, 3017, 3024, 3035, 3055, 3065,
+ 3075, 3085, 3102, 3121, 3145, 3173, 3179, 3183, 3187, 3199,
+ 3204, 3216, 3223, 3244, 3249, 3263, 3269, 3275, 3280, 3288,
+ 3296, 3310, 3324, 3328, 3347, 3369
};
#endif
@@ -4489,6 +4489,10 @@ case 134:
}
else if(!strcmp(yyvsp[-2].c, "Print")){
#if defined(HAVE_FLTK)
+ // make sure we have the latest data from THEM in GModel
+ // (fixes bug where we would have no geometry in the picture if
+ // the print command is in the same file as the geometry)
+ GMODEL->importTHEM();
char tmpstring[1024];
FixRelativePath(yyvsp[-1].c, tmpstring);
CreateOutputFile(tmpstring, CTX.print.format);
@@ -4496,6 +4500,7 @@ case 134:
}
else if(!strcmp(yyvsp[-2].c, "Save")){
#if defined(HAVE_FLTK)
+ GMODEL->importTHEM();
char tmpstring[1024];
FixRelativePath(yyvsp[-1].c, tmpstring);
CreateOutputFile(tmpstring, CTX.mesh.format);
@@ -4517,7 +4522,7 @@ case 134:
;
break;}
case 135:
-#line 1880 "Gmsh.y"
+#line 1885 "Gmsh.y"
{
if(!strcmp(yyvsp[-6].c, "Save") && !strcmp(yyvsp[-5].c, "View")){
Post_View **vv = (Post_View **)List_Pointer_Test(CTX.post.list, (int)yyvsp[-3].d);
@@ -4534,7 +4539,7 @@ case 135:
;
break;}
case 136:
-#line 1895 "Gmsh.y"
+#line 1900 "Gmsh.y"
{
if(!strcmp(yyvsp[-6].c, "Background") && !strcmp(yyvsp[-5].c, "Mesh") && !strcmp(yyvsp[-4].c, "View")){
Post_View **vv = (Post_View **)List_Pointer_Test(CTX.post.list, (int)yyvsp[-2].d);
@@ -4547,7 +4552,7 @@ case 136:
;
break;}
case 137:
-#line 1906 "Gmsh.y"
+#line 1911 "Gmsh.y"
{
if(!strcmp(yyvsp[-2].c, "Sleep")){
SleepInSeconds(yyvsp[-1].d);
@@ -4569,7 +4574,7 @@ case 137:
;
break;}
case 138:
-#line 1926 "Gmsh.y"
+#line 1931 "Gmsh.y"
{
try {
GMSH_PluginManager::instance()->action(yyvsp[-4].c, yyvsp[-1].c, 0);
@@ -4581,7 +4586,7 @@ case 138:
;
break;}
case 139:
-#line 1936 "Gmsh.y"
+#line 1941 "Gmsh.y"
{
if(!strcmp(yyvsp[-1].c, "ElementsFromAllViews"))
CombineViews(0, 1, CTX.post.combine_remove_orig);
@@ -4605,27 +4610,27 @@ case 139:
;
break;}
case 140:
-#line 1958 "Gmsh.y"
+#line 1963 "Gmsh.y"
{
exit(0);
;
break;}
case 141:
-#line 1962 "Gmsh.y"
+#line 1967 "Gmsh.y"
{
CTX.forced_bbox = 0;
SetBoundingBox();
;
break;}
case 142:
-#line 1967 "Gmsh.y"
+#line 1972 "Gmsh.y"
{
CTX.forced_bbox = 1;
SetBoundingBox(yyvsp[-12].d, yyvsp[-10].d, yyvsp[-8].d, yyvsp[-6].d, yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 143:
-#line 1972 "Gmsh.y"
+#line 1977 "Gmsh.y"
{
#if defined(HAVE_FLTK)
Draw();
@@ -4633,7 +4638,7 @@ case 143:
;
break;}
case 144:
-#line 1984 "Gmsh.y"
+#line 1989 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = yyvsp[-3].d;
LoopControlVariablesTab[ImbricatedLoop][1] = yyvsp[-1].d;
@@ -4650,7 +4655,7 @@ case 144:
;
break;}
case 145:
-#line 1999 "Gmsh.y"
+#line 2004 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = yyvsp[-5].d;
LoopControlVariablesTab[ImbricatedLoop][1] = yyvsp[-3].d;
@@ -4668,7 +4673,7 @@ case 145:
;
break;}
case 146:
-#line 2015 "Gmsh.y"
+#line 2020 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = yyvsp[-3].d;
LoopControlVariablesTab[ImbricatedLoop][1] = yyvsp[-1].d;
@@ -4696,7 +4701,7 @@ case 146:
;
break;}
case 147:
-#line 2041 "Gmsh.y"
+#line 2046 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = yyvsp[-5].d;
LoopControlVariablesTab[ImbricatedLoop][1] = yyvsp[-3].d;
@@ -4725,7 +4730,7 @@ case 147:
;
break;}
case 148:
-#line 2068 "Gmsh.y"
+#line 2073 "Gmsh.y"
{
if(ImbricatedLoop <= 0){
yymsg(GERROR, "Invalid For/EndFor loop");
@@ -4759,7 +4764,7 @@ case 148:
;
break;}
case 149:
-#line 2100 "Gmsh.y"
+#line 2105 "Gmsh.y"
{
if(!FunctionManager::Instance()->createFunction(yyvsp[0].c, yyin, yyname, yylineno))
yymsg(GERROR, "Redefinition of function %s", yyvsp[0].c);
@@ -4768,14 +4773,14 @@ case 149:
;
break;}
case 150:
-#line 2107 "Gmsh.y"
+#line 2112 "Gmsh.y"
{
if(!FunctionManager::Instance()->leaveFunction(&yyin, yyname, yylineno))
yymsg(GERROR, "Error while exiting function");
;
break;}
case 151:
-#line 2112 "Gmsh.y"
+#line 2117 "Gmsh.y"
{
if(!FunctionManager::Instance()->enterFunction(yyvsp[-1].c, &yyin, yyname, yylineno))
yymsg(GERROR, "Unknown function %s", yyvsp[-1].c);
@@ -4783,18 +4788,18 @@ case 151:
;
break;}
case 152:
-#line 2118 "Gmsh.y"
+#line 2123 "Gmsh.y"
{
if(!yyvsp[-1].d) skip_until("If", "EndIf");
;
break;}
case 153:
-#line 2122 "Gmsh.y"
+#line 2127 "Gmsh.y"
{
;
break;}
case 154:
-#line 2131 "Gmsh.y"
+#line 2136 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE, yyvsp[-1].l,
@@ -4804,7 +4809,7 @@ case 154:
;
break;}
case 155:
-#line 2139 "Gmsh.y"
+#line 2144 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(ROTATE, yyvsp[-1].l,
@@ -4814,7 +4819,7 @@ case 155:
;
break;}
case 156:
-#line 2147 "Gmsh.y"
+#line 2152 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE_ROTATE, yyvsp[-1].l,
@@ -4824,14 +4829,14 @@ case 156:
;
break;}
case 157:
-#line 2155 "Gmsh.y"
+#line 2160 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 158:
-#line 2160 "Gmsh.y"
+#line 2165 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE, yyvsp[-3].l,
@@ -4841,14 +4846,14 @@ case 158:
;
break;}
case 159:
-#line 2168 "Gmsh.y"
+#line 2173 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 160:
-#line 2173 "Gmsh.y"
+#line 2178 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(ROTATE, yyvsp[-3].l,
@@ -4858,14 +4863,14 @@ case 160:
;
break;}
case 161:
-#line 2181 "Gmsh.y"
+#line 2186 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 162:
-#line 2186 "Gmsh.y"
+#line 2191 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE_ROTATE, yyvsp[-3].l,
@@ -4875,7 +4880,7 @@ case 162:
;
break;}
case 163:
-#line 2196 "Gmsh.y"
+#line 2201 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_POINT, (int)yyvsp[-4].d,
@@ -4884,7 +4889,7 @@ case 163:
;
break;}
case 164:
-#line 2203 "Gmsh.y"
+#line 2208 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)yyvsp[-4].d,
@@ -4893,7 +4898,7 @@ case 164:
;
break;}
case 165:
-#line 2210 "Gmsh.y"
+#line 2215 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)yyvsp[-4].d,
@@ -4902,7 +4907,7 @@ case 165:
;
break;}
case 166:
-#line 2217 "Gmsh.y"
+#line 2222 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_POINT, (int)yyvsp[-8].d,
@@ -4911,7 +4916,7 @@ case 166:
;
break;}
case 167:
-#line 2224 "Gmsh.y"
+#line 2229 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)yyvsp[-8].d,
@@ -4920,7 +4925,7 @@ case 167:
;
break;}
case 168:
-#line 2231 "Gmsh.y"
+#line 2236 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)yyvsp[-8].d,
@@ -4929,7 +4934,7 @@ case 168:
;
break;}
case 169:
-#line 2238 "Gmsh.y"
+#line 2243 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)yyvsp[-10].d,
@@ -4938,7 +4943,7 @@ case 169:
;
break;}
case 170:
-#line 2245 "Gmsh.y"
+#line 2250 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)yyvsp[-10].d,
@@ -4947,7 +4952,7 @@ case 170:
;
break;}
case 171:
-#line 2252 "Gmsh.y"
+#line 2257 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)yyvsp[-10].d,
@@ -4956,14 +4961,14 @@ case 171:
;
break;}
case 172:
-#line 2259 "Gmsh.y"
+#line 2264 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 173:
-#line 2264 "Gmsh.y"
+#line 2269 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_POINT, (int)yyvsp[-8].d,
@@ -4972,14 +4977,14 @@ case 173:
;
break;}
case 174:
-#line 2271 "Gmsh.y"
+#line 2276 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 175:
-#line 2276 "Gmsh.y"
+#line 2281 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)yyvsp[-8].d,
@@ -4988,14 +4993,14 @@ case 175:
;
break;}
case 176:
-#line 2283 "Gmsh.y"
+#line 2288 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 177:
-#line 2288 "Gmsh.y"
+#line 2293 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)yyvsp[-8].d,
@@ -5004,14 +5009,14 @@ case 177:
;
break;}
case 178:
-#line 2295 "Gmsh.y"
+#line 2300 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 179:
-#line 2300 "Gmsh.y"
+#line 2305 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_POINT, (int)yyvsp[-12].d,
@@ -5020,14 +5025,14 @@ case 179:
;
break;}
case 180:
-#line 2307 "Gmsh.y"
+#line 2312 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 181:
-#line 2312 "Gmsh.y"
+#line 2317 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)yyvsp[-12].d,
@@ -5036,14 +5041,14 @@ case 181:
;
break;}
case 182:
-#line 2319 "Gmsh.y"
+#line 2324 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 183:
-#line 2324 "Gmsh.y"
+#line 2329 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)yyvsp[-12].d,
@@ -5052,14 +5057,14 @@ case 183:
;
break;}
case 184:
-#line 2331 "Gmsh.y"
+#line 2336 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 185:
-#line 2336 "Gmsh.y"
+#line 2341 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)yyvsp[-14].d,
@@ -5068,14 +5073,14 @@ case 185:
;
break;}
case 186:
-#line 2343 "Gmsh.y"
+#line 2348 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 187:
-#line 2348 "Gmsh.y"
+#line 2353 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)yyvsp[-14].d,
@@ -5084,14 +5089,14 @@ case 187:
;
break;}
case 188:
-#line 2355 "Gmsh.y"
+#line 2360 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 189:
-#line 2360 "Gmsh.y"
+#line 2365 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)yyvsp[-14].d,
@@ -5100,17 +5105,17 @@ case 189:
;
break;}
case 190:
-#line 2371 "Gmsh.y"
+#line 2376 "Gmsh.y"
{
;
break;}
case 191:
-#line 2374 "Gmsh.y"
+#line 2379 "Gmsh.y"
{
;
break;}
case 192:
-#line 2380 "Gmsh.y"
+#line 2385 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = true;
extr.mesh.NbLayer = 1;
@@ -5121,7 +5126,7 @@ case 192:
;
break;}
case 193:
-#line 2389 "Gmsh.y"
+#line 2394 "Gmsh.y"
{
double d;
extr.mesh.ExtrudeMesh = true;
@@ -5145,7 +5150,7 @@ case 193:
;
break;}
case 194:
-#line 2411 "Gmsh.y"
+#line 2416 "Gmsh.y"
{
yymsg(WARNING, "Explicit region numbers in layers are deprecated");
double d;
@@ -5171,13 +5176,13 @@ case 194:
;
break;}
case 195:
-#line 2435 "Gmsh.y"
+#line 2440 "Gmsh.y"
{
extr.mesh.Recombine = true;
;
break;}
case 196:
-#line 2444 "Gmsh.y"
+#line 2449 "Gmsh.y"
{
for(int i = 0; i < List_Nbr(yyvsp[-3].l); i++){
double d;
@@ -5197,7 +5202,7 @@ case 196:
;
break;}
case 197:
-#line 2462 "Gmsh.y"
+#line 2467 "Gmsh.y"
{
for(int i = 0; i < List_Nbr(yyvsp[-6].l); i++){
double d;
@@ -5217,7 +5222,7 @@ case 197:
;
break;}
case 198:
-#line 2480 "Gmsh.y"
+#line 2485 "Gmsh.y"
{
for(int i = 0; i < List_Nbr(yyvsp[-6].l); i++){
double d;
@@ -5237,7 +5242,7 @@ case 198:
;
break;}
case 199:
-#line 2498 "Gmsh.y"
+#line 2503 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-4].d);
if(!s)
@@ -5268,7 +5273,7 @@ case 199:
;
break;}
case 200:
-#line 2527 "Gmsh.y"
+#line 2532 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-5].d);
if(!s)
@@ -5305,14 +5310,14 @@ case 200:
;
break;}
case 201:
-#line 2562 "Gmsh.y"
+#line 2567 "Gmsh.y"
{
yymsg(WARNING, "Elliptic Surface is deprecated: use Transfinite instead (with smoothing)");
List_Delete(yyvsp[-1].l);
;
break;}
case 202:
-#line 2567 "Gmsh.y"
+#line 2572 "Gmsh.y"
{
Volume *v = FindVolume((int)yyvsp[-4].d);
if(!v)
@@ -5341,7 +5346,7 @@ case 202:
;
break;}
case 203:
-#line 2594 "Gmsh.y"
+#line 2599 "Gmsh.y"
{
for(int i = 0; i < List_Nbr(yyvsp[-3].l); i++){
double d;
@@ -5357,7 +5362,7 @@ case 203:
;
break;}
case 204:
-#line 2608 "Gmsh.y"
+#line 2613 "Gmsh.y"
{
for(int i = 0; i < List_Nbr(yyvsp[-1].l); i++){
double d;
@@ -5372,7 +5377,7 @@ case 204:
;
break;}
case 205:
-#line 2627 "Gmsh.y"
+#line 2632 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-2].d);
if(s)
@@ -5380,7 +5385,7 @@ case 205:
;
break;}
case 206:
-#line 2633 "Gmsh.y"
+#line 2638 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-2].d);
if(s)
@@ -5388,55 +5393,55 @@ case 206:
;
break;}
case 207:
-#line 2639 "Gmsh.y"
+#line 2644 "Gmsh.y"
{
;
break;}
case 208:
-#line 2642 "Gmsh.y"
+#line 2647 "Gmsh.y"
{
;
break;}
case 209:
-#line 2651 "Gmsh.y"
+#line 2656 "Gmsh.y"
{
ReplaceAllDuplicates();
;
break;}
case 210:
-#line 2660 "Gmsh.y"
+#line 2665 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 211:
-#line 2661 "Gmsh.y"
+#line 2666 "Gmsh.y"
{ yyval.d = yyvsp[-1].d; ;
break;}
case 212:
-#line 2662 "Gmsh.y"
+#line 2667 "Gmsh.y"
{ yyval.d = -yyvsp[0].d; ;
break;}
case 213:
-#line 2663 "Gmsh.y"
+#line 2668 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 214:
-#line 2664 "Gmsh.y"
+#line 2669 "Gmsh.y"
{ yyval.d = !yyvsp[0].d; ;
break;}
case 215:
-#line 2665 "Gmsh.y"
+#line 2670 "Gmsh.y"
{ yyval.d = yyvsp[-2].d - yyvsp[0].d; ;
break;}
case 216:
-#line 2666 "Gmsh.y"
+#line 2671 "Gmsh.y"
{ yyval.d = yyvsp[-2].d + yyvsp[0].d; ;
break;}
case 217:
-#line 2667 "Gmsh.y"
+#line 2672 "Gmsh.y"
{ yyval.d = yyvsp[-2].d * yyvsp[0].d; ;
break;}
case 218:
-#line 2669 "Gmsh.y"
+#line 2674 "Gmsh.y"
{
if(!yyvsp[0].d)
yymsg(GERROR, "Division by zero in '%g / %g'", yyvsp[-2].d, yyvsp[0].d);
@@ -5445,247 +5450,247 @@ case 218:
;
break;}
case 219:
-#line 2675 "Gmsh.y"
+#line 2680 "Gmsh.y"
{ yyval.d = (int)yyvsp[-2].d % (int)yyvsp[0].d; ;
break;}
case 220:
-#line 2676 "Gmsh.y"
+#line 2681 "Gmsh.y"
{ yyval.d = pow(yyvsp[-2].d, yyvsp[0].d); ;
break;}
case 221:
-#line 2677 "Gmsh.y"
+#line 2682 "Gmsh.y"
{ yyval.d = yyvsp[-2].d < yyvsp[0].d; ;
break;}
case 222:
-#line 2678 "Gmsh.y"
+#line 2683 "Gmsh.y"
{ yyval.d = yyvsp[-2].d > yyvsp[0].d; ;
break;}
case 223:
-#line 2679 "Gmsh.y"
+#line 2684 "Gmsh.y"
{ yyval.d = yyvsp[-2].d <= yyvsp[0].d; ;
break;}
case 224:
-#line 2680 "Gmsh.y"
+#line 2685 "Gmsh.y"
{ yyval.d = yyvsp[-2].d >= yyvsp[0].d; ;
break;}
case 225:
-#line 2681 "Gmsh.y"
+#line 2686 "Gmsh.y"
{ yyval.d = yyvsp[-2].d == yyvsp[0].d; ;
break;}
case 226:
-#line 2682 "Gmsh.y"
+#line 2687 "Gmsh.y"
{ yyval.d = yyvsp[-2].d != yyvsp[0].d; ;
break;}
case 227:
-#line 2683 "Gmsh.y"
+#line 2688 "Gmsh.y"
{ yyval.d = yyvsp[-2].d && yyvsp[0].d; ;
break;}
case 228:
-#line 2684 "Gmsh.y"
+#line 2689 "Gmsh.y"
{ yyval.d = yyvsp[-2].d || yyvsp[0].d; ;
break;}
case 229:
-#line 2685 "Gmsh.y"
+#line 2690 "Gmsh.y"
{ yyval.d = yyvsp[-4].d? yyvsp[-2].d : yyvsp[0].d; ;
break;}
case 230:
-#line 2686 "Gmsh.y"
+#line 2691 "Gmsh.y"
{ yyval.d = exp(yyvsp[-1].d); ;
break;}
case 231:
-#line 2687 "Gmsh.y"
+#line 2692 "Gmsh.y"
{ yyval.d = log(yyvsp[-1].d); ;
break;}
case 232:
-#line 2688 "Gmsh.y"
+#line 2693 "Gmsh.y"
{ yyval.d = log10(yyvsp[-1].d); ;
break;}
case 233:
-#line 2689 "Gmsh.y"
+#line 2694 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-1].d); ;
break;}
case 234:
-#line 2690 "Gmsh.y"
+#line 2695 "Gmsh.y"
{ yyval.d = sin(yyvsp[-1].d); ;
break;}
case 235:
-#line 2691 "Gmsh.y"
+#line 2696 "Gmsh.y"
{ yyval.d = asin(yyvsp[-1].d); ;
break;}
case 236:
-#line 2692 "Gmsh.y"
+#line 2697 "Gmsh.y"
{ yyval.d = cos(yyvsp[-1].d); ;
break;}
case 237:
-#line 2693 "Gmsh.y"
+#line 2698 "Gmsh.y"
{ yyval.d = acos(yyvsp[-1].d); ;
break;}
case 238:
-#line 2694 "Gmsh.y"
+#line 2699 "Gmsh.y"
{ yyval.d = tan(yyvsp[-1].d); ;
break;}
case 239:
-#line 2695 "Gmsh.y"
+#line 2700 "Gmsh.y"
{ yyval.d = atan(yyvsp[-1].d); ;
break;}
case 240:
-#line 2696 "Gmsh.y"
+#line 2701 "Gmsh.y"
{ yyval.d = atan2(yyvsp[-3].d, yyvsp[-1].d);;
break;}
case 241:
-#line 2697 "Gmsh.y"
+#line 2702 "Gmsh.y"
{ yyval.d = sinh(yyvsp[-1].d); ;
break;}
case 242:
-#line 2698 "Gmsh.y"
+#line 2703 "Gmsh.y"
{ yyval.d = cosh(yyvsp[-1].d); ;
break;}
case 243:
-#line 2699 "Gmsh.y"
+#line 2704 "Gmsh.y"
{ yyval.d = tanh(yyvsp[-1].d); ;
break;}
case 244:
-#line 2700 "Gmsh.y"
+#line 2705 "Gmsh.y"
{ yyval.d = fabs(yyvsp[-1].d); ;
break;}
case 245:
-#line 2701 "Gmsh.y"
+#line 2706 "Gmsh.y"
{ yyval.d = floor(yyvsp[-1].d); ;
break;}
case 246:
-#line 2702 "Gmsh.y"
+#line 2707 "Gmsh.y"
{ yyval.d = ceil(yyvsp[-1].d); ;
break;}
case 247:
-#line 2703 "Gmsh.y"
+#line 2708 "Gmsh.y"
{ yyval.d = fmod(yyvsp[-3].d, yyvsp[-1].d); ;
break;}
case 248:
-#line 2704 "Gmsh.y"
+#line 2709 "Gmsh.y"
{ yyval.d = fmod(yyvsp[-3].d, yyvsp[-1].d); ;
break;}
case 249:
-#line 2705 "Gmsh.y"
+#line 2710 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ;
break;}
case 250:
-#line 2706 "Gmsh.y"
+#line 2711 "Gmsh.y"
{ yyval.d = yyvsp[-1].d*(double)rand()/(double)RAND_MAX; ;
break;}
case 251:
-#line 2708 "Gmsh.y"
+#line 2713 "Gmsh.y"
{ yyval.d = exp(yyvsp[-1].d); ;
break;}
case 252:
-#line 2709 "Gmsh.y"
+#line 2714 "Gmsh.y"
{ yyval.d = log(yyvsp[-1].d); ;
break;}
case 253:
-#line 2710 "Gmsh.y"
+#line 2715 "Gmsh.y"
{ yyval.d = log10(yyvsp[-1].d); ;
break;}
case 254:
-#line 2711 "Gmsh.y"
+#line 2716 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-1].d); ;
break;}
case 255:
-#line 2712 "Gmsh.y"
+#line 2717 "Gmsh.y"
{ yyval.d = sin(yyvsp[-1].d); ;
break;}
case 256:
-#line 2713 "Gmsh.y"
+#line 2718 "Gmsh.y"
{ yyval.d = asin(yyvsp[-1].d); ;
break;}
case 257:
-#line 2714 "Gmsh.y"
+#line 2719 "Gmsh.y"
{ yyval.d = cos(yyvsp[-1].d); ;
break;}
case 258:
-#line 2715 "Gmsh.y"
+#line 2720 "Gmsh.y"
{ yyval.d = acos(yyvsp[-1].d); ;
break;}
case 259:
-#line 2716 "Gmsh.y"
+#line 2721 "Gmsh.y"
{ yyval.d = tan(yyvsp[-1].d); ;
break;}
case 260:
-#line 2717 "Gmsh.y"
+#line 2722 "Gmsh.y"
{ yyval.d = atan(yyvsp[-1].d); ;
break;}
case 261:
-#line 2718 "Gmsh.y"
+#line 2723 "Gmsh.y"
{ yyval.d = atan2(yyvsp[-3].d, yyvsp[-1].d);;
break;}
case 262:
-#line 2719 "Gmsh.y"
+#line 2724 "Gmsh.y"
{ yyval.d = sinh(yyvsp[-1].d); ;
break;}
case 263:
-#line 2720 "Gmsh.y"
+#line 2725 "Gmsh.y"
{ yyval.d = cosh(yyvsp[-1].d); ;
break;}
case 264:
-#line 2721 "Gmsh.y"
+#line 2726 "Gmsh.y"
{ yyval.d = tanh(yyvsp[-1].d); ;
break;}
case 265:
-#line 2722 "Gmsh.y"
+#line 2727 "Gmsh.y"
{ yyval.d = fabs(yyvsp[-1].d); ;
break;}
case 266:
-#line 2723 "Gmsh.y"
+#line 2728 "Gmsh.y"
{ yyval.d = floor(yyvsp[-1].d); ;
break;}
case 267:
-#line 2724 "Gmsh.y"
+#line 2729 "Gmsh.y"
{ yyval.d = ceil(yyvsp[-1].d); ;
break;}
case 268:
-#line 2725 "Gmsh.y"
+#line 2730 "Gmsh.y"
{ yyval.d = fmod(yyvsp[-3].d, yyvsp[-1].d); ;
break;}
case 269:
-#line 2726 "Gmsh.y"
+#line 2731 "Gmsh.y"
{ yyval.d = fmod(yyvsp[-3].d, yyvsp[-1].d); ;
break;}
case 270:
-#line 2727 "Gmsh.y"
+#line 2732 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ;
break;}
case 271:
-#line 2728 "Gmsh.y"
+#line 2733 "Gmsh.y"
{ yyval.d = yyvsp[-1].d*(double)rand()/(double)RAND_MAX; ;
break;}
case 272:
-#line 2737 "Gmsh.y"
+#line 2742 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 273:
-#line 2738 "Gmsh.y"
+#line 2743 "Gmsh.y"
{ yyval.d = 3.141592653589793; ;
break;}
case 274:
-#line 2739 "Gmsh.y"
+#line 2744 "Gmsh.y"
{ yyval.d = ParUtil::Instance()->rank(); ;
break;}
case 275:
-#line 2740 "Gmsh.y"
+#line 2745 "Gmsh.y"
{ yyval.d = ParUtil::Instance()->size(); ;
break;}
case 276:
-#line 2741 "Gmsh.y"
+#line 2746 "Gmsh.y"
{ yyval.d = Get_GmshMajorVersion(); ;
break;}
case 277:
-#line 2742 "Gmsh.y"
+#line 2747 "Gmsh.y"
{ yyval.d = Get_GmshMinorVersion(); ;
break;}
case 278:
-#line 2743 "Gmsh.y"
+#line 2748 "Gmsh.y"
{ yyval.d = Get_GmshPatchVersion(); ;
break;}
case 279:
-#line 2748 "Gmsh.y"
+#line 2753 "Gmsh.y"
{
Symbol TheSymbol;
TheSymbol.Name = yyvsp[0].c;
@@ -5700,7 +5705,7 @@ case 279:
;
break;}
case 280:
-#line 2764 "Gmsh.y"
+#line 2769 "Gmsh.y"
{
char tmpstring[1024];
sprintf(tmpstring, "%s_%d", yyvsp[-4].c, (int)yyvsp[-1].d) ;
@@ -5717,7 +5722,7 @@ case 280:
;
break;}
case 281:
-#line 2779 "Gmsh.y"
+#line 2784 "Gmsh.y"
{
Symbol TheSymbol;
TheSymbol.Name = yyvsp[-3].c;
@@ -5739,7 +5744,7 @@ case 281:
;
break;}
case 282:
-#line 2799 "Gmsh.y"
+#line 2804 "Gmsh.y"
{
Symbol TheSymbol;
TheSymbol.Name = yyvsp[-2].c;
@@ -5755,7 +5760,7 @@ case 282:
;
break;}
case 283:
-#line 2813 "Gmsh.y"
+#line 2818 "Gmsh.y"
{
Symbol TheSymbol;
TheSymbol.Name = yyvsp[-1].c;
@@ -5770,7 +5775,7 @@ case 283:
;
break;}
case 284:
-#line 2826 "Gmsh.y"
+#line 2831 "Gmsh.y"
{
Symbol TheSymbol;
TheSymbol.Name = yyvsp[-4].c;
@@ -5792,7 +5797,7 @@ case 284:
;
break;}
case 285:
-#line 2849 "Gmsh.y"
+#line 2854 "Gmsh.y"
{
double (*pNumOpt)(int num, int action, double value);
StringXNumber *pNumCat;
@@ -5812,7 +5817,7 @@ case 285:
;
break;}
case 286:
-#line 2867 "Gmsh.y"
+#line 2872 "Gmsh.y"
{
double (*pNumOpt)(int num, int action, double value);
StringXNumber *pNumCat;
@@ -5832,7 +5837,7 @@ case 286:
;
break;}
case 287:
-#line 2885 "Gmsh.y"
+#line 2890 "Gmsh.y"
{
double (*pNumOpt)(int num, int action, double value);
StringXNumber *pNumCat;
@@ -5852,7 +5857,7 @@ case 287:
;
break;}
case 288:
-#line 2903 "Gmsh.y"
+#line 2908 "Gmsh.y"
{
double (*pNumOpt)(int num, int action, double value);
StringXNumber *pNumCat;
@@ -5872,107 +5877,107 @@ case 288:
;
break;}
case 289:
-#line 2921 "Gmsh.y"
+#line 2926 "Gmsh.y"
{
yyval.d = GetValue(yyvsp[-3].c, yyvsp[-1].d);
Free(yyvsp[-3].c);
;
break;}
case 290:
-#line 2929 "Gmsh.y"
+#line 2934 "Gmsh.y"
{
memcpy(yyval.v, yyvsp[0].v, 5*sizeof(double));
;
break;}
case 291:
-#line 2933 "Gmsh.y"
+#line 2938 "Gmsh.y"
{
for(int i = 0; i < 5; i++) yyval.v[i] = -yyvsp[0].v[i];
;
break;}
case 292:
-#line 2937 "Gmsh.y"
+#line 2942 "Gmsh.y"
{
for(int i = 0; i < 5; i++) yyval.v[i] = yyvsp[0].v[i];
;
break;}
case 293:
-#line 2941 "Gmsh.y"
+#line 2946 "Gmsh.y"
{
for(int i = 0; i < 5; i++) yyval.v[i] = yyvsp[-2].v[i] - yyvsp[0].v[i];
;
break;}
case 294:
-#line 2945 "Gmsh.y"
+#line 2950 "Gmsh.y"
{
for(int i = 0; i < 5; i++) yyval.v[i] = yyvsp[-2].v[i] + yyvsp[0].v[i];
;
break;}
case 295:
-#line 2952 "Gmsh.y"
+#line 2957 "Gmsh.y"
{
yyval.v[0] = yyvsp[-9].d; yyval.v[1] = yyvsp[-7].d; yyval.v[2] = yyvsp[-5].d; yyval.v[3] = yyvsp[-3].d; yyval.v[4] = yyvsp[-1].d;
;
break;}
case 296:
-#line 2956 "Gmsh.y"
+#line 2961 "Gmsh.y"
{
yyval.v[0] = yyvsp[-7].d; yyval.v[1] = yyvsp[-5].d; yyval.v[2] = yyvsp[-3].d; yyval.v[3] = yyvsp[-1].d; yyval.v[4] = 1.0;
;
break;}
case 297:
-#line 2960 "Gmsh.y"
+#line 2965 "Gmsh.y"
{
yyval.v[0] = yyvsp[-5].d; yyval.v[1] = yyvsp[-3].d; yyval.v[2] = yyvsp[-1].d; yyval.v[3] = 0.0; yyval.v[4] = 1.0;
;
break;}
case 298:
-#line 2964 "Gmsh.y"
+#line 2969 "Gmsh.y"
{
yyval.v[0] = yyvsp[-5].d; yyval.v[1] = yyvsp[-3].d; yyval.v[2] = yyvsp[-1].d; yyval.v[3] = 0.0; yyval.v[4] = 1.0;
;
break;}
case 299:
-#line 2971 "Gmsh.y"
+#line 2976 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(List_T*));
List_Add(yyval.l, &(yyvsp[0].l));
;
break;}
case 300:
-#line 2976 "Gmsh.y"
+#line 2981 "Gmsh.y"
{
List_Add(yyval.l, &(yyvsp[0].l));
;
break;}
case 301:
-#line 2984 "Gmsh.y"
+#line 2989 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(double));
List_Add(yyval.l, &(yyvsp[0].d));
;
break;}
case 302:
-#line 2989 "Gmsh.y"
+#line 2994 "Gmsh.y"
{
yyval.l = yyvsp[0].l;
;
break;}
case 303:
-#line 2993 "Gmsh.y"
+#line 2998 "Gmsh.y"
{
// creates an empty list
yyval.l = List_Create(2, 1, sizeof(double));
;
break;}
case 304:
-#line 2998 "Gmsh.y"
+#line 3003 "Gmsh.y"
{
yyval.l = yyvsp[-1].l;
;
break;}
case 305:
-#line 3002 "Gmsh.y"
+#line 3007 "Gmsh.y"
{
yyval.l = yyvsp[-1].l;
double *pd;
@@ -5983,7 +5988,7 @@ case 305:
;
break;}
case 306:
-#line 3014 "Gmsh.y"
+#line 3019 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(double));
for(double d = yyvsp[-2].d; (yyvsp[-2].d < yyvsp[0].d) ? (d <= yyvsp[0].d) : (d >= yyvsp[0].d); (yyvsp[-2].d < yyvsp[0].d) ? (d += 1.) : (d -= 1.))
@@ -5991,7 +5996,7 @@ case 306:
;
break;}
case 307:
-#line 3020 "Gmsh.y"
+#line 3025 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(double));
if(!yyvsp[0].d || (yyvsp[-4].d < yyvsp[-2].d && yyvsp[0].d < 0) || (yyvsp[-4].d > yyvsp[-2].d && yyvsp[0].d > 0)){
@@ -6004,7 +6009,7 @@ case 307:
;
break;}
case 308:
-#line 3031 "Gmsh.y"
+#line 3036 "Gmsh.y"
{
// Returns the coordinates of a point and fills a list with it.
// This allows to ensure e.g. that relative point positions are
@@ -6026,7 +6031,7 @@ case 308:
;
break;}
case 309:
-#line 3051 "Gmsh.y"
+#line 3056 "Gmsh.y"
{
yyval.l = List_Create(List_Nbr(yyvsp[0].l), 1, sizeof(double));
for(int i = 0; i < List_Nbr(yyvsp[0].l); i++){
@@ -6038,7 +6043,7 @@ case 309:
;
break;}
case 310:
-#line 3061 "Gmsh.y"
+#line 3066 "Gmsh.y"
{
yyval.l = List_Create(List_Nbr(yyvsp[0].l), 1, sizeof(double));
for(int i = 0; i < List_Nbr(yyvsp[0].l); i++){
@@ -6050,7 +6055,7 @@ case 310:
;
break;}
case 311:
-#line 3071 "Gmsh.y"
+#line 3076 "Gmsh.y"
{
yyval.l = List_Create(List_Nbr(yyvsp[0].l), 1, sizeof(double));
for(int i = 0; i < List_Nbr(yyvsp[0].l); i++){
@@ -6062,7 +6067,7 @@ case 311:
;
break;}
case 312:
-#line 3081 "Gmsh.y"
+#line 3086 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(double));
Symbol TheSymbol;
@@ -6081,7 +6086,7 @@ case 312:
;
break;}
case 313:
-#line 3098 "Gmsh.y"
+#line 3103 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(double));
Symbol TheSymbol;
@@ -6102,7 +6107,7 @@ case 313:
;
break;}
case 314:
-#line 3117 "Gmsh.y"
+#line 3122 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(double));
Symbol TheSymbol;
@@ -6128,7 +6133,7 @@ case 314:
;
break;}
case 315:
-#line 3141 "Gmsh.y"
+#line 3146 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(double));
Symbol TheSymbol;
@@ -6156,26 +6161,26 @@ case 315:
;
break;}
case 316:
-#line 3170 "Gmsh.y"
+#line 3175 "Gmsh.y"
{
yyval.l = List_Create(2, 1, sizeof(double));
List_Add(yyval.l, &(yyvsp[0].d));
;
break;}
case 317:
-#line 3175 "Gmsh.y"
+#line 3180 "Gmsh.y"
{
yyval.l = yyvsp[0].l;
;
break;}
case 318:
-#line 3179 "Gmsh.y"
+#line 3184 "Gmsh.y"
{
List_Add(yyval.l, &(yyvsp[0].d));
;
break;}
case 319:
-#line 3183 "Gmsh.y"
+#line 3188 "Gmsh.y"
{
for(int i = 0; i < List_Nbr(yyvsp[0].l); i++){
double d;
@@ -6186,19 +6191,19 @@ case 319:
;
break;}
case 320:
-#line 3196 "Gmsh.y"
+#line 3201 "Gmsh.y"
{
yyval.u = CTX.PACK_COLOR((int)yyvsp[-7].d, (int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d);
;
break;}
case 321:
-#line 3200 "Gmsh.y"
+#line 3205 "Gmsh.y"
{
yyval.u = CTX.PACK_COLOR((int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d, 255);
;
break;}
case 322:
-#line 3212 "Gmsh.y"
+#line 3217 "Gmsh.y"
{
int flag;
yyval.u = Get_ColorForString(ColorString, -1, yyvsp[0].c, &flag);
@@ -6207,7 +6212,7 @@ case 322:
;
break;}
case 323:
-#line 3219 "Gmsh.y"
+#line 3224 "Gmsh.y"
{
unsigned int (*pColOpt)(int num, int action, unsigned int value);
StringXColor *pColCat;
@@ -6228,13 +6233,13 @@ case 323:
;
break;}
case 324:
-#line 3241 "Gmsh.y"
+#line 3246 "Gmsh.y"
{
yyval.l = yyvsp[-1].l;
;
break;}
case 325:
-#line 3245 "Gmsh.y"
+#line 3250 "Gmsh.y"
{
yyval.l = List_Create(256, 10, sizeof(unsigned int));
GmshColorTable *ct = Get_ColorTable((int)yyvsp[-3].d);
@@ -6248,26 +6253,26 @@ case 325:
;
break;}
case 326:
-#line 3260 "Gmsh.y"
+#line 3265 "Gmsh.y"
{
yyval.l = List_Create(256, 10, sizeof(unsigned int));
List_Add(yyval.l, &(yyvsp[0].u));
;
break;}
case 327:
-#line 3265 "Gmsh.y"
+#line 3270 "Gmsh.y"
{
List_Add(yyval.l, &(yyvsp[0].u));
;
break;}
case 328:
-#line 3272 "Gmsh.y"
+#line 3277 "Gmsh.y"
{
yyval.c = yyvsp[0].c;
;
break;}
case 329:
-#line 3276 "Gmsh.y"
+#line 3281 "Gmsh.y"
{
yyval.c = (char *)Malloc(32*sizeof(char));
time_t now;
@@ -6277,7 +6282,7 @@ case 329:
;
break;}
case 330:
-#line 3284 "Gmsh.y"
+#line 3289 "Gmsh.y"
{
yyval.c = (char *)Malloc((strlen(yyvsp[-3].c)+strlen(yyvsp[-1].c)+1)*sizeof(char));
strcpy(yyval.c, yyvsp[-3].c);
@@ -6287,7 +6292,7 @@ case 330:
;
break;}
case 331:
-#line 3292 "Gmsh.y"
+#line 3297 "Gmsh.y"
{
yyval.c = (char *)Malloc((strlen(yyvsp[-1].c)+1)*sizeof(char));
int i;
@@ -6303,7 +6308,7 @@ case 331:
;
break;}
case 332:
-#line 3306 "Gmsh.y"
+#line 3311 "Gmsh.y"
{
yyval.c = (char *)Malloc((strlen(yyvsp[-1].c)+1)*sizeof(char));
int i;
@@ -6319,13 +6324,13 @@ case 332:
;
break;}
case 333:
-#line 3320 "Gmsh.y"
+#line 3325 "Gmsh.y"
{
yyval.c = yyvsp[-1].c;
;
break;}
case 334:
-#line 3324 "Gmsh.y"
+#line 3329 "Gmsh.y"
{
char tmpstring[1024];
int i = PrintListOfDouble(yyvsp[-3].c, yyvsp[-1].l, tmpstring);
@@ -6346,7 +6351,7 @@ case 334:
;
break;}
case 335:
-#line 3343 "Gmsh.y"
+#line 3348 "Gmsh.y"
{
char* (*pStrOpt)(int num, int action, char *value);
StringXString *pStrCat;
@@ -6370,7 +6375,7 @@ case 335:
;
break;}
case 336:
-#line 3365 "Gmsh.y"
+#line 3370 "Gmsh.y"
{
char* (*pStrOpt)(int num, int action, char *value);
StringXString *pStrCat;
@@ -6615,7 +6620,7 @@ yyerrhandle:
}
return 1;
}
-#line 3388 "Gmsh.y"
+#line 3393 "Gmsh.y"
void DeleteSymbol(void *a, void *b){
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 03388aeb1861f12d8a76921751abf8f5440801b8..210d471f57e89c56c2ee04c776dd4179fdc02eb3 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,5 +1,5 @@
%{
-// $Id: Gmsh.y,v 1.261 2007-02-12 08:36:13 geuzaine Exp $
+// $Id: Gmsh.y,v 1.262 2007-02-13 07:51:48 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -1850,6 +1850,10 @@ Command :
}
else if(!strcmp($1, "Print")){
#if defined(HAVE_FLTK)
+ // make sure we have the latest data from THEM in GModel
+ // (fixes bug where we would have no geometry in the picture if
+ // the print command is in the same file as the geometry)
+ GMODEL->importTHEM();
char tmpstring[1024];
FixRelativePath($2, tmpstring);
CreateOutputFile(tmpstring, CTX.print.format);
@@ -1857,6 +1861,7 @@ Command :
}
else if(!strcmp($1, "Save")){
#if defined(HAVE_FLTK)
+ GMODEL->importTHEM();
char tmpstring[1024];
FixRelativePath($2, tmpstring);
CreateOutputFile(tmpstring, CTX.mesh.format);
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 8fc20c5619e0d3bd55d8c44a67371dba89771f79..f4f439863fde7cf0eb81d205a8a6cba2088f38d6 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -2,7 +2,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.303 2007-02-12 08:36:13 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.304 2007-02-13 07:51:48 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -720,7 +720,7 @@ char *yytext;
#line 1 "Gmsh.l"
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.303 2007-02-12 08:36:13 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.304 2007-02-13 07:51:48 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
diff --git a/doc/VERSIONS b/doc/VERSIONS
index 1a9a7a4af018f17549d5a0f662238e44b2c0c11d..dc4ad8478a369cc504ffe69e036f5f9954dd1098 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,6 +1,7 @@
-$Id: VERSIONS,v 1.375 2007-02-12 08:36:14 geuzaine Exp $
+$Id: VERSIONS,v 1.376 2007-02-13 07:51:48 geuzaine Exp $
since 2.0: volumes can now be defined from external CAD surfaces;
+fixed various small bugs.
2.0 (February 5, 2007): new geometry and mesh databases, with support
for STEP and IGES import via OpenCascade; complete rewrite of geometry
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index e0d624cbef75807136481670e46b39f1a7d820ae..2b3996fc31a1ada0ba4d4d5eabd94a12845121f6 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.228 2007-02-05 08:59:31 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.229 2007-02-13 07:51:48 geuzaine Exp $
@c
@c Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
@c
@@ -1354,7 +1354,7 @@ is shut down. This permits for example to automatically remember the size
and location of the windows or which fonts to use. Other options can be
saved in a per-user ``option'' file (@code{General.OptionsFileName}),
automatically loaded by Gmsh every time it starts up, by using the
-`Tools->Options->Save' menu.
+`Tools->Options->Save as defaults' menu.
@c All the opt_XXX.texi files are generated automatically with `gmsh -doc'
@@ -2661,7 +2661,7 @@ specified in the ASCII input files. All available options, with their
current values, can be saved into a file by selecting `File->Save As->Gmsh
options', or simply viewed by pressing the `?' button in the status bar. To
save the current options as your default preferences for all future Gmsh
-sessions, use the `Tools->Options->Save' button.
+sessions, use the `Tools->Options->Save as defaults' button.
@c -------------------------------------------------------------------------
@c Non-interactive mode
@@ -3975,10 +3975,10 @@ your @code{.emacs} file: @code{(setq auto-mode-alist (append '(("\\.geo$"
Define common geometrical objects and options in separate files, reusable in
all your problem definition structures.
@item
-Save your preferred options with `Tools->Options->Save'. To reset default
-options, erase the @code{General.OptionsFileName} (usually
-@file{.gmsh-options} in your home directory) or use the `Restore default
-options' button in `Tools->Options->General->Output'.
+Save your preferred options with `Tools->Options->Save as defaults'. To
+reset the default options, erase the @code{General.OptionsFileName}
+(usually @file{.gmsh-options} in your home directory) or use the
+`Restore default options' button in `Tools->Options->General->Output'.
@item
In the graphical user interface: