Changeset 1192

Timestamp:

07/01/09 08:09:42 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor: only display interpolation progress number of iterations>=e+9

Location:

issm/trunk/src/c

Files:

• InterpFromMesh2dx/InterpFromMesh2dx.cpp (modified) (4 diffs)
• InterpFromMesh3dx/InterpFromMesh3dx.cpp (modified) (4 diffs)

issm/trunk/src/c/InterpFromMesh2dx/InterpFromMesh2dx.cpp

@@ -17 +17 @@
         int i,j;
         int interpolation_type;
+        bool debug;
         double area;
         double area_1,area_2,area_3;
@@ -27 +28 @@
                 throw ErrorException(__FUNCT__,"nothing to be done according to the mesh given in input");
         }
+
+        /*Set debug to 1 if there are lots of elements*/
+        debug=(bool)((double)nels_data*(double)nods_prime >= pow(10,9));
 
         /*figure out what kind of interpolation is needed*/
@@ -53 +57 @@
 
         /*Loop over the elements*/
-        printf("\n      interpolation progress:   %5.2lf %%",0.0);
+        if (debug) printf("\n      interpolation progress:   %5.2lf %%",0.0);
         for (i=0;i<nels_data;i++){
 
                 /*display current iteration*/
-                if (fmod(i,100)==0){
-                        printf("\b\b\b\b\b\b\b%5.2lf %%",(double)i/nels_data*100);
-                }
+                if (debug && fmod(i,100)==0) printf("\b\b\b\b\b\b\b%5.2lf %%",(double)i/nels_data*100);
 
                 /*if there is no point inside the domain, go to next iteration*/
@@ -104 +106 @@
                 }
         }
-        printf("\b\b\b\b\b\b\b%5.2lf %%\n",100.0);
+         if (debug) printf("\b\b\b\b\b\b\b%5.2lf %%\n",100.0);
 
         /*Assign output pointers:*/

issm/trunk/src/c/InterpFromMesh3dx/InterpFromMesh3dx.cpp

@@ -17 +17 @@
         int i,j;
         int interpolation_type;
+        bool debug;
         double area;
         double area_1,area_2,area_3;
@@ -28 +29 @@
                 throw ErrorException(__FUNCT__,"nothing to be done according to the mesh given in input");
         }
+
+        /*Set debug to 1 if there are lots of elements*/
+        debug=(bool)((double)nels_data*(double)nods_prime >= pow(10,9));
 
         /*figure out what kind of interpolation is needed*/
@@ -54 +58 @@
 
         /*Loop over the elements*/
-        printf("\n      interpolation progress:   %5.2lf %%",0.0);
+        if (debug) printf("\n      interpolation progress:   %5.2lf %%",0.0);
         for (i=0;i<nels_data;i++){
 
                 /*display current iteration*/
-                if (fmod(i,100)==0){
-                        printf("\b\b\b\b\b\b\b%5.2lf %%",(double)i/nels_data*100);
-                }
+                if (debug && fmod(i,100)==0) printf("\b\b\b\b\b\b\b%5.2lf %%",(double)i/nels_data*100);
 
                 /*if there is no point inside the domain, go to next iteration*/
@@ -114 +116 @@
                 }
         }
-        printf("\b\b\b\b\b\b\b%5.2lf %%\n",100.0);
+        if (debug) printf("\b\b\b\b\b\b\b%5.2lf %%\n",100.0);
 
         /*Assign output pointers:*/