Changeset 13376
- Timestamp:
- 09/14/12 16:29:23 (13 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/classes/IoModel.cpp
r13283 r13376 714 714 #endif 715 715 716 _assert_(this->independents); 716 717 if (this->independents[data_enum]){ 717 718 /*this data has already been checked out! So cancel all that we've done here, and return -
issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp
r13216 r13376 56 56 /*partition loop across threads: */ 57 57 for(int idx=my_rank;idx<n_interp;idx+=num_procs){ 58 _pprint String_("\rinterpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");58 _pprintLine_(" interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%"); 59 59 observations->InterpolationKriging(&predictions[idx],&error[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,variogram); 60 60 } 61 _pprintLine_(" \rinterpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");61 _pprintLine_(" interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%"); 62 62 63 63 #ifdef _HAVE_MPI_ … … 74 74 /*partition loop across threads: */ 75 75 for(int idx=my_rank;idx<n_interp;idx+=num_procs){ 76 _pprint String_("\rinterpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");76 _pprintLine_(" interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%"); 77 77 observations->InterpolationNearestNeighbor(&predictions[idx],x_interp[idx],y_interp[idx],radius); 78 78 } 79 _pprintLine_(" \rinterpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");79 _pprintLine_(" interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%"); 80 80 81 81 #ifdef _HAVE_MPI_ … … 91 91 /*partition loop across threads: */ 92 92 for(int idx=my_rank;idx<n_interp;idx+=num_procs){ 93 _pprint String_("\rinterpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");93 _pprintLine_(" interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%"); 94 94 observations->InterpolationIDW(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,power); 95 95 } 96 _pprintLine_(" \rinterpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");96 _pprintLine_(" interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%"); 97 97 98 98 #ifdef _HAVE_MPI_ -
issm/trunk-jpl/src/c/solutions/kriging.cpp
r13325 r13376 118 118 119 119 void ProcessArguments2(char** pbinfilename,char** poutbinfilename,char** plockfilename,char** prootpath,int argc,char **argv){ 120 121 120 char *modelname = NULL; 122 121 char *binfilename = NULL; … … 154 153 *plockfilename=lockfilename; 155 154 *prootpath=rootpath; 156 157 155 } 158 156 … … 172 170 iomodel->fid=fid; 173 171 iomodel->CheckEnumSync(); 172 iomodel->independents=xNew<bool>(MaximumNumberOfEnums); for(int i=0;i<MaximumNumberOfEnums;i++) iomodel->independents[i]=false; 174 173 iomodel->FetchData(&x,&M,&N,0); nobs=M*N; 175 174 iomodel->FetchData(&y,&M,&N,1); _assert_(M*N==nobs);
Note:
See TracChangeset
for help on using the changeset viewer.