check contrib/DiscreteIntegration

Common/GmshConfig.h.in

@@ -10,6 +10,7 @@
 #undef HAVE_ANN
 #undef HAVE_BLAS
 #undef HAVE_CHACO
+#undef HAVE_DINTEGRATION
 #undef HAVE_FLTK
 #undef HAVE_FOURIER_MODEL
 #undef HAVE_GMM

Geo/MElementCut.cpp

@@ -7,9 +7,9 @@
 #include "MElement.h"
 #include "MElementCut.h"
 
-//#define HAVE_LEVELSET
+//#define HAVE_DINTEGRATION
 
-#if defined(HAVE_LEVELSET)
+#if defined(HAVE_DINTEGRATION)
 #include "DILevelset.h"
 #include "Integration3D.h"
 #endif
@@ -180,7 +180,7 @@ void MPolygon::getIntegrationPoints(int pOrder, int *npts, IntPt **pts) const
 
 //---------------------------------------- CutMesh ----------------------------
 
-#if defined(HAVE_LEVELSET)
+#if defined(HAVE_DINTEGRATION)
 
 int getElementVertexNum (DI_Point p, MElement *e)
 {
@@ -587,8 +587,8 @@ GModel *buildCutMesh(GModel *gm, gLevelset *ls,
                      std::map<int, MVertex*> &vertexMap,
                      std::map<int, std::map<int, std::string> > physicals[4])
 {
-#if defined(HAVE_LEVELSET)
-  GModel *cutGM = new GModel;
+#if defined(HAVE_DINTEGRATION)
+  GModel *cutGM = new GModel; printf("have levelset");
 
   std::map<int, std::vector<MElement*> > border[2];
   std::vector<MVertex*> newVertices;

configure.in

@@ -112,6 +112,9 @@ AC_ARG_ENABLE(matheval,
 AC_ARG_ENABLE(kbipack,
               AC_HELP_STRING([--enable-kbipack],
                              [compile kbipack if available (default=yes)]))
+AC_ARG_ENABLE(dintegration,
+              AC_HELP_STRING([--enable-dintegration],
+                             [compile Discrete Integration if available (default=yes)]))
 AC_ARG_ENABLE(gmm,
               AC_HELP_STRING([--enable-gmm],
                              [use gmm++ if available (default=yes)]))
@@ -159,6 +162,7 @@ if test "x$enable_minimal" = "xyes"; then
   enable_tetgen=no;
   enable_matheval=no;
   enable_kbipack=no;
+  enable_dintegration=no;
   enable_gmm=no;
   enable_ann=no;
   enable_metis=no;
@@ -540,6 +544,17 @@ if test "x$enable_contrib" != "xno"; then
     fi
   fi
 
+  dnl Check for DiscreteIntegration
+  if test "x$enable_dintegration" != "xno"; then
+    AC_CHECK_FILE(./contrib/DiscreteIntegration/Integration3D.cpp,DINTEGRATION="yes")
+    if test "x${DINTEGRATION}" = "xyes"; then
+      GMSH_DIRS="${GMSH_DIRS} contrib/DiscreteIntegration"
+      GMSH_LIBS="${GMSH_LIBS} -lGmshDIntegration"
+      AC_DEFINE(HAVE_DINTEGRATION)
+      BO="${BO} DIntegration"
+    fi
+  fi
+
 fi
 
 dnl Check for OpenCascade