Changeset 13376

Timestamp:

09/14/12 16:29:23 (13 years ago)

Author:

Mathieu Morlighem

Message:

BUG: Fixed parallel kriging with new iomodel->dependents

Location:

issm/trunk-jpl/src/c

Files:

• classes/IoModel.cpp (modified) (1 diff)
• modules/Krigingx/pKrigingx.cpp (modified) (3 diffs)
• solutions/kriging.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/IoModel.cpp

@@ -714 +714 @@
                 #endif
 
+                _assert_(this->independents);
                 if (this->independents[data_enum]){
                         /*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

@@ -56 +56 @@
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _pprintString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");
+                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");
                         observations->InterpolationKriging(&predictions[idx],&error[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,variogram);
                 }
-                _pprintLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
+                _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
 
 #ifdef _HAVE_MPI_
@@ -74 +74 @@
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _pprintString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");
+                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");
                         observations->InterpolationNearestNeighbor(&predictions[idx],x_interp[idx],y_interp[idx],radius);
                 }
-                _pprintLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
+                _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
 
 #ifdef _HAVE_MPI_
@@ -91 +91 @@
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _pprintString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");
+                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");
                         observations->InterpolationIDW(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,power);
                 }
-                _pprintLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
+                _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
 
 #ifdef _HAVE_MPI_

issm/trunk-jpl/src/c/solutions/kriging.cpp

@@ -118 +118 @@
 
 void ProcessArguments2(char** pbinfilename,char** poutbinfilename,char** plockfilename,char** prootpath,int argc,char **argv){
-
         char *modelname      = NULL;
         char *binfilename    = NULL;
@@ -154 +153 @@
         *plockfilename=lockfilename;
         *prootpath=rootpath;
-
 }
 
@@ -172 +170 @@
         iomodel->fid=fid;
         iomodel->CheckEnumSync();
+        iomodel->independents=xNew<bool>(MaximumNumberOfEnums); for(int i=0;i<MaximumNumberOfEnums;i++) iomodel->independents[i]=false;
         iomodel->FetchData(&x,&M,&N,0);        nobs=M*N;
         iomodel->FetchData(&y,&M,&N,1);        _assert_(M*N==nobs);