Changeset 12098

Timestamp:

04/20/12 15:44:32 (13 years ago)

Author:

Mathieu Morlighem

Message:

Removed 'whole' option of DomainOutlineRead (missleading)

Location:

issm/trunk-jpl/src

Files:

• c/modules/Exp2Kmlx/Exp2Kmlx.cpp (modified) (1 diff)
• c/modules/TriMeshx/TriMeshx.cpp (modified) (6 diffs)
• c/shared/Exp/DomainOutlineRead.cpp (modified) (4 diffs)
• c/shared/Exp/DomainOutlineWrite.cpp (modified) (4 diffs)
• c/shared/Exp/exp.h (modified) (1 diff)
• modules/TriMesh/TriMesh.cpp (modified) (1 diff)

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

@@ -61 +61 @@
 /*  read exp file  */
 
-        if (!DomainOutlineRead(&nprof,&pnvert,&pprofx,&pprofy,&closed,filexp,true))
+        if (!DomainOutlineRead(&nprof,&pnvert,&pprofx,&pprofy,&closed,filexp))
                 _error_("Error reading exp file.");
         _printf_(true,"Exp2Kmlx -- Reading %d exp profiles from file \"%s\".\n",nprof,filexp);

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

@@ -46 +46 @@
         for (i=0;i<domain->Size();i++){
                 contour=(Contour*)domain->GetObjectByOffset(i);
-                in.numberofpoints+=contour->nods;
+                in.numberofpoints+=contour->nods-1;
         }
         for (i=0;i<rifts->Size();i++){
@@ -62 +62 @@
         for (i=0;i<domain->Size();i++){
                 contour=(Contour*)domain->GetObjectByOffset(i);
+                for (j=0;j<contour->nods-1;j++){
+                        in.pointlist[2*counter+0]=contour->x[j];
+                        in.pointlist[2*counter+1]=contour->y[j];
+                        counter++;
+                }
+        }
+        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];
@@ -68 +76 @@
                 }
         }
