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

Comparing branches/development/src/brains/SimInfo.hpp (file contents):
Revision 1570 by gezelter, Thu May 26 21:56:04 2011 UTC vs.
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   /**
# Line 166 | Line 167 | namespace OpenMD{
167        return nAtoms_;
168      }
169  
170 +    /** Returns the number of effective cutoff groups on local processor */
171 +    unsigned int getNLocalCutoffGroups();
172 +
173      /** Returns the number of local bonds */        
174      unsigned int getNBonds(){
175        return nBonds_;
# Line 599 | Line 603 | namespace OpenMD{
603    public:
604      vector<RealType> getMassFactors() { return massFactors_; }
605  
606 <    PairList getExcludedInteractions() { return excludedInteractions_; }
607 <    PairList getOneTwoInteractions() { return oneTwoInteractions_; }
608 <    PairList getOneThreeInteractions() { return oneThreeInteractions_; }
609 <    PairList getOneFourInteractions() { return oneFourInteractions_; }
606 >    PairList* getExcludedInteractions() { return &excludedInteractions_; }
607 >    PairList* getOneTwoInteractions() { return &oneTwoInteractions_; }
608 >    PairList* getOneThreeInteractions() { return &oneThreeInteractions_; }
609 >    PairList* getOneFourInteractions() { return &oneFourInteractions_; }
610  
611    private:
608
612                
613      /// lists to handle atoms needing special treatment in the non-bonded interactions
614      PairList excludedInteractions_;  /**< atoms excluded from interacting with each other */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines