Changeset 8306 for issm/trunk/src/mex/TriMeshNoDensity/TriMeshNoDensity.cpp

Timestamp:

05/16/11 15:50:34 (14 years ago)

Author:

Mathieu Morlighem

Message:

moved grids to nodes/vertices

File:

• issm/trunk/src/mex/TriMeshNoDensity/TriMeshNoDensity.cpp (modified) (11 diffs)

issm/trunk/src/mex/TriMeshNoDensity/TriMeshNoDensity.cpp

@@ -33 +33 @@
         /*Domain outline variables: */
         int      nprof;
-        int*     profngrids=NULL;
+        int*     profnvertices=NULL;
         double** pprofx=NULL;
         double** pprofy=NULL;
@@ -42 +42 @@
         /*Rift outline variables: */
         int      numrifts;
-        int*     riftsnumgrids=NULL;
-        double** riftsgridsx=NULL;
-        double** riftsgridsy=NULL;
+        int*     riftsnumvertices=NULL;
+        double** riftsverticesx=NULL;
+        double** riftsverticesy=NULL;
 
         /* Triangle structures: */
@@ -86 +86 @@
         
         /*Start reading the domain outline file: */
-        if(!DomainOutlineRead(&nprof,&profngrids,&pprofx,&pprofy,domainname)){
+        if(!DomainOutlineRead(&nprof,&profnvertices,&pprofx,&pprofy,domainname)){
                 printf("%s%s%s\n",__FUNCT__," error message reading domain outline ",domainname);
                 mexErrMsgTxt(" ");
@@ -93 +93 @@
         /*Read rifts file if present: */
         if(riftname){
-                if(!DomainOutlineRead(&numrifts,&riftsnumgrids,&riftsgridsx,&riftsgridsy,riftname)){
+                if(!DomainOutlineRead(&numrifts,&riftsnumvertices,&riftsverticesx,&riftsverticesy,riftname)){
                         printf("%s%s%s\n",__FUNCT__," error message reading rifts outline ",riftname);
                         mexErrMsgTxt(" ");
@@ -102 +102 @@
         numberofpoints=0;
         for (i=0;i<nprof;i++){
-                numberofpoints+=profngrids[i];
+                numberofpoints+=profnvertices[i];
         }
         if (riftname){
                 for (i=0;i<numrifts;i++){
-                        numberofpoints+=riftsnumgrids[i];
+                        numberofpoints+=riftsnumvertices[i];
                 }
         }
@@ -118 +118 @@
                 xprof=pprofx[i];
                 yprof=pprofy[i];
-                for (j=0;j<profngrids[i];j++){
+                for (j=0;j<profnvertices[i];j++){
                         in.pointlist[2*counter+0]=xprof[j];
                         in.pointlist[2*counter+1]=yprof[j];
@@ -126 +126 @@
         if(riftname){
                 for (i=0;i<numrifts;i++){
-                        xprof=riftsgridsx[i];
-                        yprof=riftsgridsy[i];
-                        for (j=0;j<riftsnumgrids[i];j++){
+                        xprof=riftsverticesx[i];
+                        yprof=riftsverticesy[i];
+                        for (j=0;j<riftsnumvertices[i];j++){
                                 in.pointlist[2*counter+0]=xprof[j];
                                 in.pointlist[2*counter+1]=yprof[j];
@@ -149 +149 @@
 
         /*Build segments: */
-        /*Figure out number of segments: holes and closed outlines have as many segments as grids, 
-         *for rifts, we have one less segment as we have grids*/
+        /*Figure out number of segments: holes and closed outlines have as many segments as vertices, 
+         *for rifts, we have one less segment as we have vertices*/
         in.numberofsegments=0;
         for (i=0;i<nprof;i++){
-                in.numberofsegments+=profngrids[i];
+                in.numberofsegments+=profnvertices[i];
         }
         if (riftname){
                 for (i=0;i<numrifts;i++){
-                        in.numberofsegments+=riftsnumgrids[i]-1;
+                        in.numberofsegments+=riftsnumvertices[i]-1;
                 }
         }
@@ -166 +166 @@
         backcounter=0;
         for (i=0;i<nprof;i++){
-                for (j=0;j<(profngrids[i]-1);j++){
+                for (j=0;j<(profnvertices[i]-1);j++){
                         in.segmentlist[2*counter+0]=counter;
                         in.segmentlist[2*counter+1]=counter+1;
@@ -182 +182 @@
         if(riftname){
                 for (i=0;i<numrifts;i++){
-                        for (j=0;j<(riftsnumgrids[i]-1);j++){
+                        for (j=0;j<(riftsnumvertices[i]-1);j++){
                                 in.segmentlist[2*counter2+0]=counter;
                                 in.segmentlist[2*counter2+1]=counter+1;
@@ -201 +201 @@
         in.holelist = (REAL *) mxMalloc(in.numberofholes * 2 * sizeof(REAL));
         for (i=0;i<nprof-1;i++){
-                /*We are looking for a grid that lies inside the hole: */
-                GridInsideHole(&in.holelist[2*i+0],&in.holelist[2*i+1],profngrids[i+1],pprofx[i+1],pprofy[i+1]);
+                /*We are looking for a vertex that lies inside the hole: */
+                GridInsideHole(&in.holelist[2*i+0],&in.holelist[2*i+1],profnvertices[i+1],pprofx[i+1],pprofy[i+1]);
         }