Changeset 12061 for issm/trunk-jpl/src/c/modules/TriMeshRiftsx/TriMeshRiftsx.cpp

Timestamp:

04/19/12 16:20:00 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added TriMeshRifts (not working yet)

Location:

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

Files:

• . (copied) (copied from issm/trunk-jpl/src/c/modules/TriMeshx )
• TriMeshRiftsx.cpp (moved) (moved from issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp ) (9 diffs)

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

@@ -1 @@
-/*!\file TriMeshx
+/*!\file TriMeshRiftsx
  * \brief: x code for TriMesh mesher
  */
 
 /*Header files: {{{*/
-#include "./TriMeshx.h"
+#include "./TriMeshRiftsx.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"
@@ -20 +20 @@
 /*}}}*/
 
-
-void TriMeshx(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,double area,bool order){
 
         /*indexing: */
@@ -73 +72 @@
         for(i=0;i<in.numberofpoints;i++) in.pointmarkerlist[i] = 0;
 
-
         /*Build segments. First figure out number of segments: holes and closed outlines have as many segments as vertices: */
         in.numberofsegments=0;
@@ -100 +98 @@
                  backcounter=counter;
         }
-
         
         /*Build regions: */
@@ -116 +113 @@
 
         /* Make necessary initializations so that Triangle can return a triangulation in `out': */
-
-        out.pointlist = (REAL *) NULL;            
-        out.pointattributelist = (REAL *) NULL;
-        out.pointmarkerlist = (int *) NULL; 
-        out.trianglelist = (int *) NULL;          
-        out.triangleattributelist = (REAL *) NULL;
-        out.neighborlist = (int *) NULL;         
-        out.segmentlist = (int *) NULL;
-        out.segmentmarkerlist = (int *) NULL;
-        out.edgelist = (int *) NULL;             
-        out.edgemarkerlist = (int *) NULL;   
+        out.pointlist             = (REAL*)NULL;
+        out.pointattributelist    = (REAL*)NULL;
+        out.pointmarkerlist       = (int *)NULL;
+        out.trianglelist          = (int *)NULL;
+        out.triangleattributelist = (REAL*)NULL;
+        out.neighborlist          = (int *)NULL;
+        out.segmentlist           = (int *)NULL;
+        out.segmentmarkerlist     = (int *)NULL;
+        out.edgelist              = (int *)NULL;
+        out.edgemarkerlist        = (int *)NULL;
 
         /* Triangulate the points:.  Switches are chosen to read and write a  */
@@ -133 +129 @@
         /*   produce an edge list (e), a Voronoi diagram (v), and a triangle */
         /*   neighbor list (n).                                              */
-
         sprintf(options,"%s%lf","pQzDq30ia",area); /*replace V by Q to quiet down the logging*/
-
-  
         triangulate(options, &in, &out, NULL);
-
         /*report(&out, 0, 1, 1, 1, 1, 0);*/
-
 
         /*Allocate index, x and y: */
@@ -149 +140 @@
         segmentmarkerlist=(double*)xmalloc(out.numberofsegments*sizeof(double));
 
-        for (i = 0; i < out.numberoftriangles; i++) {
+        for (i = 0; i< out.numberoftriangles; i++) {
                 for (j = 0; j < out.numberofcorners; j++) {
-                        *(index+3*i+j)=(double)out.trianglelist[i * out.numberofcorners + j]+1;
+                        index[3*i+j]=(double)out.trianglelist[i*out.numberofcorners+j]+1;
                 }
         }
-        for (i = 0; i < out.numberofpoints; i++) {
-                x[i]=out.pointlist[i * 2 + 0];
-                y[i]=out.pointlist[i * 2 + 1];
+        for (i = 0; i< out.numberofpoints; i++){
+                x[i]=out.pointlist[i*2+0];
+                y[i]=out.pointlist[i*2+1];
         }
-        
-        for (i = 0; i < out.numberofsegments; i++) {
+        for (i = 0; i<out.numberofsegments;i++){
                 segments[3*i+0]=(double)out.segmentlist[i*2+0]+1;
                 segments[3*i+1]=(double)out.segmentlist[i*2+1]+1;
                 segmentmarkerlist[i]=(double)out.segmentmarkerlist[i];
         }
-
-
 
         /*Associate elements with segments: */
@@ -174 +162 @@
                 OrderSegments(&segments,out.numberofsegments, index,out.numberoftriangles);
         }
-
 
         /*Output : */
@@ -187 +174 @@
         *py=new Vector(y,out.numberofpoints);
         *psegmentmarkerlist=new Vector(segmentmarkerlist,out.numberofsegments);
-
 }