diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 7a7dbf60562035d1ce97efd9e5bfee8f500770d3..fa8d069602c6e29b2b66b7a1bafe6b4d003d96f4 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -133,7 +133,7 @@
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.330 2007-09-06 15:49:43 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.331 2007-09-09 00:18:03 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -539,7 +539,7 @@ static const short yyrline[] = { 0,
184, 190, 205, 218, 246, 254, 261, 266, 273, 281,
282, 283, 284, 285, 286, 289, 292, 296, 299, 303,
494, 508, 518, 524, 531, 539, 545, 551, 558, 566,
- 572, 578, 588, 593, 597, 606, 608, 609, 610, 611,
+ 572, 578, 587, 592, 597, 606, 608, 609, 610, 611,
614, 616, 619, 654, 693, 747, 764, 782, 793, 810,
817, 831, 848, 874, 901, 915, 932, 946, 963, 983,
1006, 1016, 1030, 1035, 1044, 1070, 1086, 1107, 1114, 1125,
@@ -3347,19 +3347,19 @@ case 51:
;
break;}
case 52:
-#line 583 "Gmsh.y"
+#line 582 "Gmsh.y"
{
View->adaptive = new Adaptive_Post_View(View, yyvsp[-11].l, yyvsp[-8].l, yyvsp[-5].l, yyvsp[-2].l);
;
break;}
case 53:
-#line 590 "Gmsh.y"
+#line 589 "Gmsh.y"
{
ViewValueList = View->Time;
;
break;}
case 54:
-#line 594 "Gmsh.y"
+#line 593 "Gmsh.y"
{
;
break;}
@@ -4924,11 +4924,11 @@ case 148:
{
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);
- if(vv) {
- Field *field=new PostViewField(*vv);
- fields.insert(field);
- BGMAddField(field);
- }
+ if(vv){
+ Field *field = new PostViewField(*vv);
+ fields.insert(field);
+ BGMAddField(field);
+ }
}
else{
yymsg(GERROR, "Unknown command '%s'", yyvsp[-6].c);
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 12a79bb547b592cab22700d8ce962cb68692cf1d..476a1195936521d3b5106ab246946dcfc24abaeb 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,5 +1,5 @@
%{
-// $Id: Gmsh.y,v 1.284 2007-09-06 15:49:44 geuzaine Exp $
+// $Id: Gmsh.y,v 1.285 2007-09-09 00:18:04 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -575,8 +575,7 @@ InterpolationMatrix :
{
View->adaptive = new Adaptive_Post_View(View, $3, $6);
}
- |
- tInterpolationScheme '{' RecursiveListOfListOfDouble '}'
+ | tInterpolationScheme '{' RecursiveListOfListOfDouble '}'
'{' RecursiveListOfListOfDouble '}'
'{' RecursiveListOfListOfDouble '}'
'{' RecursiveListOfListOfDouble '}' tEND
@@ -594,6 +593,7 @@ Time :
{
}
;
+
Grain :
tGrain '(' FExpr ')' ListOfDouble tEND
{
@@ -2045,11 +2045,11 @@ Command :
{
if(!strcmp($1, "Background") && !strcmp($2, "Mesh") && !strcmp($3, "View")){
Post_View **vv = (Post_View **)List_Pointer_Test(CTX.post.list, (int)$5);
- if(vv) {
- Field *field=new PostViewField(*vv);
- fields.insert(field);
- BGMAddField(field);
- }
+ if(vv){
+ Field *field = new PostViewField(*vv);
+ fields.insert(field);
+ BGMAddField(field);
+ }
}
else{
yymsg(GERROR, "Unknown command '%s'", $1);
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 8d39e53341521c228ce02daa017704297f7437cb..c554fddbb0884e88d1f1ee89ba85950d08a03c8a 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.329 2007-09-06 15:49:45 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.330 2007-09-09 00:18:04 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -760,7 +760,7 @@ char *yytext;
#line 1 "Gmsh.l"
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.329 2007-09-06 15:49:45 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.330 2007-09-09 00:18:04 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
diff --git a/Parser/OpenFile.cpp b/Parser/OpenFile.cpp
index 3b5bd1b6dfdeed63ab04c1aa571fdfc48a7a048b..85cff4c62dab20e670b822df96c00cb2b1970ace 100644
--- a/Parser/OpenFile.cpp
+++ b/Parser/OpenFile.cpp
@@ -1,4 +1,4 @@
-// $Id: OpenFile.cpp,v 1.157 2007-09-08 21:26:04 geuzaine Exp $
+// $Id: OpenFile.cpp,v 1.158 2007-09-09 00:18:04 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -389,8 +389,9 @@ int MergeFile(char *name, int warn_if_missing)
}
else if(!strncmp(header, "$PostFormat", 11) ||
!strncmp(header, "$View", 5)) {
-#if 1 // test new post-pro
+#if 0 // test new post-pro
status = PView::read(name);
+ //PView::combine(true, 1, true);
#else
status = ReadView(name);
#endif
diff --git a/Post/PViewDataList.cpp b/Post/PViewDataList.cpp
index c8b5d481a041a9aa8f132e19116e4d1e6a9a30ee..92a4e00178289cac79539306b8b3d19de84b549a 100644
--- a/Post/PViewDataList.cpp
+++ b/Post/PViewDataList.cpp
@@ -1,4 +1,4 @@
-// $Id: PViewDataList.cpp,v 1.3 2007-09-08 21:26:05 geuzaine Exp $
+// $Id: PViewDataList.cpp,v 1.4 2007-09-09 00:18:04 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -748,8 +748,8 @@ bool PViewDataList::combineTime(nameData &nd)
}
}
- int *nbe=0, *nbe2=0, nbn, nbn2, nbc, nbc2;
- List_T *list=0, *list2=0;
+ int *nbe = 0, *nbe2 = 0, nbn, nbn2, nbc, nbc2;
+ List_T *list = 0, *list2 = 0;
// use the first data set as the reference
for(int i = 0; i < 24; i++){
@@ -882,4 +882,3 @@ void PViewDataList::setAdaptiveResolutionLevel(int level, GMSH_Post_Plugin *plug
{
//if(adaptive) adaptive->setAdaptiveResolutionLevel(this, level, plugin);
}
-