| 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 "minimizers/MinimizerParameterSet.hpp" |
| 44 |
|
|
| 45 |
< |
namespace oopse { |
| 45 |
> |
namespace OpenMD { |
| 46 |
|
|
| 47 |
< |
MinimizerParameterSet::MinimizerParameterSet(SimInfo* info) : defaultTolerance(1.0e-8) { |
| 47 |
> |
MinimizerParameterSet::MinimizerParameterSet(SimInfo* info) : defaultTolerance(1.0e-8) { |
| 48 |
|
setDefaultParameter(); |
| 49 |
|
|
| 50 |
|
Globals* globals = info->getSimParams(); |
| 51 |
|
|
| 52 |
|
if (globals->haveMinimizer()){ |
| 53 |
< |
setFTol(globals->getMinFTol()); |
| 53 |
> |
setFTol(globals->getMinimizerFTol()); |
| 54 |
|
} |
| 55 |
|
|
| 56 |
< |
if (globals->haveMinGTol()){ |
| 57 |
< |
setGTol(globals->getMinGTol()); |
| 56 |
> |
if (globals->haveMinimizerGTol()){ |
| 57 |
> |
setGTol(globals->getMinimizerGTol()); |
| 58 |
|
} |
| 59 |
|
|
| 60 |
< |
if (globals->haveMinMaxIter()){ |
| 61 |
< |
setMaxIteration(globals->getMinMaxIter()); |
| 60 |
> |
if (globals->haveMinimizerMaxIter()){ |
| 61 |
> |
setMaxIteration(globals->getMinimizerMaxIter()); |
| 62 |
|
} |
| 63 |
|
|
| 64 |
< |
if (globals->haveMinWriteFrq()){ |
| 65 |
< |
setMaxIteration(globals->getMinMaxIter()); |
| 64 |
> |
if (globals->haveMinimizerWriteFreq()){ |
| 65 |
> |
setMaxIteration(globals->getMinimizerMaxIter()); |
| 66 |
|
} |
| 67 |
|
|
| 68 |
< |
if (globals->haveMinWriteFrq()){ |
| 69 |
< |
setWriteFrq(globals->getMinWriteFrq()); |
| 68 |
> |
if (globals->haveMinimizerWriteFreq()){ |
| 69 |
> |
setWriteFreq(globals->getMinimizerWriteFreq()); |
| 70 |
|
} |
| 71 |
|
|
| 72 |
< |
if (globals->haveMinStepSize()){ |
| 73 |
< |
setStepSize(globals->getMinStepSize()); |
| 72 |
> |
if (globals->haveMinimizerStepSize()){ |
| 73 |
> |
setStepSize(globals->getMinimizerStepSize()); |
| 74 |
|
} |
| 75 |
|
|
| 76 |
< |
if (globals->haveMinLSMaxIter()){ |
| 77 |
< |
setLineSearchMaxIteration(globals->getMinLSMaxIter()); |
| 76 |
> |
if (globals->haveMinimizerLSMaxIter()){ |
| 77 |
> |
setLineSearchMaxIteration(globals->getMinimizerLSMaxIter()); |
| 78 |
|
} |
| 79 |
|
|
| 80 |
< |
if (globals->haveMinLSTol()){ |
| 81 |
< |
setLineSearchTol(globals->getMinLSTol()); |
| 80 |
> |
if (globals->haveMinimizerLSTol()){ |
| 81 |
> |
setLineSearchTol(globals->getMinimizerLSTol()); |
| 82 |
|
} |
| 83 |
|
|
| 84 |
< |
} |
| 84 |
> |
} |
| 85 |
|
|
| 86 |
< |
void MinimizerParameterSet::setDefaultParameter() { |
| 86 |
> |
void MinimizerParameterSet::setDefaultParameter() { |
| 87 |
|
maxIteration = 200; |
| 88 |
|
stepSize = 0.01; |
| 89 |
|
stepTol = defaultTolerance; |
| 90 |
|
fTol = defaultTolerance; |
| 91 |
|
gTol = defaultTolerance; |
| 92 |
< |
writeFrq = maxIteration; |
| 92 |
> |
writeFreq = maxIteration; |
| 93 |
|
lsMaxIteration = 50; |
| 94 |
|
lsTol = defaultTolerance; |
| 95 |
< |
} |
| 95 |
> |
} |
| 96 |
|
|
| 97 |
|
|
| 98 |
|
|
