Changeset 13609

Timestamp:

10/10/12 23:53:10 (12 years ago)

Author:

Eric.Larour

Message:

CHG: final transition from extern my_rank and num_procs to IssmComm static class object.

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (2 diffs)
• classes/Patch.cpp (modified) (5 diffs)
• classes/classes.h (modified) (1 diff)
• classes/objects/ExternalResults/GenericExternalResult.h (modified) (4 diffs)
• include/globals.h (modified) (1 diff)
• io/PrintfFunction.cpp (modified) (4 diffs)
• matlab/io/PrintfFunction.cpp (modified) (2 diffs)
• modules/OutputResultsx/OutputResultsx.cpp (modified) (5 diffs)
• solutions/dakota_core.cpp (modified) (2 diffs)
• solutions/issm.cpp (modified) (1 diff)
• solutions/kriging.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp ¶

@@ -84 +84 @@
         FILE       *petscoptionsfid = NULL;
         FILE       *output_fid = NULL;
-        extern int  my_rank;
+        int         my_rank2;
+        
+        /*recover my_rank2:*/
+        my_rank2=IssmComm::GetRank();
 
         /*Open input file on cpu 0: */
-        if(my_rank==0) IOMODEL = pfopen(inputfilename ,"rb");
+        if(my_rank2==0) IOMODEL = pfopen(inputfilename ,"rb");
 
         /*Initialize internal data: */
@@ -127 +130 @@
         
         /*Close input file descriptors: */
-        if(my_rank==0) pfclose(IOMODEL,inputfilename);
+        if(my_rank2==0) pfclose(IOMODEL,inputfilename);
 
         /*Open output file once for all and add output file name and file descriptor to parameters*/

issm/trunk-jpl/src/c/classes/Patch.cpp ¶

@@ -111 +111 @@
         int         i;
         int         count;
-        extern int  my_rank;
-        extern int  num_procs;
+        int         my_rank2;
+        int         num_procs2;
         int         total_numrows;
         int         node_numrows;
@@ -119 +119 @@
         MPI_Status  status;
         #endif
+        
+        /*recover my_rank2:*/
+        my_rank2=IssmComm::GetRank();
+        num_procs2=IssmComm::GetSize();
 
         /*First, figure out total number of rows combining all the cpus: */
@@ -132 +136 @@
 
         /*Now, allocate buffer to holds all the values, on node 0: */
-        if(my_rank==0)total_values=xNew<IssmDouble>(this->numcols*total_numrows);
+        if(my_rank2==0)total_values=xNew<IssmDouble>(this->numcols*total_numrows);
 
         /*Start by copying node 0 values onto total_values: */
-        if(my_rank==0){
+        if(my_rank2==0){
                 count=0;
                 xMemCpy<IssmDouble>(total_values+count,this->values,this->numcols*this->numrows);
@@ -143 +147 @@
         /*Now, ask other nodes to send their values: */
         #ifdef _HAVE_MPI_
-        for (i=1;i<num_procs;i++){
-                if (my_rank==i){ 
+        for (i=1;i<num_procs2;i++){
+                if (my_rank2==i){ 
                         MPI_Send(&this->numrows,1,MPI_INT,0,1,IssmComm::GetComm());   
                         if (this->numrows)MPI_Send(this->values,this->numrows*this->numcols,MPI_DOUBLE,0,1,IssmComm::GetComm()); 
                 }
-                if (my_rank==0){
+                if (my_rank2==0){
                         MPI_Recv(&node_numrows,1,MPI_INT,i,1,IssmComm::GetComm(),&status); 
                         if (node_numrows)MPI_Recv(total_values+count,node_numrows*this->numcols,MPI_DOUBLE,i,1,IssmComm::GetComm(),&status);
@@ -158 +162 @@
         /*Now, node 0 has total_values, of size total_numrows*this->numcols. Update the fields in the patch, to reflect this new 
          * reality. For other cpus, no point in keeping their data anymore: */
-        if(my_rank==0){
+        if(my_rank2==0){
                 this->numrows=total_numrows;
                 xDelete<IssmDouble>(this->values);

issm/trunk-jpl/src/c/classes/classes.h ¶

@@ -5 +5 @@
 #ifndef ALL_CLASSES_H_
 #define ALL_CLASSES_H_
+
 
 /*Objects derived classes, which are used in our containers: */

issm/trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h ¶

@@ -20 +20 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../classes/IssmComm.h"
 #include "./ExternalResult.h"
 /*}}}*/
@@ -109 +110 @@
 void WriteData(FILE* fid,bool io_gather){ /*{{{*/
                         
-        extern  int my_rank;
+        int     my_rank2;
         int     type;
         int     size;
         IssmPDouble  passiveDouble;
         
+        /*recover my_rank2:*/
+        my_rank2=IssmComm::GetRank();
+
         /*return if now on cpu 0: */
-        if(my_rank)return;
+        if(my_rank2)return;
 
         /*use generic part, same for all ResultTypes: */
@@ -201 +205 @@
 template <> inline void GenericExternalResult<char*>::WriteData(FILE* fid,bool io_gather){ /*{{{*/
 
-        extern  int my_rank;
+        int     my_rank2;
         int     type;
         int     length;
+        
+        /*recover my_rank2:*/
+        my_rank2=IssmComm::GetRank();
 
         /*return if now on cpu 0: */
-        if(my_rank)return;
+        if(my_rank2)return;
 
         /*use generic part, same for all ResultTypes: */
@@ -280 +287 @@
 template <> inline void GenericExternalResult<IssmPDouble*>::WriteData(FILE* fid,bool io_gather){ /*{{{*/
         
-        extern  int my_rank;
+        int     my_rank2;
         int     length;
         int     type;
         int     rows,cols;
         char   *name    = NULL;
-        extern  int my_rank;
         IssmPDouble passiveDouble;
+        
+        /*recover my_rank2:*/
+        my_rank2=IssmComm::GetRank();
 
         if(io_gather){
                 /*we are gathering the data on cpu 0, don't write on other cpus: */
-                if(my_rank) return;
+                if(my_rank2) return;
         }
 

issm/trunk-jpl/src/c/include/globals.h ¶

@@ -9 +9 @@
 #include "./types.h"
 #include "../classes/IssmComm.h"
+
 COMM IssmComm::comm;
 
-int my_rank=0;
-int num_procs=1;
+//int my_rank=0;
+//int num_procs=1;
 
 #endif

issm/trunk-jpl/src/c/io/PrintfFunction.cpp ¶

@@ -15 +15 @@
         char *buffer = NULL;
         int   n,size = 100;
-        int         string_size;
-        extern int  my_rank;
+        int   string_size;
+        int   my_rank2;
         //variable list of arguments
         va_list args;
+        
+        /*recover my_rank2:*/
+        my_rank2=IssmComm::GetRank();
 
         while(true){
@@ -43 +46 @@
 
         /*Ok, if we are running in parallel, get node 0 to print*/
-        if(my_rank==0)_printString_(buffer);
+        if(my_rank2==0)_printString_(buffer);
 
         /*Clean up and return*/
@@ -50 +53 @@
 }
 int PrintfFunction(const string & message){
-        extern int  my_rank;
-        if(my_rank==0){
+        int  my_rank2;
+        
+        /*recover my_rank2:*/
+        my_rank2=IssmComm::GetRank();
+
+        if(my_rank2==0){
                 printf("%s\n",message.c_str());
         }
@@ -57 +64 @@
 }
 int PrintfFunction2(const string & message){
-        extern int  my_rank;
-        if(my_rank==0){
+        int  my_rank2;
+
+        /*recover my_rank2:*/
+        my_rank2=IssmComm::GetRank();
+
+        if(my_rank2==0){
                 printf("%s",message.c_str());
         }

issm/trunk-jpl/src/c/matlab/io/PrintfFunction.cpp ¶

@@ -18 +18 @@
         int   n,size = 100;
         int         string_size;
-        extern int  my_rank;
+        int  my_rank2;
+        
+        /*recover my_rank2:*/
+        my_rank2=IssmComm::GetRank();
 
         //variable list of arguments
@@ -50 +53 @@
 
         /*Ok, if we are running in parallel, get node 0 to print*/
-        if(my_rank==0)_printString_(buffer);
+        if(my_rank2==0)_printString_(buffer);
 
         /*Clean up and return*/

issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp ¶

@@ -18 +18 @@
 void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results* results){
 
-        extern int  my_rank;
+        int         my_rank2;
         FILE       *fid                     = NULL;
         char       *outputfilename          = NULL;
@@ -29 +29 @@
         /*retrieve parameters: */
         parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
+        
+        /*recover my_rank2:*/
+        my_rank2=IssmComm::GetRank();
 
         if(dakota_analysis){
@@ -42 +45 @@
         /*Results do not include the type of solution being run . In parallel, we output results to a filename, 
          *therefore, we need to include the solutiontype into the filename: */
-        if(my_rank==0){
+        if(my_rank2==0){
                 parameters->FindParam(&solutiontype,SolutionTypeEnum);
                 EnumToStringx(&solutiontypestring,solutiontype);
@@ -60 +63 @@
                 if(io_gather){
                         /*Just open the file for output on cpu 0. We are gathering the data on cpu 0 from all other cpus: */
-                        if(my_rank==0) fid=pfopen(outputfilename ,"wb");
+                        if(my_rank2==0) fid=pfopen(outputfilename ,"wb");
                 }
                 else{
                         /*We are opening different  files for output on all cpus. Append the  rank to the filename, and open: */
                         parameters->FindParam(&fid,OutputFilePointerEnum);
-                        sprintf(cpu_outputfilename,"%s.%i",outputfilename,my_rank);
+                        sprintf(cpu_outputfilename,"%s.%i",outputfilename,my_rank2);
                         fid=pfopen(cpu_outputfilename ,"wb");
                 }
@@ -84 +87 @@
           if((step==1) && (time==0)){
           if(io_gather){
-          if(my_rank==0) pfclose(fid,outputfilename);
+          if(my_rank2==0) pfclose(fid,outputfilename);
           }
           else pfclose(fid,cpu_outputfilename);

issm/trunk-jpl/src/c/solutions/dakota_core.cpp ¶

@@ -57 +57 @@
         #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.
         
-        extern int         my_rank;
+        int                my_rank2;
         char*              dakota_input_file  = NULL;
         char*              dakota_output_file = NULL;
@@ -69 +69 @@
         femmodel->parameters->FindParam(&dakota_output_file,QmuOutNameEnum);
         femmodel->parameters->FindParam(&dakota_error_file,QmuErrNameEnum);
+        
+        /*recover my_rank2:*/
+        my_rank2=IssmComm::GetRank();
 
-        if(my_rank==0){
+        if(my_rank2==0){
         
                 // Instantiate/initialize the parallel library and problem description

issm/trunk-jpl/src/c/solutions/issm.cpp ¶

@@ -16 +16 @@
 
         /*Hack for now: */
-        MPI_Comm_rank(comm_init,&my_rank);
-        MPI_Comm_size(comm_init,&num_procs);
+        //MPI_Comm_rank(comm_init,&my_rank);
+        //MPI_Comm_size(comm_init,&num_procs);
 
         /*Initialize femmodel from arguments provided command line: */

issm/trunk-jpl/src/c/solutions/kriging.cpp ¶

@@ -8 +8 @@
 void ProcessArguments2(char** pbinfilename,char** poutbinfilename,char** plockfilename,char** prootpath,int argc,char **argv);
 void ProcessInputfile(IssmDouble **px,IssmDouble **py,IssmDouble **pdata,int *pnobs,IssmDouble **px_interp,IssmDouble **py_interp,int *pninterp,Options **poptions,FILE* fid);
+
+int my_rank;
+int num_procs;
 
 int main(int argc,char **argv){
@@ -21 +24 @@
         char *outbinfilename = NULL;
         char *rootpath       = NULL;
+
+        MPI_Comm comm;
+        extern int my_rank;
+        extern int num_procs;
 
         /*Input*/
@@ -39 +46 @@
 
         /*Initialize environment (MPI, PETSC, MUMPS, etc ...)*/
-        EnvironmentInit(argc,argv);
+        comm=EnvironmentInit(argc,argv);
+
+        MPI_Comm_size(comm,&num_procs);
+        MPI_Comm_rank(comm,&my_rank);
 
         /*First process inputs*/