Changeset 12063

Timestamp:

04/19/12 17:13:47 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed TriMeshRiftsx

Location:

issm/trunk-jpl/src/c/modules

Files:

• TriMeshRiftsx/TriMeshRiftsx.cpp (modified) (6 diffs)
• TriMeshRiftsx/TriMeshRiftsx.h (modified) (1 diff)
• modules.h (modified) (1 diff)

issm/trunk-jpl/src/c/modules/TriMeshRiftsx/TriMeshRiftsx.cpp ¶

@@ -20 +20 @@
 /*}}}*/
 
-void TriMeshRiftsx(Matrix** pindex,Vector** px,Vector** py,Matrix** psegments,Vector** psegmentmarkerlist,DataSet* domain,double area,bool order){
+void TriMeshRiftsx(Matrix** pindex,Vector** px,Vector** py,Matrix** psegments,Vector** psegmentmarkerlist,DataSet* domain,DataSet* rifts,double area,bool order){
 
         /*indexing: */
@@ -35 +35 @@
 
         /*intermediary: */
-        int      counter,backcounter;
+        int      counter,counter2,backcounter;
         Contour* contour=NULL;
 
@@ -47 +47 @@
                 contour=(Contour*)domain->GetObjectByOffset(i);
                 in.numberofpoints+=contour->nods;
+        }
+        if (rifts){
+                for (i=0;i<rifts->Size();i++){
+                        contour=(Contour*)rifts->GetObjectByOffset(i);
+                        in.numberofpoints+=contour->nods;
+                }
         }
         /*number of point attributes: */
@@ -63 +69 @@
                 }
         }
+        if(rifts){
+                for (i=0;i<rifts->Size();i++){
+                        contour=(Contour*)rifts->GetObjectByOffset(i);
+                        for (j=0;j<contour->nods;j++){
+                                in.pointlist[2*counter+0]=contour->x[j];
+                                in.pointlist[2*counter+1]=contour->y[j];
+                                counter++;
+                        }
+                }
+        }
         
         /*fill in the point attribute list: */
-        in.pointattributelist = (REAL *) xmalloc(in.numberofpoints * in.numberofpointattributes * sizeof(REAL));
+        in.pointattributelist = (REAL*)xmalloc(in.numberofpoints*in.numberofpointattributes*sizeof(REAL));
         for (i=0;i<in.numberofpoints;i++) in.pointattributelist[i] = 0.0;
         
@@ -77 +93 @@
                 contour=(Contour*)domain->GetObjectByOffset(i);
                 in.numberofsegments+=contour->nods;
+        }
+        if(rifts){
+                for(i=0;i<rifts->Size();i++){
+                        contour=(Contour*)rifts->GetObjectByOffset(i);
+                        /*for rifts, we have one less segment as we have vertices*/
+                        in.numberofsegments+=contour->nods-1;
+                }
         }
         
@@ -97 +120 @@
                  counter++;
                  backcounter=counter;
+        }
+        counter2=counter;
+        if(rifts){
+                for (i=0;i<rifts->Size();i++){
+                        contour=(Contour*)rifts->GetObjectByOffset(i);
+                        for (j=0;j<(contour->nods-1);j++){
+                                in.segmentlist[2*counter2+0]=counter;
+                                in.segmentlist[2*counter2+1]=counter+1;
+                                in.segmentmarkerlist[counter2]=2+i;
+                                counter2++;
+                                counter++;
+                        }
+                        counter++;
+                }
         }
         

issm/trunk-jpl/src/c/modules/TriMeshRiftsx/TriMeshRiftsx.h ¶

@@ -11 +11 @@
 
 /* local prototypes: */
-void TriMeshRiftsx(Matrix** pindex,Vector** px,Vector** py,Matrix** psegments,Vector** psegmentmarkerlist,DataSet* domain,double area,bool order);
+void TriMeshRiftsx(Matrix** pindex,Vector** px,Vector** py,Matrix** psegments,Vector** psegmentmarkerlist,DataSet* domain,DataSet* rifts,double area,bool order);
 
 #endif  /* _TRIMESHX_H */

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

@@ -112 +112 @@
 #include "./TriaSearchx/TriaSearchx.h"
 #include "./TriMeshx/TriMeshx.h"
+#include "./TriMeshRiftsx/TriMeshRiftsx.h"
 #include "./ThicknessAbsMisfitx/ThicknessAbsMisfitx.h"
 #include "./ThicknessAbsGradientx/ThicknessAbsGradientx.h"