Changeset 13357

Timestamp:

09/13/12 11:10:43 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cosmetics

File:

• issm/trunk-jpl/src/c/shared/Exp/exp.h (modified) (5 diffs)

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

@@ -70 +70 @@
 
         /*output: */
-        int      nprof;                //number of profiles in the domainname file
-        int     *profnvertices = NULL; //array holding the number of vertices for the nprof profiles
+        int          nprof;                //number of profiles in the domainname file
+        int         *profnvertices = NULL; //array holding the number of vertices for the nprof profiles
         doubletype **pprofx        = NULL; //array of profiles x coordinates
         doubletype **pprofy        = NULL; //array of profiles y coordinates
-        bool    *closed        = NULL; //array holding closed flags for the nprof profiles
+        bool        *closed        = NULL; //array holding closed flags for the nprof profiles
 
         /*For each profile: */
-        int     n;
+        int         n;
         doubletype *x  = NULL;
         doubletype *y  = NULL;
-        double  xi,yi;
-        bool    cl;
+        bool        cl;
 
         /*open domain outline file for reading: */
@@ -88 +87 @@
         }
 
-        /*Do a first pass through the domainname file, to figure out how many profiles 
-         *we need to read: */
+        /*Do a first pass through the domainname file, to figure out how many profiles we need to read: */
         nprof=1;
         for(;;){
@@ -97 +95 @@
                 fscanf(fid,"%20u %256s\n",&n,chardummy);
                 fscanf(fid,"%256s %256s %256s %256s %256s\n",chardummy,chardummy,chardummy,chardummy,chardummy);
-                for (i=0;i<n;i++){
-                        fscanf(fid,"%20lf %20lf\n",&ddummy,&ddummy);
-                }
-                /*Ok, we have faked one profile reading, check whether we are at the end of the file, otherwise, keep fake reading next profile:*/
-                if (feof(fid)){
-                        break;
-                }
+                for (i=0;i<n;i++) fscanf(fid,"%20lf %20lf\n",&ddummy,&ddummy);
+                /*check whether we are at the end of the file, otherwise, keep reading next profile:*/
+                if (feof(fid)) break;
                 nprof++;
         }
         
         /*Allocate and initialize all the profiles: */
-        profnvertices=xNew<int>(nprof);
-        pprofx=xNew<doubletype*>(nprof);
-        pprofy=xNew<doubletype*>(nprof);
+        profnvertices = xNew<int>(nprof);
+        pprofx        = xNew<doubletype*>(nprof);
+        pprofy        = xNew<doubletype*>(nprof);
         for (i=0;i<nprof;i++){
-                pprofx[i]=NULL;
-                pprofy[i]=NULL;
+                pprofx[i] = NULL;
+                pprofy[i] = NULL;
         }
         closed=xNew<bool>(nprof);
@@ -140 +134 @@
                 /*Read vertices: */
                 for (i=0;i<n;i++){
-                        fscanf(fid,"%20lf %20lf\n",&xi,&yi);
-                        x[i]=xi; y[i]=yi;
+                        fscanf(fid,"%20lf %20lf\n",&x[i],&y[i]);
                 }
 
@@ -165 +158 @@
         *ppprofx=pprofx;
         *ppprofy=pprofy;
-        if(pclosed)
-         *pclosed=closed;
-        else
-         xDelete<bool>(closed);
+        if(pclosed) *pclosed=closed;
+        else         xDelete<bool>(closed);
 } /*}}}*/
 /*DataSet* DomainOutlineRead(char* domainname){{{*/