-        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: */
@@ -89 +89 @@
         for (i=0;i<domain->Size();i++){
                 contour=(Contour*)domain->GetObjectByOffset(i);
-                in.numberofsegments+=contour->nods;
+                in.numberofsegments+=contour->nods-1;
         }
         for(i=0;i<rifts->Size();i++){
@@ -103 +103 @@
         for (i=0;i<domain->Size();i++){
                 contour=(Contour*)domain->GetObjectByOffset(i);
-                for (j=0;j<contour->nods-1;j++){
+                for (j=0;j<contour->nods-2;j++){
                         in.segmentlist[2*counter+0]=counter;
                         in.segmentlist[2*counter+1]=counter+1;
@@ -138 +138 @@
                 for (i=0;i<domain->Size()-1;i++){
                         contour=(Contour*)domain->GetObjectByOffset(i+1);
-                        GridInsideHole(&in.holelist[2*i+0],&in.holelist[2*i+1],contour->nods,contour->x,contour->y);
+                        GridInsideHole(&in.holelist[2*i+0],&in.holelist[2*i+1],contour->nods-1,contour->x,contour->y);
                 }
         }

issm/trunk-jpl/src/c/shared/Exp/DomainOutlineRead.cpp

@@ -13 +13 @@
 #include "../../Container/DataSet.h"
 
-int DomainOutlineRead(int* pnprof,int** pprofnvertices,double*** ppprofx,double*** ppprofy,bool** pclosed,char* domainname,bool whole=true){
+int DomainOutlineRead(int* pnprof,int** pprofnvertices,double*** ppprofx,double*** ppprofy,bool** pclosed,char* domainname){
         
         /*indexing: */
@@ -101 +101 @@
                 if((x[0]==x[n-1]) && (y[0]==y[n-1])){
                         cl=true;
-                        if (!whole) {
-                                n=n-1;
-                        }
                 }
 
@@ -125 +122 @@
 }
 
-DataSet* DomainOutlineRead(char* domainname,bool whole=true){
+DataSet* DomainOutlineRead(char* domainname){
 
         /*intermediary: */
@@ -142 +139 @@
         }
         else{
-                DomainOutlineRead(&nprof,&profnvertices,&pprofx, &pprofy, NULL,domainname,whole);
+                DomainOutlineRead(&nprof,&profnvertices,&pprofx, &pprofy, NULL,domainname);
         }
 

issm/trunk-jpl/src/c/shared/Exp/DomainOutlineWrite.cpp

@@ -11 +11 @@
 #include "../Exceptions/exceptions.h"
 
-int DomainOutlineWrite(int nprof,int* profnvertices,double** pprofx,double** pprofy,bool* closed,char* domainname,bool whole=true){
+int DomainOutlineWrite(int nprof,int* profnvertices,double** pprofx,double** pprofy,bool* closed,char* domainname){
 
         
@@ -20 +20 @@
         /*I/O: */
         FILE* fid=NULL;
-
-        /*input: */
-//      int nprof; //number of profiles in the domainname file
-//      int* profnvertices=NULL; //array holding the number of vertices for the nprof profiles
-//      double** pprofx=NULL; //array of profiles x coordinates
-//      double** pprofy=NULL; //array of profiles y coordinates
-//      bool* closed=NULL; //array holding closed flags for the nprof profiles
 
         /*open domain outline file for writing: */
@@ -43 +36 @@
                 
                 /*Write number of profile vertices: */
-                if(closed[counter] && !whole)
-                        fprintf(fid,"%u %s\n",profnvertices[counter]+1,"1.");
-                else
-                        fprintf(fid,"%u %s\n",profnvertices[counter]  ,"1.");
+                fprintf(fid,"%u %s\n",profnvertices[counter]  ,"1.");
         
                 /*Write next line: */
@@ -55 +45 @@
                         fprintf(fid,"%lf\t%lf\n",pprofx[counter][i],pprofy[counter][i]);
                 }
-
-                /*Now check that we are dealing with open contours: */
-                if(closed[counter] && !whole)
-                        fprintf(fid,"%lf\t%lf\n",pprofx[counter][0],pprofy[counter][0]);
 
                 /*Write blank line: */

issm/trunk-jpl/src/c/shared/Exp/exp.h

@@ -13 +13 @@
 int IsOutsidePoly(Vector* in,double* xc,double* yc,int numvertices,double* x,double* y,int i0,int i1, int edgevalue);
 int IsInPolySerial(double* in,double* xc,double* yc,int numvertices,double* x,double* y,int nods, int edgevalue);
-int DomainOutlineWrite(int nprof,int* profnvertices,double** pprofx,double** pprofy,bool* closed,char* domainname,bool whole);
+int DomainOutlineWrite(int nprof,int* profnvertices,double** pprofx,double** pprofy,bool* closed,char* domainname);
 int pnpoly(int npol, double *xp, double *yp, double x, double y, int edgevalue);
 
-int      DomainOutlineRead(int* pnprof,int** pprofnvertices,double*** ppprofx,double*** ppprofy,bool** pclosed,char* domainname,bool whole);
-DataSet* DomainOutlineRead(char* domainname,bool whole);
+int      DomainOutlineRead(int* pnprof,int** pprofnvertices,double*** ppprofx,double*** ppprofy,bool** pclosed,char* domainname);
+DataSet* DomainOutlineRead(char* domainname);
 
 

issm/trunk-jpl/src/modules/TriMesh/TriMesh.cpp

@@ -35 +35 @@
 
         /*Read domain outline: */
-        domain = DomainOutlineRead(domainname,false);
-        rifts  = DomainOutlineRead(riftsname,false);
+        domain = DomainOutlineRead(domainname);
+        rifts  = DomainOutlineRead(riftsname);
 
         /*call x core: */