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 1798 by gezelter, Thu Sep 13 14:10:11 2012 UTC vs.
Revision 1830 by gezelter, Wed Jan 9 22:02:30 2013 UTC

# Line 879 | Line 879 | namespace OpenMD {
879  
880  
881    void SimInfo::prepareTopology() {
882    int nExclude, nOneTwo, nOneThree, nOneFour;
882  
883      //calculate mass ratio of cutoff group
884      SimInfo::MoleculeIterator mi;
# Line 927 | Line 926 | namespace OpenMD {
926      }    
927      
928      //scan topology
930
931    nExclude = excludedInteractions_.getSize();
932    nOneTwo = oneTwoInteractions_.getSize();
933    nOneThree = oneThreeInteractions_.getSize();
934    nOneFour = oneFourInteractions_.getSize();
929  
930      int* excludeList = excludedInteractions_.getPairList();
931      int* oneTwoList = oneTwoInteractions_.getPairList();
# Line 1009 | Line 1003 | namespace OpenMD {
1003    
1004    
1005    StuntDouble* SimInfo::getIOIndexToIntegrableObject(int index) {
1006 <    if (index >= IOIndexToIntegrableObject.size()) {
1006 >    if (index >= int(IOIndexToIntegrableObject.size())) {
1007        sprintf(painCave.errMsg,
1008                "SimInfo::getIOIndexToIntegrableObject Error: Integrable Object\n"
1009                "\tindex exceeds number of known objects!\n");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines