source: issm/oecreview/Archive/18296-19100/ISSM-18478-18479.diff

../trunk-jpl/src/m/contrib/gravity/vfsa_mpi.cpp

@@ -146 +146 @@
         MPI_Comm_rank(MPI_COMM_WORLD,&my_rank);
 
         /* Seed the random number generator {{{*/
-        srand (time(NULL));               /*}}}*/
+                srand (time(NULL));            /*}}}*/
         /* Define the variables {{{*/
 
         int    dx     = 500;   /* prism dimension in x-direction                           */
@@ -443 +443 @@
         /*GSL Matrices and vectors: */
         int    M,N;
         double chisq;
-
         /*Get system size*/
         A->GetSize(&M,&N);
 
@@ -532 +531 @@
         bool test=true;
 
         double *glocal=new double[n]();
-        double *gcalc=new double[n]();
 
         for(int c=my_rank;c<n;c+=num_procs){
                 glocal[c]=0;
@@ -566 +564 @@
                                 for(int i=0;i<2;i++){
                                         si*=-1;
                                         for(int j=0;j<2;j++){
-                                                si*=-1;
+                                                sj*=-1;
                                                 s=si*sj;
                                                 for(int k=0;k<l;k++){
                                                         R=sqrt(xp->GetValue(0,i)*xp->GetValue(0,i)+yp->GetValue(0,j)*yp->GetValue(0,j)+mesh->GetValue(a,k)*mesh->GetValue(a,k));
@@ -587 +585 @@
                 }
         }
 
-        MPI_Allreduce(glocal,gcalc,n,MPI_DOUBLE,MPI_SUM,MPI_COMM_WORLD);
-        if(!my_rank){for(int c=0;c<n;c++){
-                g->SetValue(c,0,gcalc[c]);
-        }
-        }
+        MPI_Allreduce(glocal,g->GetPointer(),n,MPI_DOUBLE,MPI_SUM,MPI_COMM_WORLD);
 
         delete xp;
         delete yp;
@@ -602 +596 @@
         delete U1;
         delete U2;
         delete []glocal;
-        delete []gcalc;
 }/*}}}*/
 void vec2gridsimple(Matrix *V,Matrix *V1,int nx, int ny){/*{{{*/
         for(int i=0;i<ny;i++){