| 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] Vardeman & Gezelter, in progress (2009). |
| 40 |
|
*/ |
| 41 |
|
|
| 42 |
|
#include "brains/Snapshot.hpp" |
| 43 |
|
#include "integrators/Integrator.hpp" |
| 44 |
|
#include "utils/simError.h" |
| 45 |
< |
namespace oopse { |
| 45 |
> |
namespace OpenMD { |
| 46 |
|
Integrator::Integrator(SimInfo* info) |
| 47 |
< |
: info_(info), forceMan_(NULL) , needPotential(false), needStress(false), needReset(false), velocitizer_(NULL), |
| 48 |
< |
needVelocityScaling(false), dumpWriter(NULL), statWriter(NULL), thermo(info), |
| 47 |
> |
: info_(info), forceMan_(NULL) , needPotential(false), needStress(false), |
| 48 |
> |
needReset(false), velocitizer_(NULL), needVelocityScaling(false), |
| 49 |
> |
rnemd_(NULL), useRNEMD(false), |
| 50 |
> |
dumpWriter(NULL), statWriter(NULL), thermo(info), |
| 51 |
|
currentSnapshot_(info->getSnapshotManager()->getCurrentSnapshot()) { |
| 52 |
|
|
| 53 |
|
simParams = info->getSimParams(); |
| 97 |
|
resetTime = simParams->getResetTime(); |
| 98 |
|
} |
| 99 |
|
|
| 100 |
< |
//create a default ForceManager |
| 101 |
< |
//if the subclass wants to use a different ForceManager, use setForceManager |
| 100 |
> |
// Create a default ForceManager: If the subclass wants to use |
| 101 |
> |
// a different ForceManager, use setForceManager |
| 102 |
> |
|
| 103 |
|
forceMan_ = new ForceManager(info); |
| 104 |
< |
|
| 102 |
< |
//set the force manager for thermodynamic integration if specified |
| 103 |
< |
if (simParams->getUseSolidThermInt() || simParams->getUseLiquidThermInt()){ |
| 104 |
< |
ThermoIntegrationForceManager* thermoForce_ |
| 105 |
< |
= new ThermoIntegrationForceManager(info); |
| 106 |
< |
setForceManager(thermoForce_); |
| 107 |
< |
} |
| 108 |
< |
|
| 104 |
> |
|
| 105 |
|
// check for the temperature set flag (velocity scaling) |
| 106 |
|
if (simParams->haveTempSet()) { |
| 107 |
|
needVelocityScaling = simParams->getTempSet(); |
| 117 |
|
|
| 118 |
|
} |
| 119 |
|
} |
| 120 |
< |
|
| 121 |
< |
//create a default a velocitizer |
| 122 |
< |
//if the subclass want to using different velocitizer, use setVelocitizer |
| 120 |
> |
|
| 121 |
> |
// Create a default a velocitizer: If the subclass wants to use |
| 122 |
> |
// a different velocitizer, use setVelocitizer |
| 123 |
|
velocitizer_ = new Velocitizer(info); |
| 128 |
– |
|
| 129 |
– |
} |
| 124 |
|
|
| 125 |
+ |
if (simParams->haveUseRNEMD()) { |
| 126 |
+ |
if (simParams->getUseRNEMD()) { |
| 127 |
+ |
// Create a default a RNEMD. |
| 128 |
+ |
rnemd_ = new RNEMD(info); |
| 129 |
+ |
useRNEMD = simParams->getUseRNEMD(); |
| 130 |
+ |
if (simParams->haveRNEMD_exchangeTime()) { |
| 131 |
+ |
RNEMD_exchangeTime = simParams->getRNEMD_exchangeTime(); |
| 132 |
+ |
} |
| 133 |
+ |
} |
| 134 |
+ |
} |
| 135 |
+ |
} |
| 136 |
+ |
|
| 137 |
|
Integrator::~Integrator(){ |
| 138 |
|
delete forceMan_; |
| 139 |
|
delete velocitizer_; |
| 140 |
+ |
delete rnemd_; |
| 141 |
|
|
| 142 |
|
delete dumpWriter; |
| 143 |
|
delete statWriter; |
