source: issm/oecreview/Archive/13393-13976/ISSM-13600-13601.diff@ 14312

../trunk-jpl/src/c/toolkits/petsc/patches/MatToSerial.cpp

@@ -15 +15 @@
 void MatToSerial(double** poutmatrix,Mat matrix,COMM comm){
 
         int i;
-        extern int my_rank;
-        extern int num_procs;
+        int my_rank2;
+        int num_procs2;
         
         /*Petsc variables*/
         PetscInt lower_row,upper_row; 
@@ -28 +28 @@
         double* local_matrix=NULL; /*matrix local to each node used for temporary holding matrix values*/
         int buffer[3];
         
+        /*recover my_rank2 and num_procs2:*/
+        MPI_Comm_size(comm,&num_procs2);
+        MPI_Comm_rank(comm,&my_rank2);
+
         /*Output*/
         double* outmatrix=NULL;
         
@@ -40 +44 @@
         range=upper_row-lower_row+1;
         
         /*Local and global allocation*/
-        if (my_rank==0)outmatrix=xNew<double>(M*N);
+        if (my_rank2==0)outmatrix=xNew<double>(M*N);
         
         if (range){
                 local_matrix=xNew<double>(N*range);
@@ -60 +64 @@
         /*Now each node holds its local_matrix containing range rows. 
          * We send these rows to the matrix on node 0*/
         
-        for (i=1;i<num_procs;i++){
-                if (my_rank==i){ 
-                        buffer[0]=my_rank;
+        for (i=1;i<num_procs2;i++){
+                if (my_rank2==i){ 
+                        buffer[0]=my_rank2;
                         buffer[1]=lower_row;
                         buffer[2]=range;
                         MPI_Send(buffer,3,MPI_INT,0,1,comm);   
                         if (range)MPI_Send(local_matrix,N*range,MPI_DOUBLE,0,1,comm); 
                 }
-                if (my_rank==0){
+                if (my_rank2==0){
                         MPI_Recv(buffer,3,MPI_INT,i,1,comm,&status); 
                         if (buffer[2])MPI_Recv(outmatrix+(buffer[1]*N),N*buffer[2],MPI_DOUBLE,i,1,comm,&status);
                 }
         } 
-        if (my_rank==0){ 
+        if (my_rank2==0){ 
                 //Still have the local_matrix on node 0 to take care of.
                 memcpy(outmatrix,local_matrix,N*range*sizeof(double));
         } 

../trunk-jpl/src/c/toolkits/petsc/patches/VecToMPISerial.cpp

@@ -15 +15 @@
 int VecToMPISerial(double** pgathered_vector, Vec vector,COMM comm){
         
         int i;
-        extern int num_procs; 
-        extern int my_rank;
+        int num_procs2; 
+        int my_rank2;
 
         /*Petsc*/
         MPI_Status status;
@@ -33 +33 @@
         
         /*Output*/
         double* gathered_vector=NULL; //Global vector holding the final assembled vector on all nodes.
+        
+        /*recover my_rank2 and num_procs2*/
+        MPI_Comm_size(comm,&num_procs2);
+        MPI_Comm_rank(comm,&my_rank2);
 
         VecGetSize(vector,&vector_size);
         if(vector_size==0){
@@ -60 +64 @@
 
         /*Now each node holds its local_vector containing range rows. 
          * We send this local_vector  to the gathered_vector on node 0*/
-        for (i=1;i<num_procs;i++){
-                if (my_rank==i){ 
-                        buffer[0]=my_rank;
+        for (i=1;i<num_procs2;i++){
+                if (my_rank2==i){ 
+                        buffer[0]=my_rank2;
                         buffer[1]=lower_row;
                         buffer[2]=range;
                         MPI_Send(buffer,3,MPI_INT,0,1,comm);  
                         if (range)MPI_Send(local_vector,range,MPI_DOUBLE,0,1,comm); 
                 }
-                if (my_rank==0){
+                if (my_rank2==0){
                         MPI_Recv(buffer,3,MPI_INT,i,1,comm,&status); 
                         if (buffer[2])MPI_Recv(gathered_vector+buffer[1],buffer[2],MPI_DOUBLE,i,1,comm,&status);
                 }
         }
 
-        if (my_rank==0){ 
+        if (my_rank2==0){ 
                 //Still have the local_vector on node 0 to take care of.
                 if (range)memcpy(gathered_vector+lower_row,local_vector,range*sizeof(double));
         }

../trunk-jpl/src/c/toolkits/petsc/patches/GetOwnershipBoundariesFromRange.cpp

@@ -16 +16 @@
 void GetOwnershipBoundariesFromRange(int* plower_row,int* pupper_row,int range,COMM comm){
 
         /*externals :*/
-        extern int my_rank;
-        extern int num_procs;
+        int my_rank2;
+        int num_procs2;
         
+        /*recover my_rank2 and num_procs2:*/
+        MPI_Comm_size(comm,&num_procs2);
+        MPI_Comm_rank(comm,&my_rank2);
+
         /*output: */
         int lower_row,upper_row;
         
@@ -27 +31 @@
         int* allranges=NULL;
 
         /*Gather all range values into allranges, for all nodes*/
-        allranges=xNew<int>(num_procs);
+        allranges=xNew<int>(num_procs2);
         MPI_Allgather(&range,1,MPI_INT,allranges,1,MPI_INT,comm);
 
         /*From all ranges, get lower row and upper row*/
         lower_row=0;
         upper_row=lower_row+allranges[0];
-        for (i=1;i<=my_rank;i++){
+        for (i=1;i<=my_rank2;i++){
                 lower_row=lower_row+allranges[i-1];
                 upper_row=upper_row+allranges[i];
         }