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

Comparing trunk/OOPSE-4/src/brains/SimInfo.cpp (file contents):
Revision 3445 by gezelter, Wed Sep 10 18:11:32 2008 UTC vs.
Revision 3446 by cli2, Wed Sep 10 19:51:45 2008 UTC

# Line 446 | Line 446 | namespace oopse {
446        b = torsion->getAtomB()->getGlobalIndex();        
447        c = torsion->getAtomC()->getGlobalIndex();        
448        d = torsion->getAtomD()->getGlobalIndex();      
449 <  
449 >
450        if (options_.havevdw12scale() || options_.haveelectrostatic12scale()) {
451          oneTwoInteractions_.addPair(a, b);      
452          oneTwoInteractions_.addPair(b, c);
# Line 950 | Line 950 | namespace oopse {
950      nOneThree = oneThreeInteractions_.getSize();
951      nOneFour = oneFourInteractions_.getSize();
952  
953 <    std::cerr << "exculdes:\n";
954 <    std::cerr << excludedInteractions_;
955 <    std::cerr << "\noneTwo:\n";
956 <    std::cerr << oneTwoInteractions_;
957 <    std::cerr << "\noneThree:\n";
958 <    std::cerr << oneThreeInteractions_;
959 <    std::cerr << "\noneFour:\n";
960 <    std::cerr << oneFourInteractions_;
953 >    std::cerr << "excludedInteractions contains: " << excludedInteractions_.getSize() << " pairs \n";
954 >    std::cerr << "oneTwoInteractions contains: " << oneTwoInteractions_.getSize() << " pairs \n";
955 >    std::cerr << "oneThreeInteractions contains: " << oneThreeInteractions_.getSize() << " pairs \n";
956 >    std::cerr << "oneFourInteractions contains: " << oneFourInteractions_.getSize() << " pairs \n";
957  
958      int* excludeList = excludedInteractions_.getPairList();
959      int* oneTwoList = oneTwoInteractions_.getPairList();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines