Changeset 18479

Timestamp:

09/02/14 16:35:51 (11 years ago)

Author:

abuzzi

Message:

CHG: final version parallelized code

File:

• issm/trunk-jpl/src/m/contrib/gravity/vfsa_mpi.cpp (modified) (6 diffs)

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

@@ -147 +147 @@
 
         /* Seed the random number generator {{{*/
-        srand (time(NULL));               /*}}}*/
+                srand (time(NULL));            /*}}}*/
         /* Define the variables {{{*/
 
@@ -444 +444 @@
         int    M,N;
         double chisq;
-
         /*Get system size*/
         A->GetSize(&M,&N);
@@ -533 +532 @@
 
         double *glocal=new double[n]();
-        double *gcalc=new double[n]();
 
         for(int c=my_rank;c<n;c+=num_procs){
@@ -567 +565 @@
                                         si*=-1;
                                         for(int j=0;j<2;j++){
-                                                si*=-1;
+                                                sj*=-1;
                                                 s=si*sj;
                                                 for(int k=0;k<l;k++){
@@ -588 +586 @@
         }
 
-        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;
@@ -603 +597 @@
         delete U2;
         delete []glocal;
-        delete []gcalc;
 }/*}}}*/
 void vec2gridsimple(Matrix *V,Matrix *V1,int nx, int ny){/*{{{*/