Changeset 13601

Timestamp:

10/10/12 22:53:28 (12 years ago)

Author:

Eric.Larour

Message:

CHG: more changes to switch from my_rank and num_procs to IssmComm::GetSize and IssmComm::GetRank

Location:

issm/trunk-jpl/src/c/toolkits/petsc/patches

Files:

• GetOwnershipBoundariesFromRange.cpp (modified) (3 diffs)
• MatToSerial.cpp (modified) (5 diffs)
• VecToMPISerial.cpp (modified) (5 diffs)

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

@@ -17 +17 @@
 
         /*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;
@@ -28 +32 @@
 
         /*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);
 
@@ -34 +38 @@
         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];

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

@@ -16 +16 @@
 
         int i;
-        extern int my_rank;
-        extern int num_procs;
+        int my_rank2;
+        int num_procs2;
         
         /*Petsc variables*/
@@ -29 +29 @@
         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;
@@ -41 +45 @@
         
         /*Local and global allocation*/
-        if (my_rank==0)outmatrix=xNew<double>(M*N);
+        if (my_rank2==0)outmatrix=xNew<double>(M*N);
         
         if (range){
@@ -61 +65 @@
          * 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;
@@ -69 +73 @@
                         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));

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

@@ -16 +16 @@
         
         int i;
-        extern int num_procs; 
-        extern int my_rank;
+        int num_procs2; 
+        int my_rank2;
 
         /*Petsc*/
@@ -34 +34 @@
         /*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);
@@ -61 +65 @@
         /*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;
@@ -69 +73 @@
                         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);
@@ -75 +79 @@
         }
 
-        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));