# | 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 <cmath> | |
43 | #include "constraints/ZconstraintForceManager.hpp" | |
44 | #include "integrators/Integrator.hpp" | |
45 | #include "utils/simError.h" | |
46 | < | #include "utils/OOPSEConstant.hpp" |
46 | > | #include "utils/PhysicalConstants.hpp" |
47 | #include "utils/StringUtils.hpp" | |
48 | < | namespace oopse { |
48 | > | namespace OpenMD { |
49 | ZconstraintForceManager::ZconstraintForceManager(SimInfo* info): ForceManager(info), infiniteTime(1e31) { | |
50 | currSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot(); | |
51 | Globals* simParam = info_->getSimParams(); | |
# | Line 77 | Line 77 | namespace oopse { | |
77 | zconsTol_ = 0.01; | |
78 | sprintf(painCave.errMsg, | |
79 | "ZConstraint Warning: Tolerance for z-constraint method is not specified.\n" | |
80 | < | "\tOOPSE will use a default value of %f.\n" |
80 | > | "\tOpenMD will use a default value of %f.\n" |
81 | "\tTo set the tolerance, use the zconsTol variable.\n", | |
82 | zconsTol_); | |
83 | painCave.isFatal = 0; | |
# | Line 118 | Line 118 | namespace oopse { | |
118 | } else { | |
119 | targetTemp = 298.0; | |
120 | } | |
121 | < | RealType zforceConstant = OOPSEConstant::kb * targetTemp / (halfOfLargestBox * halfOfLargestBox); |
121 | > | RealType zforceConstant = PhysicalConstants::kb * targetTemp / (halfOfLargestBox * halfOfLargestBox); |
122 | ||
123 | int nZconstraints = simParam->getNZconsStamps(); | |
124 | std::vector<ZConsStamp*> stamp = simParam->getZconsStamps(); |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |