ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/SimInfo.cpp
(Generate patch)

Comparing branches/development/src/brains/SimInfo.cpp (file contents):
Revision 1779 by gezelter, Mon Aug 20 17:51:39 2012 UTC vs.
Revision 1825 by gezelter, Wed Jan 9 19:27:52 2013 UTC

# Line 268 | Line 268 | namespace OpenMD {
268      ndf_local -= nConstraints_;
269  
270   #ifdef IS_MPI
271 <    MPI_Allreduce(&ndf_local,&ndf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
272 <    MPI_Allreduce(&nfq_local,&nGlobalFluctuatingCharges_,1, MPI_INT, MPI_SUM, MPI_COMM_WORLD);
271 >    MPI::COMM_WORLD.Allreduce(&ndf_local, &ndf_, 1, MPI::INT,MPI::SUM);
272 >    MPI::COMM_WORLD.Allreduce(&nfq_local, &nGlobalFluctuatingCharges_, 1,
273 >                              MPI::INT, MPI::SUM);
274   #else
275      ndf_ = ndf_local;
276      nGlobalFluctuatingCharges_ = nfq_local;
# Line 283 | Line 284 | namespace OpenMD {
284  
285    int SimInfo::getFdf() {
286   #ifdef IS_MPI
287 <    MPI_Allreduce(&fdf_local,&fdf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
287 >    MPI::COMM_WORLD.Allreduce(&fdf_local, &fdf_, 1, MPI::INT, MPI::SUM);
288   #else
289      fdf_ = fdf_local;
290   #endif
# Line 339 | Line 340 | namespace OpenMD {
340      }
341      
342   #ifdef IS_MPI
343 <    MPI_Allreduce(&ndfRaw_local,&ndfRaw_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
343 >    MPI::COMM_WORLD.Allreduce(&ndfRaw_local, &ndfRaw_, 1, MPI::INT, MPI::SUM);
344   #else
345      ndfRaw_ = ndfRaw_local;
346   #endif
# Line 352 | Line 353 | namespace OpenMD {
353  
354  
355   #ifdef IS_MPI
356 <    MPI_Allreduce(&ndfTrans_local,&ndfTrans_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
356 >    MPI::COMM_WORLD.Allreduce(&ndfTrans_local, &ndfTrans_, 1,
357 >                              MPI::INT, MPI::SUM);
358   #else
359      ndfTrans_ = ndfTrans_local;
360   #endif
# Line 877 | Line 879 | namespace OpenMD {
879  
880  
881    void SimInfo::prepareTopology() {
880 –    int nExclude, nOneTwo, nOneThree, nOneFour;
882  
883      //calculate mass ratio of cutoff group
884      SimInfo::MoleculeIterator mi;
# Line 925 | Line 926 | namespace OpenMD {
926      }    
927      
928      //scan topology
928 –
929 –    nExclude = excludedInteractions_.getSize();
930 –    nOneTwo = oneTwoInteractions_.getSize();
931 –    nOneThree = oneThreeInteractions_.getSize();
932 –    nOneFour = oneFourInteractions_.getSize();
929  
930      int* excludeList = excludedInteractions_.getPairList();
931      int* oneTwoList = oneTwoInteractions_.getPairList();
# Line 1025 | Line 1021 | namespace OpenMD {
1021    int SimInfo::getNGlobalConstraints() {
1022      int nGlobalConstraints;
1023   #ifdef IS_MPI
1024 <    MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
1025 <                  MPI_COMM_WORLD);    
1024 >    MPI::COMM_WORLD.Allreduce(&nConstraints_, &nGlobalConstraints, 1,
1025 >                              MPI::INT, MPI::SUM);
1026   #else
1027      nGlobalConstraints =  nConstraints_;
1028   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines