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 1838 by gezelter, Tue Jan 22 16:20:11 2013 UTC vs.
Revision 1849 by gezelter, Wed Feb 20 13:52:51 2013 UTC

# Line 390 | Line 390 | namespace OpenMD{
390      /**
391       * Sets GlobalGroupMembership
392       */  
393 <    void setGlobalGroupMembership(const vector<int>& globalGroupMembership) {
394 <      assert(globalGroupMembership.size() == static_cast<size_t>(nGlobalAtoms_));
395 <      globalGroupMembership_ = globalGroupMembership;
393 >    void setGlobalGroupMembership(const vector<int>& ggm) {
394 >      assert(ggm.size() == static_cast<size_t>(nGlobalAtoms_));
395 >      globalGroupMembership_ = ggm;
396      }
397  
398      /**
399       * Sets GlobalMolMembership
400       */        
401 <    void setGlobalMolMembership(const vector<int>& globalMolMembership) {
402 <      assert(globalMolMembership.size() == static_cast<size_t>(nGlobalAtoms_));
403 <      globalMolMembership_ = globalMolMembership;
401 >    void setGlobalMolMembership(const vector<int>& gmm) {
402 >      assert(gmm.size() == (static_cast<size_t>(nGlobalAtoms_ +
403 >                                                nGlobalRigidBodies_)));
404 >      globalMolMembership_ = gmm;
405      }
406  
407  
# Line 467 | Line 468 | namespace OpenMD{
468  
469      /** Returns the set of atom types present in this simulation */
470      set<AtomType*> getSimulatedAtomTypes();
471 +
472 +    /** Returns the global count of atoms of a particular type */
473 +    int getGlobalCountOfType(AtomType* atype);
474          
475      friend ostream& operator <<(ostream& o, SimInfo& info);
476  

Diff Legend

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