Changeset 14219

Timestamp:

01/09/13 09:16:25 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: segments must remain double

Location:

issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx

Files:

• MeshProfileIntersectionx.cpp (modified) (4 diffs)
• MeshProfileIntersectionx.h (modified) (1 diff)

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

@@ -4 +4 @@
 #include "./MeshProfileIntersectionx.h"
 
-void MeshProfileIntersectionx(int** psegments, int* pnumsegs, int* index, double* x, double* y, int nel, int nods,  Contour<IssmPDouble>** contours,int numcontours){/*{{{*/
+void MeshProfileIntersectionx(double** psegments, int* pnumsegs, int* index, double* x, double* y, int nel, int nods,  Contour<IssmPDouble>** contours,int numcontours){/*{{{*/
 
         int i,j,k;
@@ -15 +15 @@
 
         /*output: */
-        int* segments=NULL;
-        int  numsegs;
+        double* segments=NULL;
+        int     numsegs;
 
         /*intermediary: */
-        int** allsegments=NULL;
-        int*  segmentsi=NULL;
-        int*  allnumsegs=NULL;
-        int   numsegsi;
-        int   count;
+        double** allsegments=NULL;
+        double*  segmentsi=NULL;
+        int*     allnumsegs=NULL;
+        int      numsegsi;
+        int      count;
 
         /*Allocate: */
-        allsegments=xNew<int*>(numcontours);
+        allsegments=xNew<double*>(numcontours);
         allnumsegs=xNew<int>(numcontours);
 
@@ -51 +51 @@
 
         /*Out of all segments, create one common array of segments: */
-        segments=xNew<int>(5*numsegs);
+        segments=xNew<double>(5*numsegs);
         count=0;
         for(i=0;i<numcontours;i++){
@@ -103 +103 @@
 
                 /*x1,y1,x2,y2 then element_id: */
-                *(segments+5*i+0)=segment->x1;
-                *(segments+5*i+1)=segment->y1;
-                *(segments+5*i+2)=segment->x2;
-                *(segments+5*i+3)=segment->y2;
-                *(segments+5*i+4)=(double)segment->eid;
+                segments[5*i+0]=segment->x1;
+                segments[5*i+1]=segment->y1;
+                segments[5*i+2]=segment->x2;
+                segments[5*i+3]=segment->y2;
+                segments[5*i+4]=(double)segment->eid;
         }
 

issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/MeshProfileIntersectionx.h

@@ -10 +10 @@
 
 /* local prototypes: */
-void MeshProfileIntersectionx(int** psegments, int* pnumseg, int* index, double* x, double* y, int nel, int nods,  Contour<IssmPDouble>** contours,int numcontours);
-void MeshSegmentsIntersection(int** psegments, int* pnumsegs,int* index, double* x, double* y, int nel, int nods, double* xc, double* yc, int numnodes);
+void MeshProfileIntersectionx(double** psegments, int* pnumseg, int* index, double* x, double* y, int nel, int nods,  Contour<IssmPDouble>** contours,int numcontours);
+void MeshSegmentsIntersection(double** psegments, int* pnumsegs,int* index, double* x, double* y, int nel, int nods, double* xc, double* yc, int numnodes);
 void ElementSegmentsIntersection(DataSet* segments_dataset,int el, double* xnodes,double* ynodes,double* xc,double* yc,int numnodes);
 void ElementSegment(DataSet* segments_dataset,int el,double* xnodes,double* ynodes,double* xsegment,double* ysegment);