ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/brains/SimInfo.cpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/brains/SimInfo.cpp (file contents):
Revision 2204 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 2220 by chrisfen, Thu May 5 14:47:35 2005 UTC

# Line 511 | Line 511 | namespace oopse {
511      int useDipole = 0;
512      int useGayBerne = 0;
513      int useSticky = 0;
514 +    int useStickyPower = 0;
515      int useShape = 0;
516      int useFLARB = 0; //it is not in AtomType yet
517      int useDirectionalAtom = 0;    
# Line 529 | Line 530 | namespace oopse {
530        useDipole |= (*i)->isDipole();
531        useGayBerne |= (*i)->isGayBerne();
532        useSticky |= (*i)->isSticky();
533 +      useStickyPower |= (*i)->isStickyPower();
534        useShape |= (*i)->isShape();
535      }
536  
537 <    if (useSticky || useDipole || useGayBerne || useShape) {
537 >    if (useSticky || useStickyPower || useDipole || useGayBerne || useShape) {
538        useDirectionalAtom = 1;
539      }
540  
# Line 564 | Line 566 | namespace oopse {
566      temp = useSticky;
567      MPI_Allreduce(&temp, &useSticky, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
568  
569 +    temp = useStickyPower;
570 +    MPI_Allreduce(&temp, &useStickyPower, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
571 +    
572      temp = useGayBerne;
573      MPI_Allreduce(&temp, &useGayBerne, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
574  
# Line 588 | Line 593 | namespace oopse {
593      fInfo_.SIM_uses_Charges = useCharge;
594      fInfo_.SIM_uses_Dipoles = useDipole;
595      fInfo_.SIM_uses_Sticky = useSticky;
596 +    fInfo_.SIM_uses_StickyPower = useStickyPower;
597      fInfo_.SIM_uses_GayBerne = useGayBerne;
598      fInfo_.SIM_uses_EAM = useEAM;
599      fInfo_.SIM_uses_Shapes = useShape;

Diff Legend

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