Changeset 13555

Timestamp:

10/05/12 16:08:28 (12 years ago)

Author:

Eric.Larour

Message:

CHG: MPI_Upperrow, MPI_Boundariesfromrange and MPI_Upperrow not needed anymore. This is dead code.

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• toolkits/mpi/patches/DetermineLocalSize.cpp (modified) (2 diffs)
• toolkits/mpi/patches/MPI_Boundariesfromrange.cpp (deleted)
• toolkits/mpi/patches/MPI_Lowerrow.cpp (deleted)
• toolkits/mpi/patches/MPI_Upperrow.cpp (deleted)
• toolkits/mpi/patches/mpipatches.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -793 +793 @@
 mpi_sources= ./toolkits/mpi/mpiincludes.h\
                                 ./toolkits/mpi/patches/mpipatches.h\
-                                ./toolkits/mpi/patches/DetermineLocalSize.cpp\
-                                ./toolkits/mpi/patches/MPI_Upperrow.cpp\
-                                ./toolkits/mpi/patches/MPI_Lowerrow.cpp\
-                                ./toolkits/mpi/patches/MPI_Boundariesfromrange.cpp
+                                ./toolkits/mpi/patches/DetermineLocalSize.cpp
 #}}}
 #Metis sources  {{{

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

@@ -7 +7 @@
 #include "../../../shared/shared.h"
 
-int DetermineLocalSize(int global_size){
+int DetermineLocalSize(int global_size,MPI_Comm comm){
+
+        /*size of comm: */
+        int my_rank,num_procs;
 
         /*output: */
@@ -17 +20 @@
         int* num_local_rows=NULL;
 
-        /*from MPI: */
-        extern int num_procs;
-        extern int my_rank;
-        
+        /*retrieve my_rank: */
+        #ifdef _HAVE_MPI_
+        MPI_Comm_rank(comm,&my_rank);
+        MPI_Comm_size(comm,&num_procs);
+        #else
+        my_rank=0;
+        num_procs=1;
+        #endif
+
         /*We are  not bound by any library, just use what seems most logical*/
         num_local_rows=xNew<int>(num_procs);    

issm/trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h

@@ -6 +6 @@
 #ifndef MPI_PATCHES_H_ 
 #define MPI_PATCHES_H_
-
-
-int MPI_Boundariesfromrange(int* plower_row, int* pupper_row,int range);
-int MPI_Lowerrow(int n);
-int MPI_Upperrow(int n);
-int DetermineLocalSize(int global_size);
-
-
-
-
+int DetermineLocalSize(int global_size,MPI_Comm comm);
 #endif