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

Comparing:
trunk/src/brains/BlockSnapshotManager.cpp (file contents), Revision 1037 by gezelter, Fri Sep 8 16:13:21 2006 UTC vs.
branches/development/src/brains/BlockSnapshotManager.cpp (file contents), Revision 1540 by gezelter, Mon Jan 17 21:34:36 2011 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, 24107 (2008).          
39 + * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41   #include <algorithm>
42   #include "brains/BlockSnapshotManager.hpp"
# Line 46 | Line 46
46   #include "brains/SimInfo.hpp"
47   #include "io/DumpReader.hpp"
48  
49 < namespace oopse {
49 > namespace OpenMD {
50    BlockSnapshotManager::BlockSnapshotManager(SimInfo* info, const std::string& filename,
51                                               int storageLayout, int blockCapacity)
52      : SnapshotManager(storageLayout), info_(info), blockCapacity_(blockCapacity),
# Line 54 | Line 54 | namespace oopse {
54  
55        nAtoms_ = info->getNGlobalAtoms();
56        nRigidBodies_ = info->getNGlobalRigidBodies();
57 +      nCutoffGroups_ = info->getNCutoffGroups();
58  
59        RealType physMem = physmem_total();
60        RealType rssMem = residentMem();
61        RealType avaliablePhysMem = physMem - rssMem;
62 +
63      
64        int bytesPerStuntDouble = DataStorage::getBytesPerStuntDouble(storageLayout);
65  
66        int bytesPerFrame = (nRigidBodies_ + nAtoms_) * bytesPerStuntDouble;
67  
68 <      int frameCapacity = int (avaliablePhysMem / bytesPerFrame);
69 <    
70 <      nSnapshotPerBlock_ = frameCapacity /blockCapacity_ ;
68 >      // total number of frames that can fit in memory
69 >      RealType frameCapacity = avaliablePhysMem / bytesPerFrame;
70 >
71 >      // number of frames in each block given the need to hold multiple blocks
72 >      // in memory at the same time:
73 >      nSnapshotPerBlock_ = int(frameCapacity) / blockCapacity_;
74        reader_ = new DumpReader(info, filename);
75        nframes_ = reader_->getNFrames();
71
76        int nblocks = nframes_ / nSnapshotPerBlock_;
77 <      if (nframes_ % nSnapshotPerBlock_ != 0) {
77 >      if (nframes_ % int(nSnapshotPerBlock_) != 0) {
78          ++nblocks;
79        }  
80      
# Line 82 | Line 86 | namespace oopse {
86  
87        snapshots_.insert(snapshots_.begin(), nframes_, static_cast<Snapshot*>(NULL));  
88  
89 <      // std::cout << "physmem = " << int(physMem) << "\trssMem =  "<< int(rssMem) << "\t availablePhysMem = " << int(avaliablePhysMem) <<std::endl;
90 <      // std::cout << "nSnapshotPerBlock = " << nSnapshotPerBlock_ << "\t total block = " << nblocks << std::endl;
89 >      std::cout << "-----------------------------------------------------"<<std::endl;
90 >      std::cout << "BlockSnapshotManager memory report:" << std::endl;
91 >      std::cout << "\n";
92 >      std::cout << "  Physical Memory available:\t" << (unsigned long)physMem <<  " bytes" <<std::endl;
93 >      std::cout << "     Resident Memory in use:\t" << (unsigned long)rssMem << " bytes" <<std::endl;
94 >      std::cout << "Memory available for OpenMD:\t" << (unsigned long)avaliablePhysMem << " bytes" <<std::endl;
95 >      std::cout << "      Bytes per StuntDouble:\t" << (unsigned long)bytesPerStuntDouble <<std::endl;
96 >      std::cout << "            Bytes per Frame:\t" << (unsigned long)bytesPerFrame <<std::endl;
97 >      std::cout << "             Frame Capacity:\t" << (unsigned long)frameCapacity <<std::endl;
98 >      std::cout << "       Frames in trajectory:\t" << (unsigned long)nframes_ <<std::endl;
99 >      std::cout << "        Snapshots per Block:\t" << (unsigned long)nSnapshotPerBlock_ <<std::endl;
100 >      std::cout << "     Total number of Blocks:\t" << (unsigned long)nblocks << std::endl;
101 >      std::cout << "-----------------------------------------------------"<<std::endl;
102      
103      }
104  
# Line 102 | Line 117 | namespace oopse {
117      }
118    }
119  
120 +   Snapshot* BlockSnapshotManager::getSnapshot(int id) {
121 +    currentSnapshot_ = snapshots_[id];
122 +    return snapshots_[id];
123 +  }
124 +
125    int BlockSnapshotManager::getNActiveBlocks() {
126   #ifdef __RWSTD  
127      int count = 0;
# Line 193 | Line 213 | namespace oopse {
213  
214    std::vector<int> BlockSnapshotManager::getActiveBlocks() {
215      std::vector<int> result;
216 <    oopse::copy_if(activeBlocks_.begin(), activeBlocks_.end(), std::back_inserter(result),
216 >    OpenMD::copy_if(activeBlocks_.begin(), activeBlocks_.end(), std::back_inserter(result),
217                     std::bind2nd(std::not_equal_to<int>(), -1));
218      return result;    
219    }
220  
221    Snapshot* BlockSnapshotManager::loadFrame(int frame){
222 <    Snapshot* snapshot = new Snapshot(nAtoms_, nRigidBodies_, getStorageLayout());
222 >    Snapshot* snapshot = new Snapshot(nAtoms_, nRigidBodies_, nCutoffGroups_, getStorageLayout());
223      snapshot->setID(frame);
224      
225      /** @todo fixed me */
226      Snapshot* oldSnapshot = currentSnapshot_;
227      currentSnapshot_ = snapshot;  
228      reader_->readFrame(frame);
229 <    currentSnapshot_ = oldSnapshot;
229 >
230 >    // What was this for?  It doesn't make sense!
231 >    //currentSnapshot_ = oldSnapshot;
232 >
233      return snapshot;
234    }
235  
# Line 214 | Line 237 | namespace oopse {
237      return reader_->getNFrames();
238    }
239  
240 +  void BlockSnapshotManager::needCOMprops(bool ncp) {
241 +    reader_->setNeedCOMprops(ncp);
242 +  }
243 +
244   }

Comparing:
trunk/src/brains/BlockSnapshotManager.cpp (property svn:keywords), Revision 1037 by gezelter, Fri Sep 8 16:13:21 2006 UTC vs.
branches/development/src/brains/BlockSnapshotManager.cpp (property svn:keywords), Revision 1540 by gezelter, Mon Jan 17 21:34:36 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines