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

Comparing trunk/src/brains/SimInfo.cpp (file contents):
Revision 1287 by gezelter, Wed Sep 10 18:11:32 2008 UTC vs.
Revision 1313 by gezelter, Wed Oct 22 20:01:49 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 763 | Line 763 | namespace oopse {
763      useRF = 0;
764      useSF = 0;
765      useSP = 0;
766 +    useBoxDipole = 0;
767  
768  
769      if (simParams_->haveElectrostaticSummationMethod()) {
# Line 949 | Line 950 | namespace oopse {
950      nOneTwo = oneTwoInteractions_.getSize();
951      nOneThree = oneThreeInteractions_.getSize();
952      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  
954      int* excludeList = excludedInteractions_.getPairList();
955      int* oneTwoList = oneTwoInteractions_.getPairList();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines