Changeset 13592

Timestamp:

10/10/12 21:03:38 (13 years ago)

Author:

Eric.Larour

Message:

CHG: starting transition from extern int my_rank to my_rank2 where my_rank2 is
recovered with IssmComm:GetRank()

Location:

issm/trunk-jpl/src/c/modules

Files:

• DakotaResponsesx/DakotaResponsesx.cpp (modified) (6 diffs)
• ElementResponsex/ElementResponsex.cpp (modified) (4 diffs)
• Krigingx/pKrigingx.cpp (modified) (5 diffs)
• ModelProcessorx/ElementsAndVerticesPartitioning.cpp (modified) (3 diffs)
• NodalValuex/NodalValuex.cpp (modified) (3 diffs)
• ParsePetscOptionsx/ParsePetscOptionsx.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp

@@ -21 +21 @@
 
         int        i,j,k;
-        extern int my_rank;
+        int        my_rank2;
         bool       process_units = true;
 
@@ -36 +36 @@
         /*retrieve npart: */
         parameters->FindParam(&npart,QmuNumberofpartitionsEnum);
+        my_rank2=IssmComm::GetRank();
 
         /*save the d_responses pointer: */
@@ -56 +57 @@
 
                         /*Copy onto our dakota responses: */
-                        if(my_rank==0){
+                        if(my_rank2==0){
                                 /*plug response: */
                                 for(i=0;i<npart;i++)responses_pointer[i]=qmu_response[i];
@@ -77 +78 @@
                         Responsex(&femmodel_response,elements,nodes, vertices,loads,materials, parameters,root,process_units,0);//0 is the index for weights
                         
-                        if(my_rank==0){
+                        if(my_rank2==0){
                                 /*plug response: */
                                 responses_pointer[0]=femmodel_response;
@@ -96 +97 @@
                         Responsex(&femmodel_response,elements,nodes, vertices,loads,materials, parameters,root,process_units,0);//0 is the weight index
 
-                        if(my_rank==0){
+                        if(my_rank2==0){
                                 /*plug response: */
                                 responses_pointer[0]=femmodel_response;
@@ -109 +110 @@
 
         /*Synthesize echo: {{{*/
-        if(my_rank==0){
+        if(my_rank2==0){
                 _printString_("   responses: " << d_numresponses << ": ");
                 for(i=0;i<d_numresponses-1;i++)_printString_(d_responses[i] << "|");

issm/trunk-jpl/src/c/modules/ElementResponsex/ElementResponsex.cpp

@@ -13 +13 @@
         
 
-        extern int my_rank;
+        int my_rank2;
         int i;
 
@@ -25 +25 @@
         /*retrieve element we are interested in: */
         parameters->FindParam(&index,IndexEnum);
+        my_rank2=IssmComm::GetRank();
 
         /*now, go through our elements, and retrieve the one with this id: index: */
@@ -31 +32 @@
                 if (element->Id()==index){
                         found=1;
-                        cpu_found=my_rank;
+                        cpu_found=my_rank2;
                         break;
                 }
@@ -43 +44 @@
 
         /*Ok, we found the element, compute responseocity: */
-        if(my_rank==cpu_found){
+        if(my_rank2==cpu_found){
                 element->ElementResponse(&response,response_enum,IuToExtEnum);
         }

issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp

@@ -15 +15 @@
 
         extern int num_procs;
-        extern int my_rank;
+        int my_rank2;
 
         /*output*/
@@ -27 +27 @@
         Variogram    *variogram    = NULL;
         Observations *observations = NULL;
+
+        /*Get my_rank2: */
+        my_rank2=IssmComm::GetRank();
 
         /*Get some Options*/
@@ -55 +58 @@
 
                 /*partition loop across threads: */
-                for(int idx=my_rank;idx<n_interp;idx+=num_procs){
+                for(int idx=my_rank2;idx<n_interp;idx+=num_procs){
                         _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");
                         observations->InterpolationKriging(&predictions[idx],&error[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,variogram);
@@ -73 +76 @@
 
                 /*partition loop across threads: */
-                for(int idx=my_rank;idx<n_interp;idx+=num_procs){
+                for(int idx=my_rank2;idx<n_interp;idx+=num_procs){
                         _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");
                         observations->InterpolationNearestNeighbor(&predictions[idx],x_interp[idx],y_interp[idx],radius);
@@ -90 +93 @@
 
                 /*partition loop across threads: */
-                for(int idx=my_rank;idx<n_interp;idx+=num_procs){
+                for(int idx=my_rank2;idx<n_interp;idx+=num_procs){
                         _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");
                         observations->InterpolationIDW(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,power);

issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp

@@ -22 +22 @@
         int i;
 
-        extern int my_rank;
+        int my_rank2;
         extern int num_procs;
         int    numberofelements;
@@ -46 +46 @@
         IssmDouble* riftinfo=NULL;
         IssmDouble* vertex_pairing=NULL;
+
+        /*Get my_rank2:*/
+        my_rank2=IssmComm::GetRank();
 
         /*Fetch parameters: */
@@ -99 +102 @@
 
                 /*!All elements have been partitioned above, only deal with elements for this cpu: */
-                if(my_rank==epart[i]){ 
+                if(my_rank2==epart[i]){ 
 
                         my_elements[i]=true;

issm/trunk-jpl/src/c/modules/NodalValuex/NodalValuex.cpp

@@ -12 +12 @@
 void NodalValuex( IssmDouble* pnodalvalue, int natureofdataenum,Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,bool process_units){
 
-        extern int my_rank;
+        int my_rank2;
         int i;
         int index;
@@ -20 +20 @@
         int sumfound;
         int cpu_found;
+
+        /*Get my_rank2:*/
+        my_rank2=IssmComm::GetRank();
 
         /*retrieve element we are interested in: */
@@ -30 +33 @@
                 found=element->NodalValue(&value,index,natureofdataenum,process_units);
                 if (found){
-                        cpu_found=my_rank;
+                        cpu_found=my_rank2;
                         break;
                 }

issm/trunk-jpl/src/c/modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp

@@ -23 +23 @@
 
         char line [1000];
-        extern int my_rank;
+        int my_rank2;
         int i;
 
@@ -35 +35 @@
         int   stringlength;
 
-        if(my_rank==0){
+        /*Get my_rank2:*/
+        my_rank2=IssmComm::GetRank();
+
+        if(my_rank2==0){
 
                 /*Now, go through lines and figure out how many analyses we have: */
@@ -97 +100 @@
         #ifdef _HAVE_MPI_
         MPI_Bcast(&numanalyses,1,MPI_INT,0,IssmComm::GetComm());
-        if(my_rank!=0){
+        if(my_rank2!=0){
                 analyses=xNew<IssmPDouble>(numanalyses);
                 strings=xNew<char*>(numanalyses);
@@ -105 +108 @@
         for(i=0;i<numanalyses;i++){
                 char* string=strings[i];
-                if(my_rank==0){
+                if(my_rank2==0){
                         if(string==NULL) _error_("PETSc options for analysis " << EnumToStringx(reCast<int>(analyses[i])) << " have been declared but were not found");
                 }
-                if(my_rank==0)stringlength=(strlen(string)+1)*sizeof(char);
+                if(my_rank2==0)stringlength=(strlen(string)+1)*sizeof(char);
                 #ifdef _HAVE_MPI_
                 MPI_Bcast(&stringlength,1,MPI_INT,0,IssmComm::GetComm());
-                if(my_rank!=0)string=xNew<char>(stringlength);
+                if(my_rank2!=0)string=xNew<char>(stringlength);
                 MPI_Bcast(string,stringlength,MPI_CHAR,0,IssmComm::GetComm());
-                if(my_rank!=0)strings[i]=string;
+                if(my_rank2!=0)strings[i]=string;
                 #endif
         }