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 1215 by xsun, Wed Jan 23 21:22:37 2008 UTC vs.
branches/development/src/brains/BlockSnapshotManager.cpp (file contents), Revision 1825 by gezelter, Wed Jan 9 19:27:52 2013 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]  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;
67 <
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);
64
70        int bytesPerFrame = (nRigidBodies_ + nAtoms_) * bytesPerStuntDouble;
71  
72        // total number of frames that can fit in memory
73 <      RealType frameCapacity = avaliablePhysMem / bytesPerFrame;
73 >      //RealType frameCapacity = avaliablePhysMem / 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 88 | Line 94 | namespace oopse {
94        std::cout << "-----------------------------------------------------"<<std::endl;
95        std::cout << "BlockSnapshotManager memory report:" << std::endl;
96        std::cout << "\n";
97 <      std::cout << " Physical Memory available:\t" << (unsigned long)physMem <<  " bytes" <<std::endl;
98 <      std::cout << "    Resident Memory in use:\t" << (unsigned long)rssMem << " bytes" <<std::endl;
99 <      std::cout << "Memory available for OOPSE:\t" << (unsigned long)avaliablePhysMem << " 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;
97 >      // std::cout << "  Physical Memory available:\t" << (unsigned long)physMem <<  " bytes" <<std::endl;
98 >      //std::cout << "     Resident Memory in use:\t" << (unsigned long)rssMem << " bytes" <<std::endl;
99 >      //std::cout << "Memory available for OpenMD:\t" << (unsigned long)avaliablePhysMem << " bytes" <<std::endl;
100 >      std::cout << "Memory requested for OpenMD:\t" << (unsigned long)memSize_ << " bytes" <<std::endl;
101 >      std::cout << "      Bytes per StuntDouble:\t" << (unsigned long)bytesPerStuntDouble <<std::endl;
102 >      std::cout << "            Bytes per Frame:\t" << (unsigned long)bytesPerFrame <<std::endl;
103 >      std::cout << "             Frame Capacity:\t" << (unsigned long)frameCapacity <<std::endl;
104 >      std::cout << "       Frames in trajectory:\t" << (unsigned long)nframes_ <<std::endl;
105 >      std::cout << "        Snapshots per Block:\t" << (unsigned long)nSnapshotPerBlock_ <<std::endl;
106 >      std::cout << "     Total number of Blocks:\t" << (unsigned long)nblocks << std::endl;
107        std::cout << "-----------------------------------------------------"<<std::endl;
108      
109      }
# Line 116 | Line 123 | namespace oopse {
123      }
124    }
125  
126 +   Snapshot* BlockSnapshotManager::getSnapshot(int id) {
127 +    currentSnapshot_ = snapshots_[id];
128 +    return snapshots_[id];
129 +  }
130  
120  // virtual Snapshot* BlockSnapshotManager::getSnapshot(int id) {
121  //  currentSnapshot_ = snapshots[id];
122  //  return snapshots_[id];
123  //}
124
131    int BlockSnapshotManager::getNActiveBlocks() {
132   #ifdef __RWSTD  
133      int count = 0;
# Line 145 | Line 151 | namespace oopse {
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 213 | Line 219 | namespace oopse {
219  
220    std::vector<int> BlockSnapshotManager::getActiveBlocks() {
221      std::vector<int> result;
222 <    oopse::copy_if(activeBlocks_.begin(), activeBlocks_.end(), std::back_inserter(result),
222 >    OpenMD::copy_if(activeBlocks_.begin(), activeBlocks_.end(), std::back_inserter(result),
223                     std::bind2nd(std::not_equal_to<int>(), -1));
224      return result;    
225    }
226  
227    Snapshot* BlockSnapshotManager::loadFrame(int frame){
228 <    Snapshot* snapshot = new Snapshot(nAtoms_, nRigidBodies_, getStorageLayout());
228 >    Snapshot* snapshot = new Snapshot(nAtoms_, nRigidBodies_, nCutoffGroups_,
229 >                                      getStorageLayout());
230      snapshot->setID(frame);
231 +    snapshot->clearDerivedProperties();
232      
225    /** @todo fixed me */
226    Snapshot* oldSnapshot = currentSnapshot_;
233      currentSnapshot_ = snapshot;  
234      reader_->readFrame(frame);
235  
230    // What was this for?  It doesn't make sense!
231    //currentSnapshot_ = oldSnapshot;
232
236      return snapshot;
237    }
238  

Comparing:
trunk/src/brains/BlockSnapshotManager.cpp (property svn:keywords), Revision 1215 by xsun, Wed Jan 23 21:22:37 2008 UTC vs.
branches/development/src/brains/BlockSnapshotManager.cpp (property svn:keywords), Revision 1825 by gezelter, Wed Jan 9 19:27:52 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines