Changeset 13975 for issm/trunk/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/toolkits/mpi/patches/DetermineLocalSize.cpp (modified) (4 diffs)

issm/trunk/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp

@@ -6 +6 @@
 #include <math.h>
 #include "../../../shared/shared.h"
+#include "../../../include/types.h"
 
-int DetermineLocalSize(int global_size){
+int DetermineLocalSize(int global_size,COMM comm){
 
         /*output: */
@@ -18 +19 @@
 
         /*from MPI: */
-        extern int num_procs;
-        extern int my_rank;
-        
+        int num_procs;
+        int my_rank;
+
+        /*recover my_rank*/
+        MPI_Comm_rank(comm,&my_rank);
+        MPI_Comm_size(comm,&num_procs);
+
         /*We are  not bound by any library, just use what seems most logical*/
         num_local_rows=xNew<int>(num_procs);    
@@ -30 +35 @@
                 num_local_rows[i]=(int)floor((double)global_size/(double)num_procs); 
         }
-        
+
         /*There may be some rows left. Distribute evenly.*/ 
         row_rest=global_size - num_procs*(int)floor((double)global_size/(double)num_procs);
@@ -37 +42 @@
         }
         local_size=num_local_rows[my_rank];
-        
+
         /*free ressources: */
         xDelete<int>(num_local_rows);