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

Comparing trunk/src/brains/BlockSnapshotManager.cpp (file contents):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 2071 by gezelter, Sat Mar 7 21:41:51 2015 UTC

# Line 35 | Line 35
35   *                                                                      
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).                        
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42   #include <algorithm>
43   #include "brains/BlockSnapshotManager.hpp"
44 < #include "utils/residentMem.h"
45 < #include "utils/physmem.h"
44 > //#include "utils/residentMem.h"
45 > //#include "utils/physmem.h"
46   #include "utils/Algorithm.hpp"
47   #include "brains/SimInfo.hpp"
48   #include "io/DumpReader.hpp"
49  
50   namespace OpenMD {
51 <  BlockSnapshotManager::BlockSnapshotManager(SimInfo* info, const std::string& filename,
52 <                                             int storageLayout, int blockCapacity)
53 <    : SnapshotManager(storageLayout), info_(info), blockCapacity_(blockCapacity),
54 <      activeBlocks_(blockCapacity_, -1), activeRefCount_(blockCapacity_, 0) {
51 >  BlockSnapshotManager::BlockSnapshotManager(SimInfo* info,
52 >                                             const std::string& filename,
53 >                                             int storageLayout,
54 >                                             long long int memSize,
55 >                                             int blockCapacity)
56 >    : SnapshotManager(storageLayout), info_(info),
57 >      blockCapacity_(blockCapacity), memSize_(memSize),
58 >      activeBlocks_(blockCapacity_, -1),
59 >      activeRefCount_(blockCapacity_, 0) {
60  
61        nAtoms_ = info->getNGlobalAtoms();
62        nRigidBodies_ = info->getNGlobalRigidBodies();
63 +      nCutoffGroups_ = info->getNCutoffGroups();
64  
65 <      RealType physMem = physmem_total();
66 <      RealType rssMem = residentMem();
67 <      RealType avaliablePhysMem = physMem - rssMem;
68 <
65 >      // eliminate suspect calls to figure out free memory:
66 >      // RealType physMem = physmem_total();
67 >      // RealType rssMem = residentMem();
68 >      // RealType avaliablePhysMem = physMem - rssMem;
69      
70        int bytesPerStuntDouble = DataStorage::getBytesPerStuntDouble(storageLayout);
71 +      int bytesPerCutoffGroup = DataStorage::getBytesPerStuntDouble(DataStorage::dslPosition);
72  
73 <      int bytesPerFrame = (nRigidBodies_ + nAtoms_) * bytesPerStuntDouble;
73 >      int bytesPerFrameData = Snapshot::getFrameDataSize();
74 >      int bytesPerFrame = (nRigidBodies_ + nAtoms_) * bytesPerStuntDouble
75 >        + nCutoffGroups_ * bytesPerCutoffGroup
76 >        + bytesPerFrameData;
77  
78        // total number of frames that can fit in memory
79 <      RealType frameCapacity = avaliablePhysMem / bytesPerFrame;
79 >      //RealType frameCapacity = avaliablePhysMem / bytesPerFrame;
80 >      RealType frameCapacity = (RealType) memSize_ / (RealType) bytesPerFrame;
81  
82        // number of frames in each block given the need to hold multiple blocks
83        // in memory at the same time:
84        nSnapshotPerBlock_ = int(frameCapacity) / blockCapacity_;
85 +      if (nSnapshotPerBlock_ <= 0) {
86 +       std::cerr << "not enough memory to hold two configs!" << std::endl;
87 +      }
88        reader_ = new DumpReader(info, filename);
89        nframes_ = reader_->getNFrames();
90        int nblocks = nframes_ / nSnapshotPerBlock_;
# Line 85 | Line 100 | namespace OpenMD {
100  
101        snapshots_.insert(snapshots_.begin(), nframes_, static_cast<Snapshot*>(NULL));  
102  
103 <      std::cout << "-----------------------------------------------------"<<std::endl;
103 >      std::cout << "-----------------------------------------------------"
104 >                << std::endl;
105        std::cout << "BlockSnapshotManager memory report:" << std::endl;
106        std::cout << "\n";
107 <      std::cout << "  Physical Memory available:\t" << (unsigned long)physMem <<  " bytes" <<std::endl;
108 <      std::cout << "     Resident Memory in use:\t" << (unsigned long)rssMem << " bytes" <<std::endl;
109 <      std::cout << "Memory available for OpenMD:\t" << (unsigned long)avaliablePhysMem << " bytes" <<std::endl;
110 <      std::cout << "      Bytes per StuntDouble:\t" << (unsigned long)bytesPerStuntDouble <<std::endl;
111 <      std::cout << "            Bytes per Frame:\t" << (unsigned long)bytesPerFrame <<std::endl;
112 <      std::cout << "             Frame Capacity:\t" << (unsigned long)frameCapacity <<std::endl;
113 <      std::cout << "       Frames in trajectory:\t" << (unsigned long)nframes_ <<std::endl;
114 <      std::cout << "        Snapshots per Block:\t" << (unsigned long)nSnapshotPerBlock_ <<std::endl;
115 <      std::cout << "     Total number of Blocks:\t" << (unsigned long)nblocks << std::endl;
116 <      std::cout << "-----------------------------------------------------"<<std::endl;
107 >      // std::cout << "  Physical Memory available:\t" << (unsigned long)physMem <<  " bytes" <<std::endl;
108 >      //std::cout << "     Resident Memory in use:\t" << (unsigned long)rssMem << " bytes" <<std::endl;
109 >      //std::cout << "Memory available for OpenMD:\t" << (unsigned long)avaliablePhysMem << " bytes" <<std::endl;
110 >      std::cout << "Memory requested for OpenMD:\t"
111 >                << (unsigned long)memSize_ << " bytes" << std::endl;
112 >      std::cout << "        Bytes per FrameData:\t"
113 >                << (unsigned long)bytesPerFrameData << std::endl;
114 >      std::cout << "      Bytes per StuntDouble:\t"
115 >                << (unsigned long)bytesPerStuntDouble << std::endl;
116 >      std::cout << "     Bytes per Cutoff Group:\t"
117 >                << (unsigned long)bytesPerCutoffGroup << std::endl;
118 >      std::cout << "            Bytes per Frame:\t"
119 >                << (unsigned long)bytesPerFrame << std::endl;
120 >      std::cout << "             Frame Capacity:\t"
121 >                << (unsigned long)frameCapacity << std::endl;
122 >      std::cout << "       Frames in trajectory:\t"
123 >                << (unsigned long)nframes_ << std::endl;
124 >      std::cout << "        Snapshots per Block:\t"
125 >                << (unsigned long)nSnapshotPerBlock_ << std::endl;
126 >      std::cout << "     Total number of Blocks:\t"
127 >                << (unsigned long)nblocks << std::endl;
128 >      std::cout << "-----------------------------------------------------"
129 >                << std::endl;
130      
131      }
132  
# Line 135 | Line 164 | namespace OpenMD {
164  
165    bool BlockSnapshotManager::loadBlock(int block) {
166      std::vector<int>::iterator i = findActiveBlock(block);
167 <    bool loadSuccess;
167 >    bool loadSuccess(false);
168      if (i != activeBlocks_.end()) {
169 <      //if block is already in memory, just increast the reference count
169 >      // If the block is already in memory, just increase the
170 >      // reference count:
171        ++activeRefCount_[i - activeBlocks_.begin()];
172        loadSuccess = true;
173      } else if (getNActiveBlocks() < blockCapacity_){
174 <      //if number of active blocks is less than the block capacity, just load it
174 >      // If the number of active blocks is less than the block
175 >      // capacity, just load the block:
176        internalLoad(block);
177        loadSuccess = true;
178 <    } else if (hasZeroRefBlock() > 0) {
179 <      //if already reach the block capacity, need to unload a block with 0 reference
178 >    } else if ( hasZeroRefBlock() ) {
179 >      // If we have already reached the block capacity, we need to
180 >      // unload a block with 0 references:
181        int zeroRefBlock = getFirstZeroRefBlock();
182        assert(zeroRefBlock != -1);
183        internalUnload(zeroRefBlock);
184        internalLoad(block);
185      } else {
186 <      //reach the capacity and all blocks in memory are not zero reference
186 >      // We have reached capacity and all blocks in memory are have
187 >      // non-zero references:
188        loadSuccess = false;
189 <    }
157 <    
189 >    }    
190      return loadSuccess;
191    }
192  
# Line 168 | Line 200 | namespace OpenMD {
200          //in case, unloadBlock called multiple times
201          activeRefCount_[i - activeBlocks_.begin()]  = 0;
202        }
203 +
204 +      if (activeRefCount_[i-activeBlocks_.begin()] == 0) {
205 +        internalUnload(block);
206 +      }
207          
208        unloadSuccess = true;
209      } else {
# Line 191 | Line 227 | namespace OpenMD {
227    }
228  
229    void BlockSnapshotManager::internalUnload(int block) {
230 +    std::cerr << "called internal unload for block "<< block << "\n";
231      for (int i = blocks_[block].first; i < blocks_[block].second; ++i) {
232        delete snapshots_[i];
233        snapshots_[i] = NULL;
# Line 218 | Line 255 | namespace OpenMD {
255    }
256  
257    Snapshot* BlockSnapshotManager::loadFrame(int frame){
258 <    Snapshot* snapshot = new Snapshot(nAtoms_, nRigidBodies_, getStorageLayout());
258 >    Snapshot* snapshot = new Snapshot(nAtoms_, nRigidBodies_, nCutoffGroups_,
259 >                                      getStorageLayout());
260      snapshot->setID(frame);
261 +    snapshot->clearDerivedProperties();
262      
224    /** @todo fixed me */
225    Snapshot* oldSnapshot = currentSnapshot_;
263      currentSnapshot_ = snapshot;  
264      reader_->readFrame(frame);
265  
229    // What was this for?  It doesn't make sense!
230    //currentSnapshot_ = oldSnapshot;
231
266      return snapshot;
267    }
268  

Comparing trunk/src/brains/BlockSnapshotManager.cpp (property svn:keywords):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 2071 by gezelter, Sat Mar 7 21:41:51 2015 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines