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

Comparing:
trunk/src/brains/SimSnapshotManager.cpp (file contents), Revision 322 by tim, Sun Feb 13 08:05:33 2005 UTC vs.
branches/development/src/brains/SimSnapshotManager.cpp (file contents), Revision 1540 by gezelter, Mon Jan 17 21:34:36 2011 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# 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  
42   #include "brains/SimInfo.hpp"
43   #include "brains/SimSnapshotManager.hpp"
44   #include "utils/simError.h"
45 < namespace oopse {
45 > namespace OpenMD {
46  
47 < SimSnapshotManager::SimSnapshotManager(SimInfo* info, int storageLayout)
47 >  SimSnapshotManager::SimSnapshotManager(SimInfo* info, int storageLayout)
48      : SnapshotManager(storageLayout), info_(info){
49  
50 <    int nAtoms = info_->getNAtoms();
51 <    int nRigidBodies = info_->getNRigidBodies();
52 <    
53 <    //allocate memory for snapshots
54 <    previousSnapshot_ = new Snapshot(nAtoms, nRigidBodies, storageLayout);
55 <    currentSnapshot_ = new Snapshot(nAtoms, nRigidBodies, storageLayout);
56 < }
50 >      int nAtoms = info_->getNAtoms();
51 >      int nRigidBodies = info_->getNRigidBodies();
52 >      int nCutoffGroups = info_->getNCutoffGroups();
53 >      
54 >      //allocate memory for snapshots
55 >      previousSnapshot_ = new Snapshot(nAtoms, nRigidBodies, nCutoffGroups, storageLayout);
56 >      currentSnapshot_ = new Snapshot(nAtoms, nRigidBodies, nCutoffGroups, storageLayout);
57 >    }
58  
59 < SimSnapshotManager::~SimSnapshotManager(){
59 >  SimSnapshotManager::~SimSnapshotManager(){
60      delete previousSnapshot_;
61      delete currentSnapshot_;
62      previousSnapshot_ = NULL;
63      currentSnapshot_ = NULL;
64 < }
65 < bool SimSnapshotManager::advance() {
64 >  }
65 >  bool SimSnapshotManager::advance() {
66  
67      *previousSnapshot_ = *currentSnapshot_;
68      currentSnapshot_->setID(currentSnapshot_->getID() + 1);    
69      return true;
70 < }
70 >  }
71  
72 < Snapshot* SimSnapshotManager::getSnapshot(int id) {
72 >  Snapshot* SimSnapshotManager::getSnapshot(int id) {
73      if (currentSnapshot_ != NULL && currentSnapshot_->getID() == id) {
74 <        return currentSnapshot_;        
74 >      return currentSnapshot_;        
75      } else if (previousSnapshot_!= NULL && previousSnapshot_->getID() == id) {
76 <        return previousSnapshot_;
76 >      return previousSnapshot_;
77      } else {
78 <        return NULL;
78 >      return NULL;
79      }
80 < }    
80 >  }    
81  
82 < int SimSnapshotManager::getCapacity() {
82 >  int SimSnapshotManager::getCapacity() {
83      return 2;
84 < }
84 >  }
85  
86 < void SimSnapshotManager::setCapacity(int capacity) {
86 >  void SimSnapshotManager::setCapacity(int capacity) {
87      //give warning message
88      sprintf( painCave.errMsg,
89 <        "SimSnapshotManager error: can not set capacity for SimSnapshotManager.\n" );
89 >             "SimSnapshotManager error: can not set capacity for SimSnapshotManager.\n" );
90      painCave.isFatal = 0;
91      simError();    
92 < }
92 >  }
93  
94 < } //namespace oopse
94 > } //namespace OpenMD

Comparing:
trunk/src/brains/SimSnapshotManager.cpp (property svn:keywords), Revision 322 by tim, Sun Feb 13 08:05:33 2005 UTC vs.
branches/development/src/brains/SimSnapshotManager.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