# | 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(); |
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 | < | } |
53 | > | //allocate memory for snapshots |
54 | > | previousSnapshot_ = new Snapshot(nAtoms, nRigidBodies, storageLayout); |
55 | > | currentSnapshot_ = new Snapshot(nAtoms, nRigidBodies, storageLayout); |
56 | > | } |
57 | ||
58 | < | SimSnapshotManager::~SimSnapshotManager(){ |
58 | > | SimSnapshotManager::~SimSnapshotManager(){ |
59 | delete previousSnapshot_; | |
60 | delete currentSnapshot_; | |
61 | previousSnapshot_ = NULL; | |
62 | currentSnapshot_ = NULL; | |
63 | < | } |
64 | < | bool SimSnapshotManager::advance() { |
63 | > | } |
64 | > | bool SimSnapshotManager::advance() { |
65 | ||
66 | *previousSnapshot_ = *currentSnapshot_; | |
67 | currentSnapshot_->setID(currentSnapshot_->getID() + 1); | |
68 | return true; | |
69 | < | } |
69 | > | } |
70 | ||
71 | < | Snapshot* SimSnapshotManager::getSnapshot(int id) { |
71 | > | Snapshot* SimSnapshotManager::getSnapshot(int id) { |
72 | if (currentSnapshot_ != NULL && currentSnapshot_->getID() == id) { | |
73 | < | return currentSnapshot_; |
73 | > | return currentSnapshot_; |
74 | } else if (previousSnapshot_!= NULL && previousSnapshot_->getID() == id) { | |
75 | < | return previousSnapshot_; |
75 | > | return previousSnapshot_; |
76 | } else { | |
77 | < | return NULL; |
77 | > | return NULL; |
78 | } | |
79 | < | } |
79 | > | } |
80 | ||
81 | < | int SimSnapshotManager::getCapacity() { |
81 | > | int SimSnapshotManager::getCapacity() { |
82 | return 2; | |
83 | < | } |
83 | > | } |
84 | ||
85 | < | void SimSnapshotManager::setCapacity(int capacity) { |
85 | > | void SimSnapshotManager::setCapacity(int capacity) { |
86 | //give warning message | |
87 | sprintf( painCave.errMsg, | |
88 | < | "SimSnapshotManager error: can not set capacity for SimSnapshotManager.\n" ); |
88 | > | "SimSnapshotManager error: can not set capacity for SimSnapshotManager.\n" ); |
89 | painCave.isFatal = 0; | |
90 | simError(); | |
91 | < | } |
91 | > | } |
92 | ||
93 | < | } //namespace oopse |
93 | > | } //namespace OpenMD |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |