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

Comparing branches/new_design/OOPSE-4/src/brains/SimModel.cpp (file contents):
Revision 1699 by tim, Tue Nov 2 17:00:12 2004 UTC vs.
Revision 1700 by tim, Tue Nov 2 22:41:09 2004 UTC

# Line 37 | Line 37 | SimModel::SimModel() : nAtom_(0), nBond_(0), nBend_(0)
37  
38   namespace oopse {
39  
40 < SimModel::SimModel() : nAtom_(0), nBond_(0), nBend_(0), nTorsion_(0), nRigidBody_(0),
41 <        nIntegrableObjects_(0), nCutoffGroup_(0), nConstraints_(0), sman_(NULL){
40 > SimModel::SimModel() : nAtoms_(0), nBonds_(0), nBends_(0), nTorsions_(0), nRigidBodies_(0),
41 >        nIntegrableObjects_(0), nCutoffGroups_(0), nConstraints_(0), sman_(NULL){
42  
43   }
44  
# Line 128 | Line 128 | void SimModel::calcNDF() {
128                  }
129              }
130              
131 <        }
132 <    }
131 >        }//end for (integrableObject)
132 >    }// end for (mol)
133      
134 <    // n_constraints is local, so subtract them on each processor:
135 <
134 >    // n_constraints is local, so subtract them on each processor
135      ndf_local -= nConstraints_;
136  
137   #ifdef IS_MPI
# Line 143 | Line 142 | void SimModel::calcNDF() {
142  
143      // nZconstraints is global, as are the 3 COM translations for the
144      // entire system:
146 –
145      ndf_ = ndf_ - 3 - nZconstraints;
146  
147   }

Diff Legend

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