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 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
Revision 1965 by gezelter, Fri Jan 24 13:53:41 2014 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
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, 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 oopse {
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) {
50 > namespace OpenMD {
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), memSize_(memSize),
57 >      blockCapacity_(blockCapacity), activeBlocks_(blockCapacity_, -1),
58 >      activeRefCount_(blockCapacity_, 0) {
59  
60        nAtoms_ = info->getNGlobalAtoms();
61        nRigidBodies_ = info->getNGlobalRigidBodies();
62 +      nCutoffGroups_ = info->getNCutoffGroups();
63  
64 <      RealType physMem = physmem_total();
65 <      RealType rssMem = residentMem();
66 <      RealType avaliablePhysMem = physMem - rssMem;
64 >      // eliminate suspect calls to figure out free memory:
65 >      // RealType physMem = physmem_total();
66 >      // RealType rssMem = residentMem();
67 >      // RealType avaliablePhysMem = physMem - rssMem;
68      
69        int bytesPerStuntDouble = DataStorage::getBytesPerStuntDouble(storageLayout);
70 +      int bytesPerCutoffGroup = DataStorage::getBytesPerStuntDouble(DataStorage::dslPosition);
71 +      int bytesPerFrame = (nRigidBodies_ + nAtoms_) * bytesPerStuntDouble
72 +        + nCutoffGroups_ * bytesPerCutoffGroup;
73  
74 <      int bytesPerFrame = (nRigidBodies_ + nAtoms_) * bytesPerStuntDouble;
74 >      // total number of frames that can fit in memory
75 >      //RealType frameCapacity = avaliablePhysMem / bytesPerFrame;
76 >      RealType frameCapacity = (RealType) memSize_ / (RealType) bytesPerFrame;
77  
78 <      int frameCapacity = int (avaliablePhysMem / bytesPerFrame);
79 <    
80 <      nSnapshotPerBlock_ = frameCapacity /blockCapacity_ ;
78 >      // number of frames in each block given the need to hold multiple blocks
79 >      // in memory at the same time:
80 >      nSnapshotPerBlock_ = int(frameCapacity) / blockCapacity_;
81 >      if (nSnapshotPerBlock_ <= 0) {
82 >       std::cerr << "not enough memory to hold two configs!" << std::endl;
83 >      }
84        reader_ = new DumpReader(info, filename);
85        nframes_ = reader_->getNFrames();
71
86        int nblocks = nframes_ / nSnapshotPerBlock_;
87 <      if (nframes_ % nSnapshotPerBlock_ != 0) {
87 >      if (nframes_ % int(nSnapshotPerBlock_) != 0) {
88          ++nblocks;
89        }  
90      
# Line 82 | Line 96 | namespace oopse {
96  
97        snapshots_.insert(snapshots_.begin(), nframes_, static_cast<Snapshot*>(NULL));  
98  
99 <      std::cout << "physmem = " << int(physMem) << "\trssMem =  "<< int(rssMem) << "\t availablePhysMem = " << int(avaliablePhysMem) <<std::endl;
100 <      std::cout << "nSnapshotPerBlock = " << nSnapshotPerBlock_ << "\t total block = " << nblocks << std::endl;
99 >      std::cout << "-----------------------------------------------------"<<std::endl;
100 >      std::cout << "BlockSnapshotManager memory report:" << std::endl;
101 >      std::cout << "\n";
102 >      // std::cout << "  Physical Memory available:\t" << (unsigned long)physMem <<  " bytes" <<std::endl;
103 >      //std::cout << "     Resident Memory in use:\t" << (unsigned long)rssMem << " bytes" <<std::endl;
104 >      //std::cout << "Memory available for OpenMD:\t" << (unsigned long)avaliablePhysMem << " bytes" <<std::endl;
105 >      std::cout << "Memory requested for OpenMD:\t" << (unsigned long)memSize_ << " bytes" <<std::endl;
106 >      std::cout << "      Bytes per StuntDouble:\t" << (unsigned long)bytesPerStuntDouble <<std::endl;
107 >      std::cout << "     Bytes per Cutoff Group:\t" << (unsigned long)bytesPerCutoffGroup <<std::endl;
108 >      std::cout << "            Bytes per Frame:\t" << (unsigned long)bytesPerFrame <<std::endl;
109 >      std::cout << "             Frame Capacity:\t" << (unsigned long)frameCapacity <<std::endl;
110 >      std::cout << "       Frames in trajectory:\t" << (unsigned long)nframes_ <<std::endl;
111 >      std::cout << "        Snapshots per Block:\t" << (unsigned long)nSnapshotPerBlock_ <<std::endl;
112 >      std::cout << "     Total number of Blocks:\t" << (unsigned long)nblocks << std::endl;
113 >      std::cout << "-----------------------------------------------------"<<std::endl;
114      
115      }
116  
# Line 102 | Line 129 | namespace oopse {
129      }
130    }
131  
132 +   Snapshot* BlockSnapshotManager::getSnapshot(int id) {
133 +    currentSnapshot_ = snapshots_[id];
134 +    return snapshots_[id];
135 +  }
136 +
137    int BlockSnapshotManager::getNActiveBlocks() {
138   #ifdef __RWSTD  
139      int count = 0;
# Line 125 | Line 157 | namespace oopse {
157        //if number of active blocks is less than the block capacity, just load it
158        internalLoad(block);
159        loadSuccess = true;
160 <    } else if (hasZeroRefBlock() > 0) {
160 >    } else if ( hasZeroRefBlock() ) {
161        //if already reach the block capacity, need to unload a block with 0 reference
162        int zeroRefBlock = getFirstZeroRefBlock();
163        assert(zeroRefBlock != -1);
# Line 149 | Line 181 | namespace oopse {
181          //in case, unloadBlock called multiple times
182          activeRefCount_[i - activeBlocks_.begin()]  = 0;
183        }
184 +
185 +      if (activeRefCount_[i-activeBlocks_.begin()] == 0) {
186 +        internalUnload(block);
187 +      }
188          
189        unloadSuccess = true;
190      } else {
# Line 172 | Line 208 | namespace oopse {
208    }
209  
210    void BlockSnapshotManager::internalUnload(int block) {
211 +    std::cerr << "called internal unload for block "<< block << "\n";
212      for (int i = blocks_[block].first; i < blocks_[block].second; ++i) {
213        delete snapshots_[i];
214        snapshots_[i] = NULL;
# Line 193 | Line 230 | namespace oopse {
230  
231    std::vector<int> BlockSnapshotManager::getActiveBlocks() {
232      std::vector<int> result;
233 <    oopse::copy_if(activeBlocks_.begin(), activeBlocks_.end(), std::back_inserter(result),
233 >    OpenMD::copy_if(activeBlocks_.begin(), activeBlocks_.end(), std::back_inserter(result),
234                     std::bind2nd(std::not_equal_to<int>(), -1));
235      return result;    
236    }
237  
238    Snapshot* BlockSnapshotManager::loadFrame(int frame){
239 <    Snapshot* snapshot = new Snapshot(nAtoms_, nRigidBodies_, getStorageLayout());
239 >    Snapshot* snapshot = new Snapshot(nAtoms_, nRigidBodies_, nCutoffGroups_,
240 >                                      getStorageLayout());
241      snapshot->setID(frame);
242 +    snapshot->clearDerivedProperties();
243      
205    /** @todo fixed me */
206    Snapshot* oldSnapshot = currentSnapshot_;
244      currentSnapshot_ = snapshot;  
245      reader_->readFrame(frame);
246 <    currentSnapshot_ = oldSnapshot;
246 >
247      return snapshot;
248    }
249  
# Line 214 | Line 251 | namespace oopse {
251      return reader_->getNFrames();
252    }
253  
254 +  void BlockSnapshotManager::needCOMprops(bool ncp) {
255 +    reader_->setNeedCOMprops(ncp);
256 +  }
257 +
258   }

Comparing trunk/src/brains/BlockSnapshotManager.cpp (property svn:keywords):
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
Revision 1965 by gezelter, Fri Jan 24 13:53:41 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines