Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exp/exp.h
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exp/exp.h	(revision 13356)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exp/exp.h	(revision 13357)
@@ -69,26 +69,24 @@
 	double  ddummy;
 
 	/*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: */
 	if ((fid=fopen(domainname,"r"))==NULL){
 		_error_("could not find domain file " << domainname); 
 	}
 
-	/*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(;;){
 		fscanf(fid,"%256s %256s\n",chardummy,chardummy);
@@ -96,23 +94,19 @@
 		fscanf(fid,"%256s %256s %256s %256s\n",chardummy,chardummy,chardummy,chardummy);
 		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);
 
@@ -139,8 +133,7 @@
 		
 		/*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]);
 		}
 
 		/*Now check that we are dealing with open contours: */
@@ -164,10 +157,8 @@
 	*pprofnvertices=profnvertices;
 	*ppprofx=pprofx;
 	*ppprofy=pprofy;
-	if(pclosed)
-	 *pclosed=closed;
-	else
-	 xDelete<bool>(closed);
+	if(pclosed) *pclosed=closed;
+	else         xDelete<bool>(closed);
 } /*}}}*/
 /*DataSet* DomainOutlineRead(char* domainname){{{*/
 template <class doubletype>