Changeset 13591


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/modules/Solverx/DofTypesToIndexSet.cpp

    r12470 r13591  
    6565                /*Create indices sets: */
    6666                #if _PETSC_MAJOR_ < 3 || (_PETSC_MAJOR_ == 3 && _PETSC_MINOR_ < 2)
    67                 ISCreateGeneral(PETSC_COMM_WORLD,pressure_num,pressure_indices,&isp);
    68                 ISCreateGeneral(PETSC_COMM_WORLD,velocity_num,velocity_indices,&isv);
     67                ISCreateGeneral(IssmComm::GetComm(),pressure_num,pressure_indices,&isp);
     68                ISCreateGeneral(IssmComm::GetComm(),velocity_num,velocity_indices,&isv);
    6969                #else
    70                 ISCreateGeneral(PETSC_COMM_WORLD,pressure_num,pressure_indices,PETSC_COPY_VALUES,&isp);
    71                 ISCreateGeneral(PETSC_COMM_WORLD,velocity_num,velocity_indices,PETSC_COPY_VALUES,&isv);
     70                ISCreateGeneral(IssmComm::GetComm(),pressure_num,pressure_indices,PETSC_COPY_VALUES,&isp);
     71                ISCreateGeneral(IssmComm::GetComm(),velocity_num,velocity_indices,PETSC_COPY_VALUES,&isv);
    7272                #endif
    7373        }
  • issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.cpp

    r13540 r13591  
    6060        /*If counter==-1 on cpu0, it means that the dakota runs are done. In which case, bail out and return 0: */
    6161        #ifdef _HAVE_MPI_
    62         MPI_Bcast(&counter,1,MPI_INT,0,MPI_COMM_WORLD);
     62        MPI_Bcast(&counter,1,MPI_INT,0,IssmComm::GetComm());
    6363        #endif
    6464        if(counter==-1)return 0;
     
    124124
    125125        /*numvariables: */
    126         MPI_Bcast(&numvariables,1,MPI_INT,0,MPI_COMM_WORLD);
     126        MPI_Bcast(&numvariables,1,MPI_INT,0,IssmComm::GetComm());
    127127       
    128128        /*variables:*/
    129129        if(my_rank!=0)variables=xNew<double>(numvariables);
    130         MPI_Bcast(variables,numvariables,MPI_DOUBLE,0,MPI_COMM_WORLD);
     130        MPI_Bcast(variables,numvariables,MPI_DOUBLE,0,IssmComm::GetComm());
    131131
    132132        /*variables_descriptors: */
     
    139139                        string_length=(strlen(string)+1)*sizeof(char);
    140140                }
    141                 MPI_Bcast(&string_length,1,MPI_INT,0,MPI_COMM_WORLD);
     141                MPI_Bcast(&string_length,1,MPI_INT,0,IssmComm::GetComm());
    142142                if(my_rank!=0)string=xNew<char>(string_length);
    143                 MPI_Bcast(string,string_length,MPI_CHAR,0,MPI_COMM_WORLD);
     143                MPI_Bcast(string,string_length,MPI_CHAR,0,IssmComm::GetComm());
    144144                if(my_rank!=0)variables_descriptors[i]=string;
    145145        }
    146146
    147147        /*numresponses: */
    148         MPI_Bcast(&numresponses,1,MPI_INT,0,MPI_COMM_WORLD);
     148        MPI_Bcast(&numresponses,1,MPI_INT,0,IssmComm::GetComm());
    149149
    150150        /*Assign output pointers:*/
Note: See TracChangeset for help on using the changeset viewer.