pp + fix compile without occ

Geo/GModelIO_OCC.h

@@ -264,7 +264,7 @@ public:
   OCC_Internals(){}
   bool getChanged() const { return false; }
   void reset(){}
-  void setMaxTag(int dim, int val);
+  void setMaxTag(int dim, int val){}
   int getMaxTag(int dim) const { return 0; }
   void addVertex(int tag, double x, double y, double z, double meshSize=MAX_LC)
   { _error("add vertex"); }

Geo/Geo.h

@@ -10,6 +10,7 @@
 #include <vector>
 #include <list>
 #include "GmshDefines.h"
+#include "GeoDefines.h"
 #include "gmshSurface.h"
 #include "ListUtils.h"
 #include "TreeUtils.h"
@@ -17,46 +18,6 @@
 #include "ExtrudeParams.h"
 #include "findLinks.h"
 
-// type/100 gives (dimension+1)
-#define MSH_POINT              100
-#define MSH_POINT_BND_LAYER    101
-#define MSH_POINT_DISCRETE     102
-#define MSH_POINT_FROM_GMODEL  103
-
-#define MSH_SEGM_LINE          200
-#define MSH_SEGM_SPLN          201
-#define MSH_SEGM_CIRC          202
-#define MSH_SEGM_CIRC_INV      203
-#define MSH_SEGM_ELLI          204
-#define MSH_SEGM_ELLI_INV      205
-#define MSH_SEGM_LOOP          206
-#define MSH_SEGM_BSPLN         207
-#define MSH_SEGM_NURBS         208
-#define MSH_SEGM_BEZIER        209
-#define MSH_SEGM_BND_LAYER     211
-#define MSH_SEGM_DISCRETE      212
-#define MSH_SEGM_FROM_GMODEL   213
-#define MSH_SEGM_COMPOUND      214
-
-#define MSH_SURF_PLAN          300
-#define MSH_SURF_REGL          301
-#define MSH_SURF_TRIC          302
-#define MSH_SURF_BND_LAYER     303
-#define MSH_SURF_LOOP          304
-#define MSH_SURF_DISCRETE      305
-#define MSH_SURF_FROM_GMODEL   306
-#define MSH_SURF_COMPOUND      307
-
-#define MSH_VOLUME             400
-#define MSH_VOLUME_DISCRETE    401
-#define MSH_VOLUME_FROM_GMODEL 402
-#define MSH_VOLUME_COMPOUND    403
-
-#define MSH_PHYSICAL_POINT     500
-#define MSH_PHYSICAL_LINE      501
-#define MSH_PHYSICAL_SURFACE   502
-#define MSH_PHYSICAL_VOLUME    503
-
 struct Coord{
   double X, Y, Z;
 };

Parser/Gmsh.tab.hpp

@@ -476,7 +476,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 129 "Gmsh.y"
+#line 130 "Gmsh.y"
 {
   char *c;
   int i;

Parser/Gmsh.y

@@ -21,8 +21,9 @@
 #include "GModel.h"
 #include "GModelIO_GEO.h"
 #include "GModelIO_OCC.h"
-#include "Geo.h"
-#include "GeoInterpolation.h"
+#include "GeoDefines.h"
+#include "Geo.h" // FIXME: remove once Extrusion, Color and Visibility have been refactored
+#include "ExtrudeParams.h"
 #include "Options.h"
 #include "Parser.h"
 #include "OpenFile.h"
@@ -2554,12 +2555,11 @@ ListOfShapes :
     }
 ;
 
