Changeset 15396 for issm/trunk/src/c/modules/TriMeshx/TriMeshx.cpp

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/modules/TriMeshx/TriMeshx.cpp (modified) (4 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

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

@@ -6 +6 @@
 #include "./TriMeshx.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../io/io.h"
 #include "../../toolkits/toolkits.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
 /*ANSI_DECLARATORS needed to call triangle library: */
 #if defined(_HAVE_TRIANGLE_)
@@ -22 +19 @@
 /*}}}*/
 
-void TriMeshx(SeqMat<int>** pindex,SeqVec<IssmPDouble>** px,SeqVec<IssmPDouble>** py,SeqMat<int>** psegments,SeqVec<int>** psegmentmarkerlist,DataSet* domain,DataSet* rifts,double area){
+void TriMeshx(int** pindex,IssmPDouble** px,IssmPDouble** py,int** psegments,int** psegmentmarkerlist,int* pnels,int* pnods, int* pnsegs,Contours* domain,Contours* rifts,double area){
 
 #if !defined(_HAVE_TRIANGLE_)
@@ -31 +28 @@
 
         /*output: */
-        int         *index             = NULL;
-        SeqMat<int> *index_matrix      = NULL;
-        double      *x                 = NULL;
-        double      *y                 = NULL;
-        int         *segments          = NULL;
-        SeqMat<int> *segments_matrix   = NULL;
-        int         *segmentmarkerlist = NULL;
+        int    *index             = NULL;
+        double *x                 = NULL;
+        double *y                 = NULL;
+        int    *segments          = NULL;
+        int    *segmentmarkerlist = NULL;
 
         /*intermediary: */
@@ -197 +192 @@
 
         /*Output : */
-        index_matrix=new SeqMat<int>(index,out.numberoftriangles,3,1);
-        *pindex=index_matrix;
-
-        segments_matrix=new SeqMat<int>(segments,out.numberofsegments,3,1);
-        *psegments=segments_matrix;
-
-        *px=new SeqVec<IssmPDouble>(x,out.numberofpoints);
-        *py=new SeqVec<IssmPDouble>(y,out.numberofpoints);
-        *psegmentmarkerlist=new SeqVec<int>(segmentmarkerlist,out.numberofsegments);
+        *pindex=index;
+        *px=x;
+        *py=y;
+        *psegments=segments;
+        *psegmentmarkerlist=segmentmarkerlist;
+        *pnels=out.numberoftriangles;
+        *pnods=out.numberofpoints;
+        *pnsegs=out.numberofsegments;
 #endif
 }

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache