Changeset 12595

Timestamp:

07/02/12 10:30:53 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixing initialization of string options

Location:

issm/trunk-jpl/src/c

Files:

• matlab/io/MatlabNArrayToNArray.cpp (modified) (4 diffs)
• modules/Krigingx/Krigingx.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp

@@ -176 +176 @@
 int MatlabNArrayToNArray(char** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){
 
-        int  i,j,rows,cols;
-        int  numel,ndims;
-        int *size,*dims;
-        mxChar* mxmatrix_ptr=NULL;
-        const mwSize* ipt=NULL;
+        int           i,j,rows,cols;
+        int           numel,ndims;
+        int          *size , *dims;
+        mxChar       *mxmatrix_ptr = NULL;
+        const mwSize *ipt          = NULL;
 
         /*output: */
@@ -186 +186 @@
 
         /*matlab indices: */
-        mwIndex*    ir=NULL;
-        mwIndex*    jc=NULL;
-        char*   pm=NULL;
-        int     count;
-        int     nnz;
-        int     nz;
+        mwIndex *ir    = NULL;
+        mwIndex *jc    = NULL;
+        char    *pm    = NULL;
+        int      count;
+        int      nnz;
+        int      nz;
 
         /*get Matlab matrix information: */
@@ -233 +233 @@
                 /*Create serial matrix: */
                 matrix=xNew<char>(numel+1);
+                matrix[numel]='\0';
 
                 /*looping code adapted from Matlab example explore.c: */
@@ -257 +258 @@
                         }
                 }
-
         }
 

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

@@ -190 +190 @@
                 localpercent=percent[0];
                 for(int i=1;i<num_threads;i++) localpercent=min(localpercent,percent[i]);
-                _printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%");
+                if(my_thread==0) _printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%");
 
                 /*Kriging interpolation*/
@@ -239 +239 @@
                 localpercent=percent[0];
                 for(i=1;i<num_threads;i++) localpercent=min(localpercent,percent[i]);
-                _printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%");
+                if(my_thread==0) _printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%");
 
                 observations->InterpolationNearestNeighbor(&predictions[idx],x_interp[idx],y_interp[idx],radius);
@@ -287 +287 @@
                 localpercent=percent[0];
                 for(int i=1;i<num_threads;i++) localpercent=min(localpercent,percent[i]);
-                _printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%");
+                if(my_thread==0) _printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%");
 
                 observations->InterpolationIDW(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,power);