-//  L E V E L S E T
+//  L E V E L S E T S
 
 LevelSet :
     tLevelset tPlane '(' FExpr ')' tAFFECT ListOfDouble tEND
     {
-#if defined(HAVE_DINTEGRATION)
       if(List_Nbr($7) == 4){
         int t = (int)$4;
         if(gLevelset::find(t)){
@@ -2574,24 +2574,20 @@ LevelSet :
         }
       }
       else
-        yymsg(0, "Wrong levelset definition (%d)", $4);
+        yymsg(0, "Wrong number of arguments for levelset definition");
       List_Delete($7);
-#endif
     }
   | tLevelset tPoint '(' FExpr ')' tAFFECT '{' RecursiveListOfListOfDouble '}' tEND
     {
-#if defined(HAVE_DINTEGRATION)
       int t = (int)$4;
       if(gLevelset::find(t)){
 	yymsg(0, "Levelset %d already exists", t);
       }
       else {
-	//Msg::Info("nb = %d \n",List_Nbr($8) );
 	fullMatrix<double> centers(List_Nbr($8),3);
 	for (int i = 0; i < List_Nbr($8); i++){
 	  List_T *l = *(List_T**)List_Pointer($8, i);
 	  for (int j = 0; j < List_Nbr(l); j++){
-	    //Msg::Info("nb j = %d \n",List_Nbr(l) );
 	    centers(i,j) = (double)(*(double*)List_Pointer(l, j));
 	  }
 	}
@@ -2601,13 +2597,10 @@ LevelSet :
       for(int i = 0; i < List_Nbr($8); i++)
         List_Delete(*(List_T**)List_Pointer($8, i));
       List_Delete($8);
-#endif
     }
   | tLevelset tPlane '(' FExpr ')' tAFFECT '{' VExpr ',' VExpr ','
                                                RecursiveListOfDouble '}' tEND
     {
-#if defined(HAVE_DINTEGRATION)
-      if(List_Nbr($12) == 0){
       int t = (int)$4;
       if(gLevelset::find(t)){
         yymsg(0, "Levelset %d already exists", t);
@@ -2618,17 +2611,11 @@ LevelSet :
         gLevelset *ls = new gLevelsetPlane(pt, n, t);
         gLevelset::add(ls);
       }
-      }
-      else
-        yymsg(0, "Wrong levelset definition (%d)", $4);
       List_Delete($12);
-#endif
     }
   | tLevelset tPlane '(' FExpr ')' tAFFECT '{' VExpr ',' VExpr ',' VExpr ','
                                                RecursiveListOfDouble '}' tEND
     {
-#if defined(HAVE_DINTEGRATION)
-      if(List_Nbr($14) == 0){
       int t = (int)$4;
       if(gLevelset::find(t)){
         yymsg(0, "Levelset %d already exists", t);
@@ -2640,15 +2627,10 @@ LevelSet :
         gLevelset *ls = new gLevelsetPlane(pt1, pt2, pt3, t);
         gLevelset::add(ls);
       }
-      }
-      else
-        yymsg(0, "Wrong levelset definition (%d)", $4);
       List_Delete($14);
-#endif
     }
   | tLevelset tSphere '(' FExpr ')' tAFFECT '{' VExpr ',' RecursiveListOfDouble '}' tEND
     {
-#if defined(HAVE_DINTEGRATION)
       if(List_Nbr($10) == 1){
         int t = (int)$4;
         if(gLevelset::find(t)){
@@ -2662,14 +2644,12 @@ LevelSet :
         }
       }
       else
-        yymsg(0, "Wrong levelset definition (%d)", $4);
+        yymsg(0, "Wrong number of arguments for levelset definition");
       List_Delete($10);
-#endif
     }
   | tLevelset tCylinder '(' FExpr ')' tAFFECT '{' VExpr ',' VExpr ','
                                                 RecursiveListOfDouble '}' tEND
     {
-#if defined(HAVE_DINTEGRATION)
       if(List_Nbr($12) == 1){
         int t = (int)$4;
         if(gLevelset::find(t)){
@@ -2715,14 +2695,12 @@ LevelSet :
         }
       }
       else
-        yymsg(0, "Wrong levelset definition (%d)", $4);
+        yymsg(0, "Wrong number of arguments for levelset definition");
       List_Delete($12);
-#endif
     }
   | tLevelset tCone '(' FExpr ')' tAFFECT '{' VExpr ',' VExpr ','
                                                 RecursiveListOfDouble '}' tEND
     {
-#if defined(HAVE_DINTEGRATION)
       if(List_Nbr($12) == 1){
         int t = (int)$4;
         if(gLevelset::find(t)){
@@ -2738,14 +2716,12 @@ LevelSet :
         }
       }
       else
-        yymsg(0, "Wrong levelset definition (%d)", $4);
+        yymsg(0, "Wrong number of arguments for levelset definition");
       List_Delete($12);
-#endif
     }
   | tLevelset tEllipsoid '(' FExpr ')' tAFFECT '{' VExpr ',' VExpr ','
                                                 RecursiveListOfDouble '}' tEND
     {
-#if defined(HAVE_DINTEGRATION)
       if(List_Nbr($12) == 3){
         int t = (int)$4;
         if(gLevelset::find(t)){
@@ -2762,14 +2738,12 @@ LevelSet :
         }
       }
       else
-        yymsg(0, "Wrong levelset definition (%d)", $4);
+        yymsg(0, "Wrong number of arguments for levelset definition");
       List_Delete($12);
-#endif
     }
   | tLevelset tQuadric '(' FExpr ')' tAFFECT '{' VExpr ',' VExpr ','
                                                 RecursiveListOfDouble '}' tEND
     {
-#if defined(HAVE_DINTEGRATION)
       if(List_Nbr($12) == 5){
         int t = (int)$4;
         if(gLevelset::find(t)){
@@ -2787,13 +2761,11 @@ LevelSet :
         }
       }
       else
-        yymsg(0, "Wrong levelset definition (%d)", $4);
+        yymsg(0, "Wrong number of arguments for levelset definition");
       List_Delete($12);
-#endif
     }
   | tLevelset tSTRING '(' FExpr ')' tAFFECT ListOfDouble tEND
     {
-#if defined(HAVE_DINTEGRATION)
       if(!strcmp($2, "Union")){
         int t = (int)$4;
         if(gLevelset::find(t)){
@@ -2804,7 +2776,7 @@ LevelSet :
           for(int i = 0; i < List_Nbr($7); i++) {
             double d; List_Read($7, i, &d);
             gLevelset *pl = gLevelset::find((int)d);
-	    if(!pl) yymsg(0, "Levelset Union %d : unknown levelset %d", t, (int)d);
+	    if(!pl) yymsg(0, "Unknown levelset %d", (int)d);
             else vl.push_back(pl);
           }
           gLevelset *ls = new gLevelsetUnion(vl, true, t);
@@ -2821,7 +2793,7 @@ LevelSet :
           for(int i = 0; i < List_Nbr($7); i++) {
             double d; List_Read($7, i, &d);
             gLevelset *pl = gLevelset::find((int)d);
-	    if(!pl) yymsg(0, "Levelset Intersection %d : unknown levelset %d", t, (int)d);
+	    if(!pl) yymsg(0, "Unknown levelset %d", (int)d);
             else vl.push_back(pl);
           }
           gLevelset *ls = new gLevelsetIntersection(vl, true, t);
@@ -2838,7 +2810,7 @@ LevelSet :
           for(int i = 0; i < List_Nbr($7); i++) {
             double d; List_Read($7, i, &d);
             gLevelset *pl = gLevelset::find((int)d);
-	    if(!pl) yymsg(0, "Levelset Cut %d : unknown levelset %d", t, (int)d);
+	    if(!pl) yymsg(0, "Unknown levelset %d", (int)d);
             else vl.push_back(pl);
           }
           gLevelset *ls = new gLevelsetCut(vl, true, t);
@@ -2855,7 +2827,7 @@ LevelSet :
           for(int i = 0; i < List_Nbr($7); i++) {
             double d; List_Read($7, i, &d);
             gLevelset *pl = gLevelset::find((int)d);
-	    if(!pl) yymsg(0, "Levelset Crack %d : unknown levelset %d", t, (int)d);
+	    if(!pl) yymsg(0, "Unknown levelset %d", (int)d);
             else vl.push_back(pl);
           }
           gLevelset *ls = new gLevelsetCrack(vl, false, t);
@@ -2872,7 +2844,7 @@ LevelSet :
           List_Read($7, 0, &d);
           gLevelset *pl = gLevelset::find((int)d);
           gLevelset *ls = NULL;
-          if(!pl) yymsg(0, "Levelset Reverse %d : unknown levelset %d", t, (int)d);
+          if(!pl) yymsg(0, "Unknown levelset %d", (int)d);
           else ls = new gLevelsetReverse(pl, t);
           if(ls) gLevelset::add(ls);
         }
@@ -2893,14 +2865,12 @@ LevelSet :
       }
 #endif
       else
-        yymsg(0, "Wrong levelset definition (%d)", $4);
+        yymsg(0, "Wrong number of arguments for levelset definition");
       Free($2);
       List_Delete($7);
-#endif
     }
   | tLevelset tSTRING '(' FExpr ')' tAFFECT tBIGSTR tEND
     {
-#if defined(HAVE_DINTEGRATION)
       if(!strcmp($2, "MathEval")){
         int t = (int)$4;
         if(gLevelset::find(t)){
@@ -2912,13 +2882,11 @@ LevelSet :
         }
       }
       else
-        yymsg(0, "Wrong levelset definition");
+        yymsg(0, "Unknown levelset '%s'", $2);
       Free($2); Free($7);
-#endif
     }
   | tLevelset tSTRING '{' FExpr '}' tEND
     {
-#if defined(HAVE_DINTEGRATION)
       if(!strcmp($2, "CutMesh")){
         int t = (int)$4;
         GModel *GM = GModel::current();
@@ -2927,7 +2895,7 @@ LevelSet :
           GM->setVisibility(0);
         }
         else
-          yymsg(0, "Unknown levelset (%d)", t);
+          yymsg(0, "Unknown levelset %d", t);
       }
       else if(!strcmp($2, "CutMeshTri")){
         int t = (int)$4;
@@ -2937,7 +2905,7 @@ LevelSet :
           GM->setVisibility(0);
         }
         else
-          yymsg(0, "Unknown levelset (%d)", t);
+          yymsg(0, "Unknown levelset %d", t);
       }
       else if(!strcmp($2, "SplitMesh")){
         int t = (int)$4;
@@ -2947,12 +2915,11 @@ LevelSet :
           GM->setVisibility(0);
         }
         else
-          yymsg(0, "Unknown levelset (%d)", t);
+          yymsg(0, "Unknown levelset %d", t);
       }
       else
-        yymsg(0, "Wrong levelset definition");
+        yymsg(0, "Unknown levelset '%s'", $2);
       Free($2);
-#endif
     }
   ;