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 1629 by gezelter, Wed Sep 14 21:15:17 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"
43 < #include "utils/residentMem.h"
44 < #include "utils/physmem.h"
43 > //#include "utils/residentMem.h"
44 > //#include "utils/physmem.h"
45   #include "utils/Algorithm.hpp"
46   #include "brains/SimInfo.hpp"
47   #include "io/DumpReader.hpp"
48  
49 < namespace oopse {
50 <  BlockSnapshotManager::BlockSnapshotManager(SimInfo* info, const std::string& filename,
51 <                                             int storageLayout, int blockCapacity)
52 <    : SnapshotManager(storageLayout), info_(info), blockCapacity_(blockCapacity),
53 <      activeBlocks_(blockCapacity_, -1), activeRefCount_(blockCapacity_, 0) {
49 > namespace OpenMD {
50 >  BlockSnapshotManager::BlockSnapshotManager(SimInfo* info,
51 >                                             const std::string& filename,
52 >                                             int storageLayout,
53 >                                             long long int memSize,
54 >                                             int blockCapacity)
55 >    : SnapshotManager(storageLayout), info_(info), memSize_(memSize),
56 >      blockCapacity_(blockCapacity), activeBlocks_(blockCapacity_, -1),
57 >      activeRefCount_(blockCapacity_, 0) {
58  
59        nAtoms_ = info->getNGlobalAtoms();
60        nRigidBodies_ = info->getNGlobalRigidBodies();
61 +      nCutoffGroups_ = info->getNCutoffGroups();
62  
63 <      RealType physMem = physmem_total();
64 <      RealType rssMem = residentMem();
65 <      RealType avaliablePhysMem = physMem - rssMem;
63 >      // eliminate suspect calls to figure out free memory:
64 >      // RealType physMem = physmem_total();
65 >      // RealType rssMem = residentMem();
66 >      // RealType avaliablePhysMem = physMem - rssMem;
67      
68        int bytesPerStuntDouble = DataStorage::getBytesPerStuntDouble(storageLayout);
63
69        int bytesPerFrame = (nRigidBodies_ + nAtoms_) * bytesPerStuntDouble;
70  
71 <      int frameCapacity = int (avaliablePhysMem / bytesPerFrame);
72 <    
73 <      nSnapshotPerBlock_ = frameCapacity /blockCapacity_ ;
71 >      // total number of frames that can fit in memory
72 >      //RealType frameCapacity = avaliablePhysMem / bytesPerFrame;
73 >      RealType frameCapacity = memSize_ / bytesPerFrame;
74 >
75 >      // number of frames in each block given the need to hold multiple blocks
76 >      // in memory at the same time:
77 >      nSnapshotPerBlock_ = int(frameCapacity) / blockCapacity_;
78        reader_ = new DumpReader(info, filename);
79        nframes_ = reader_->getNFrames();
71
80        int nblocks = nframes_ / nSnapshotPerBlock_;
81 <      if (nframes_ % nSnapshotPerBlock_ != 0) {
81 >      if (nframes_ % int(nSnapshotPerBlock_) != 0) {
82          ++nblocks;
83        }  
84      
# Line 82 | Line 90 | namespace oopse {
90  
91        snapshots_.insert(snapshots_.begin(), nframes_, static_cast<Snapshot*>(NULL));  
92  
93 <      // std::cout << "physmem = " << int(physMem) << "\trssMem =  "<< int(rssMem) << "\t availablePhysMem = " << int(avaliablePhysMem) <<std::endl;
94 <      // std::cout << "nSnapshotPerBlock = " << nSnapshotPerBlock_ << "\t total block = " << nblocks << std::endl;
93 >      std::cout << "-----------------------------------------------------"<<std::endl;
94 >      std::cout << "BlockSnapshotManager memory report:" << std::endl;
95 >      std::cout << "\n";
96 >      // std::cout << "  Physical Memory available:\t" << (unsigned long)physMem <<  " bytes" <<std::endl;
97 >      //std::cout << "     Resident Memory in use:\t" << (unsigned long)rssMem << " bytes" <<std::endl;
98 >      //std::cout << "Memory available for OpenMD:\t" << (unsigned long)avaliablePhysMem << " bytes" <<std::endl;
99 >      std::cout << "Memory requested for OpenMD:\t" << (unsigned long)memSize_ << " bytes" <<std::endl;
100 >      std::cout << "      Bytes per StuntDouble:\t" << (unsigned long)bytesPerStuntDouble <<std::endl;
101 >      std::cout << "            Bytes per Frame:\t" << (unsigned long)bytesPerFrame <<std::endl;
102 >      std::cout << "             Frame Capacity:\t" << (unsigned long)frameCapacity <<std::endl;
103 >      std::cout << "       Frames in trajectory:\t" << (unsigned long)nframes_ <<std::endl;
104 >      std::cout << "        Snapshots per Block:\t" << (unsigned long)nSnapshotPerBlock_ <<std::endl;
105 >      std::cout << "     Total number of Blocks:\t" << (unsigned long)nblocks << std::endl;
106 >      std::cout << "-----------------------------------------------------"<<std::endl;
107      
108      }
109  
# Line 102 | Line 122 | namespace oopse {
122      }
123    }
124  
125 +   Snapshot* BlockSnapshotManager::getSnapshot(int id) {
126 +    currentSnapshot_ = snapshots_[id];
127 +    return snapshots_[id];
128 +  }
129 +
130    int BlockSnapshotManager::getNActiveBlocks() {
131   #ifdef __RWSTD  
132      int count = 0;
# Line 193 | Line 218 | namespace oopse {
218  
219    std::vector<int> BlockSnapshotManager::getActiveBlocks() {
220      std::vector<int> result;
221 <    oopse::copy_if(activeBlocks_.begin(), activeBlocks_.end(), std::back_inserter(result),
221 >    OpenMD::copy_if(activeBlocks_.begin(), activeBlocks_.end(), std::back_inserter(result),
222                     std::bind2nd(std::not_equal_to<int>(), -1));
223      return result;    
224    }
225  
226    Snapshot* BlockSnapshotManager::loadFrame(int frame){
227 <    Snapshot* snapshot = new Snapshot(nAtoms_, nRigidBodies_, getStorageLayout());
227 >    Snapshot* snapshot = new Snapshot(nAtoms_, nRigidBodies_, nCutoffGroups_, getStorageLayout());
228      snapshot->setID(frame);
229      
230      /** @todo fixed me */
231      Snapshot* oldSnapshot = currentSnapshot_;
232      currentSnapshot_ = snapshot;  
233      reader_->readFrame(frame);
234 <    currentSnapshot_ = oldSnapshot;
234 >
235 >    // What was this for?  It doesn't make sense!
236 >    //currentSnapshot_ = oldSnapshot;
237 >
238      return snapshot;
239    }
240  
# Line 214 | Line 242 | namespace oopse {
242      return reader_->getNFrames();
243    }
244  
245 +  void BlockSnapshotManager::needCOMprops(bool ncp) {
246 +    reader_->setNeedCOMprops(ncp);
247 +  }
248 +
249   }

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 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines