Changeset 12595
- Timestamp:
- 07/02/12 10:30:53 (13 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp
r12446 r12595 176 176 int MatlabNArrayToNArray(char** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){ 177 177 178 int i,j,rows,cols;179 int numel,ndims;180 int *size,*dims;181 mxChar * mxmatrix_ptr=NULL;182 const mwSize * ipt=NULL;178 int i,j,rows,cols; 179 int numel,ndims; 180 int *size , *dims; 181 mxChar *mxmatrix_ptr = NULL; 182 const mwSize *ipt = NULL; 183 183 184 184 /*output: */ … … 186 186 187 187 /*matlab indices: */ 188 mwIndex * ir=NULL;189 mwIndex * jc=NULL;190 char * pm=NULL;191 int count;192 int nnz;193 int nz;188 mwIndex *ir = NULL; 189 mwIndex *jc = NULL; 190 char *pm = NULL; 191 int count; 192 int nnz; 193 int nz; 194 194 195 195 /*get Matlab matrix information: */ … … 233 233 /*Create serial matrix: */ 234 234 matrix=xNew<char>(numel+1); 235 matrix[numel]='\0'; 235 236 236 237 /*looping code adapted from Matlab example explore.c: */ … … 257 258 } 258 259 } 259 260 260 } 261 261 -
issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp
r12511 r12595 190 190 localpercent=percent[0]; 191 191 for(int i=1;i<num_threads;i++) localpercent=min(localpercent,percent[i]); 192 _printString_("\r interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%");192 if(my_thread==0) _printString_("\r interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%"); 193 193 194 194 /*Kriging interpolation*/ … … 239 239 localpercent=percent[0]; 240 240 for(i=1;i<num_threads;i++) localpercent=min(localpercent,percent[i]); 241 _printString_("\r interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%");241 if(my_thread==0) _printString_("\r interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%"); 242 242 243 243 observations->InterpolationNearestNeighbor(&predictions[idx],x_interp[idx],y_interp[idx],radius); … … 287 287 localpercent=percent[0]; 288 288 for(int i=1;i<num_threads;i++) localpercent=min(localpercent,percent[i]); 289 _printString_("\r interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%");289 if(my_thread==0) _printString_("\r interpolation progress: "<<setw(6)<<setprecision(2)<<localpercent<<"%"); 290 290 291 291 observations->InterpolationIDW(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,power);
Note:
See TracChangeset
for help on using the changeset viewer.