Changeset 13735 for issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp

Timestamp:

10/18/12 11:37:32 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not error out if triangle is not installed

File:

• issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp

@@ -11 +11 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 /*ANSI_DECLARATORS needed to call triangle library: */
-#ifndef ANSI_DECLARATORS
-#define ANSI_DECLARATORS
-#include "triangle.h"
-#undef ANSI_DECLARATORS
-#else
-#include "triangle.h"
+#if defined(_HAVE_TRIANGLE_)
+        #ifndef ANSI_DECLARATORS
+        #define ANSI_DECLARATORS
+        #include "triangle.h"
+        #undef ANSI_DECLARATORS
+        #else
+        #include "triangle.h"
+        #endif
 #endif
 /*}}}*/
@@ -22 +24 @@
 void TriMeshx(SeqMat<IssmPDouble>** pindex,SeqVec<IssmPDouble>** px,SeqVec<IssmPDouble>** py,SeqMat<IssmPDouble>** psegments,SeqVec<IssmPDouble>** psegmentmarkerlist,DataSet* domain,DataSet* rifts,double area){
 
+#if !defined(_HAVE_TRIANGLE_)
+        _error_("triangle has not been installed");
+#else
         /*indexing: */
         int i,j;
@@ -201 +206 @@
         *py=new SeqVec<IssmPDouble>(y,out.numberofpoints);
         *psegmentmarkerlist=new SeqVec<IssmPDouble>(segmentmarkerlist,out.numberofsegments);
+#endif
 }