Changeset 12381

Timestamp:

06/07/12 08:29:08 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed parallel Kriging module

Location:

issm/trunk-jpl/src

Files:

• c/solutions/kriging.cpp (modified) (1 diff)
• m/utils/DataProcessing/pkriging.m (modified) (1 diff)

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

@@ -69 +69 @@
 
         _printf_(true,"write results to disk:\n");
-        output_fid=pfopen(outbinfilename,"wb");
         Results *results = new Results();
-        results->AddObject(new DoubleVecExternalResult(results->Size()+1,0,predictions,ninterp,1,0));
-        results->AddObject(new DoubleVecExternalResult(results->Size()+1,0,error,ninterp,1,0));
-        for(int i=0;i<results->Size();i++){
-                ExternalResult* result=(ExternalResult*)results->GetObjectByOffset(i);
-                result->WriteData(output_fid,1);
-        }
-        pfclose(output_fid,outbinfilename);
+        if(my_rank==0){
+                output_fid=pfopen(outbinfilename,"wb");
+                results->AddObject(new DoubleVecExternalResult(results->Size()+1,0,predictions,ninterp,1,0));
+                results->AddObject(new DoubleVecExternalResult(results->Size()+1,1,error,ninterp,1,0));
+                for(int i=0;i<results->Size();i++){
+                        ExternalResult* result=(ExternalResult*)results->GetObjectByOffset(i);
+                        result->WriteData(output_fid,1);
+                }
+                pfclose(output_fid,outbinfilename);
+        }
 
         /*Close output and petsc options file and write lock file if requested*/

issm/trunk-jpl/src/m/utils/DataProcessing/pkriging.m

@@ -39 +39 @@
 %Process results
 structure=parseresultsfromdisk([name '.outbin'],0);
-B=structure.AutodiffForward(1:length(structure.AutodiffForward)/2);
+B=structure.AutodiffForward;
 B=reshape(B,size(x_interp,1),size(x_interp,2));
-E=structure.AutodiffForward(length(structure.AutodiffForward)/2+1:end);
+E=structure.AutodiffIsautodiff;
 E=reshape(E,size(x_interp,1),size(x_interp,2));