Changeset 13591

Timestamp:

10/10/12 20:59:44 (12 years ago)

Author:

Eric.Larour

Message:

CHG: more changes from MPI_COMM_WORLD to IssmComm::GetComm()

Location:

issm/trunk-jpl/src/c

Files:

• modules/Solverx/DofTypesToIndexSet.cpp (modified) (1 diff)
• solutions/DakotaSpawnCore.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/Solverx/DofTypesToIndexSet.cpp

@@ -65 +65 @@
                 /*Create indices sets: */
                 #if _PETSC_MAJOR_ < 3 || (_PETSC_MAJOR_ == 3 && _PETSC_MINOR_ < 2)
-                ISCreateGeneral(PETSC_COMM_WORLD,pressure_num,pressure_indices,&isp);
-                ISCreateGeneral(PETSC_COMM_WORLD,velocity_num,velocity_indices,&isv);
+                ISCreateGeneral(IssmComm::GetComm(),pressure_num,pressure_indices,&isp);
+                ISCreateGeneral(IssmComm::GetComm(),velocity_num,velocity_indices,&isv);
                 #else
-                ISCreateGeneral(PETSC_COMM_WORLD,pressure_num,pressure_indices,PETSC_COPY_VALUES,&isp);
-                ISCreateGeneral(PETSC_COMM_WORLD,velocity_num,velocity_indices,PETSC_COPY_VALUES,&isv);
+                ISCreateGeneral(IssmComm::GetComm(),pressure_num,pressure_indices,PETSC_COPY_VALUES,&isp);
+                ISCreateGeneral(IssmComm::GetComm(),velocity_num,velocity_indices,PETSC_COPY_VALUES,&isv);
                 #endif
         }

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

@@ -60 +60 @@
         /*If counter==-1 on cpu0, it means that the dakota runs are done. In which case, bail out and return 0: */
         #ifdef _HAVE_MPI_
-        MPI_Bcast(&counter,1,MPI_INT,0,MPI_COMM_WORLD); 
+        MPI_Bcast(&counter,1,MPI_INT,0,IssmComm::GetComm()); 
         #endif
         if(counter==-1)return 0;
@@ -124 +124 @@
 
         /*numvariables: */
-        MPI_Bcast(&numvariables,1,MPI_INT,0,MPI_COMM_WORLD); 
+        MPI_Bcast(&numvariables,1,MPI_INT,0,IssmComm::GetComm()); 
         
         /*variables:*/
         if(my_rank!=0)variables=xNew<double>(numvariables);
-        MPI_Bcast(variables,numvariables,MPI_DOUBLE,0,MPI_COMM_WORLD); 
+        MPI_Bcast(variables,numvariables,MPI_DOUBLE,0,IssmComm::GetComm()); 
 
         /*variables_descriptors: */
@@ -139 +139 @@
                         string_length=(strlen(string)+1)*sizeof(char);
                 }
-                MPI_Bcast(&string_length,1,MPI_INT,0,MPI_COMM_WORLD); 
+                MPI_Bcast(&string_length,1,MPI_INT,0,IssmComm::GetComm()); 
                 if(my_rank!=0)string=xNew<char>(string_length);
-                MPI_Bcast(string,string_length,MPI_CHAR,0,MPI_COMM_WORLD); 
+                MPI_Bcast(string,string_length,MPI_CHAR,0,IssmComm::GetComm()); 
                 if(my_rank!=0)variables_descriptors[i]=string;
         }
 
         /*numresponses: */
-        MPI_Bcast(&numresponses,1,MPI_INT,0,MPI_COMM_WORLD); 
+        MPI_Bcast(&numresponses,1,MPI_INT,0,IssmComm::GetComm()); 
 
         /*Assign output pointers:*/