Changeset 8737

Timestamp:

06/28/11 10:24:16 (14 years ago)

Author:

jschierm

Message:

DomainOutlineRead.cpp: Added closed flag for return and modified functions that called it.

Location:

issm/trunk/src

Files:

• c/modules/Exp2Kmlx/Exp2Kmlx.cpp (modified) (2 diffs)
• c/shared/Exp/DomainOutlineRead.cpp (modified) (7 diffs)
• c/shared/Exp/exp.h (modified) (1 diff)
• mex/TriMesh/TriMesh.cpp (modified) (2 diffs)
• mex/TriMeshNoDensity/TriMeshNoDensity.cpp (modified) (2 diffs)

issm/trunk/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp ¶

@@ -31 +31 @@
         int     *pnvert=NULL;
         double  **pprofx=NULL,**pprofy=NULL;
+        bool    *closed=NULL;
         double  *lat=NULL,*lon=NULL;
 
@@ -52 +53 @@
 /*  read exp file  */
 
-        if (!DomainOutlineRead(&nprof,&pnvert,&pprofx,&pprofy,filexp))
+        if (!DomainOutlineRead(&nprof,&pnvert,&pprofx,&pprofy,&closed,filexp))
                 _error_("Error reading exp file.");
 

issm/trunk/src/c/shared/Exp/DomainOutlineRead.cpp ¶

@@ -11 +11 @@
 #include "../Exceptions/exceptions.h"
 
-int DomainOutlineRead(int* pnprof,int** pprofnvertices,double*** ppprofx,double*** ppprofy,char* domainname){
+int DomainOutlineRead(int* pnprof,int** pprofnvertices,double*** ppprofx,double*** ppprofy,bool** pclosed,char* domainname){
 
         
@@ -29 +29 @@
         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
 
         /*For each profile: */
@@ -34 +35 @@
         double* x=NULL;
         double* y=NULL;
+        bool cl;
 
         /*open domain outline file for reading: */
@@ -68 +70 @@
                 pprofy[i]=NULL;
         }
+        closed=(bool*)xmalloc(nprof*sizeof(bool));
 
         /*Reaset file pointer to beginning of file: */
@@ -97 +100 @@
 
                 /*Now check that we are dealing with open contours: */
+                cl=false;
                 if((x[0]==x[n-1]) && (y[0]==y[n-1])){
                         n=n-1;
+                        cl=true;
                 }
 
@@ -105 +110 @@
                 pprofx[counter]=x;
                 pprofy[counter]=y;
+                closed[counter]=cl;
         }
 
@@ -123 +129 @@
         *ppprofx=pprofx;
         *ppprofy=pprofy;
+        if(pclosed)*pclosed=closed;
+        else       xfree((void**)&closed);
         return noerr;
 }

issm/trunk/src/c/shared/Exp/exp.h ¶

@@ -12 +12 @@
 int IsOutsidePoly(Vec 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 DomainOutlineRead(int* pnprof,int** pprofnvertices,double*** ppprofx,double*** ppprofy,char* domainname);
+int DomainOutlineRead(int* pnprof,int** pprofnvertices,double*** ppprofx,double*** ppprofy,bool** pclosed,char* domainname);
 int pnpoly(int npol, double *xp, double *yp, double x, double y, int edgevalue);
 

issm/trunk/src/mex/TriMesh/TriMesh.cpp ¶

@@ -96 +96 @@
         
         /*Start reading the domain outline file: */
-        if(!DomainOutlineRead(&nprof,&profnvertices,&pprofx,&pprofy,domainname)){
+        if(!DomainOutlineRead(&nprof,&profnvertices,&pprofx,&pprofy,NULL,domainname)){
                 printf("%s%s%s\n",__FUNCT__," error message reading domain outline ",domainname);
                 mexErrMsgTxt(" ");
@@ -103 +103 @@
         /*Read rifts file if present: */
         if(riftname){
-                if(!DomainOutlineRead(&numrifts,&riftsnumvertices,&riftsverticesx,&riftsverticesy,riftname)){
+                if(!DomainOutlineRead(&numrifts,&riftsnumvertices,&riftsverticesx,&riftsverticesy,NULL,riftname)){
                         printf("%s%s%s\n",__FUNCT__," error message reading rifts outline ",riftname);
                         mexErrMsgTxt(" ");

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

@@ -86 +86 @@
         
         /*Start reading the domain outline file: */
-        if(!DomainOutlineRead(&nprof,&profnvertices,&pprofx,&pprofy,domainname)){
+        if(!DomainOutlineRead(&nprof,&profnvertices,&pprofx,&pprofy,NULL,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,&riftsnumvertices,&riftsverticesx,&riftsverticesy,riftname)){
+                if(!DomainOutlineRead(&numrifts,&riftsnumvertices,&riftsverticesx,&riftsverticesy,NULL,riftname)){
                         printf("%s%s%s\n",__FUNCT__," error message reading rifts outline ",riftname);
                         mexErrMsgTxt(" ");