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

Comparing branches/development/src/brains/BlockSnapshotManager.cpp (file contents):
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

# Line 71 | Line 71 | namespace OpenMD {
71  
72        // total number of frames that can fit in memory
73        //RealType frameCapacity = avaliablePhysMem / bytesPerFrame;
74 <      RealType frameCapacity = memSize_ / bytesPerFrame;
74 >      RealType frameCapacity = (RealType) memSize_ / (RealType) bytesPerFrame;
75  
76        // number of frames in each block given the need to hold multiple blocks
77        // in memory at the same time:
# Line 151 | Line 151 | namespace OpenMD {
151        //if number of active blocks is less than the block capacity, just load it
152        internalLoad(block);
153        loadSuccess = true;
154 <    } else if (hasZeroRefBlock() > 0) {
154 >    } else if ( hasZeroRefBlock() ) {
155        //if already reach the block capacity, need to unload a block with 0 reference
156        int zeroRefBlock = getFirstZeroRefBlock();
157        assert(zeroRefBlock != -1);
# Line 227 | Line 227 | namespace OpenMD {
227    Snapshot* BlockSnapshotManager::loadFrame(int frame){
228      Snapshot* snapshot = new Snapshot(nAtoms_, nRigidBodies_, nCutoffGroups_, getStorageLayout());
229      snapshot->setID(frame);
230 +    snapshot->clearDerivedProperties();
231      
232      /** @todo fixed me */
233      Snapshot* oldSnapshot = currentSnapshot_;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines