Changeset 13612 for issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp

Timestamp:

10/11/12 00:03:06 (12 years ago)

Author:

Eric.Larour

Message:

CHG: switched my_rank2 to my_rank and num_procs2 to num_procs

File:

• issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp (modified) (5 diffs)

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){
 
-        int         my_rank2;
+        int         my_rank;
         FILE       *fid                     = NULL;
         char       *outputfilename          = NULL;
@@ -30 +30 @@
         parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
         
-        /*recover my_rank2:*/
-        my_rank2=IssmComm::GetRank();
+        /*recover my_rank:*/
+        my_rank=IssmComm::GetRank();
 
         if(dakota_analysis){
@@ -45 +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_rank2==0){
+        if(my_rank==0){
                 parameters->FindParam(&solutiontype,SolutionTypeEnum);
                 EnumToStringx(&solutiontypestring,solutiontype);
@@ -63 +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_rank2==0) fid=pfopen(outputfilename ,"wb");
+                        if(my_rank==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_rank2);
+                        sprintf(cpu_outputfilename,"%s.%i",outputfilename,my_rank);
                         fid=pfopen(cpu_outputfilename ,"wb");
                 }
@@ -87 +87 @@
           if((step==1) && (time==0)){
           if(io_gather){
-          if(my_rank2==0) pfclose(fid,outputfilename);
+          if(my_rank==0) pfclose(fid,outputfilename);
           }
           else pfclose(fid,cpu_outputfilename);