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