| 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, 234107 (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/Register.hpp" |
| 50 |
|
#include "integrators/NPTi.hpp" |
| 51 |
|
#include "integrators/NPTf.hpp" |
| 52 |
|
#include "integrators/NPTxyz.hpp" |
| 53 |
+ |
#include "integrators/NPTsz.hpp" |
| 54 |
|
#include "integrators/NPAT.hpp" |
| 55 |
|
#include "integrators/NPrT.hpp" |
| 56 |
+ |
#include "integrators/NPA.hpp" |
| 57 |
+ |
#include "integrators/NgammaT.hpp" |
| 58 |
+ |
#include "integrators/LangevinDynamics.hpp" |
| 59 |
+ |
#if defined(HAVE_QHULL) |
| 60 |
+ |
#include "integrators/LangevinHullDynamics.hpp" |
| 61 |
+ |
#endif |
| 62 |
|
|
| 63 |
< |
#include "minimizers/MinimizerFactory.hpp" |
| 64 |
< |
#include "minimizers/MinimizerCreator.hpp" |
| 65 |
< |
#include "minimizers/PRCG.hpp" |
| 66 |
< |
#include "minimizers/SDMinimizer.hpp" |
| 67 |
< |
#include "UseTheForce/DUFF.hpp" |
| 68 |
< |
#include "UseTheForce/EAM_FF.hpp" |
| 69 |
< |
#include "UseTheForce/ForceFieldFactory.hpp" |
| 62 |
< |
#include "UseTheForce/ForceFieldCreator.hpp" |
| 63 |
< |
#include "UseTheForce/SHAPES_FF.hpp" |
| 63 |
> |
#include "optimization/OptimizationFactory.hpp" |
| 64 |
> |
#include "optimization/OptimizationCreator.hpp" |
| 65 |
> |
#include "optimization/Method.hpp" |
| 66 |
> |
#include "optimization/SteepestDescent.hpp" |
| 67 |
> |
#include "optimization/ConjugateGradient.hpp" |
| 68 |
> |
#include "optimization/BFGS.hpp" |
| 69 |
> |
|
| 70 |
|
#include "lattice/LatticeFactory.hpp" |
| 71 |
|
#include "lattice/LatticeCreator.hpp" |
| 72 |
|
#include "lattice/FCCLattice.hpp" |
| 73 |
|
|
| 74 |
< |
namespace oopse { |
| 74 |
> |
using namespace QuantLib; |
| 75 |
> |
namespace OpenMD { |
| 76 |
|
|
| 70 |
– |
|
| 71 |
– |
void registerForceFields() { |
| 72 |
– |
/** @todo move to a seperate initialization module */ |
| 73 |
– |
//DUFF, WATER and LJ are merged into one force field |
| 74 |
– |
ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("DUFF")); |
| 75 |
– |
ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("WATER")); |
| 76 |
– |
ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("LJ")); |
| 77 |
– |
//in theory, EAM can also be merged |
| 78 |
– |
ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM_FF>("EAM")); |
| 79 |
– |
//heck, that worked... let's try merging SHAPES |
| 80 |
– |
ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES")); |
| 81 |
– |
|
| 82 |
– |
} |
| 83 |
– |
|
| 77 |
|
void registerIntegrators() { |
| 78 |
|
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVE>("NVE")); |
| 79 |
|
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVT>("NVT")); |
| 81 |
|
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTf>("NPTF")); |
| 82 |
|
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTxyz>("NPTXYZ")); |
| 83 |
|
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPAT>("NPAT")); |
| 84 |
+ |
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPA>("NPA")); |
| 85 |
|
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPRT")); |
| 86 |
< |
|
| 86 |
> |
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPGT")); |
| 87 |
> |
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NgammaT>("NGT")); |
| 88 |
> |
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NgammaT>("NGAMMAT")); |
| 89 |
> |
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinDynamics>("LANGEVINDYNAMICS")); |
| 90 |
> |
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinDynamics>("LD")); |
| 91 |
> |
#if defined(HAVE_QHULL) |
| 92 |
> |
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinHullDynamics>("LHULL")); |
| 93 |
> |
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinHullDynamics>("LANGEVINHULL")); |
| 94 |
> |
IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinHullDynamics>("SMIPD")); |
| 95 |
> |
#endif |
| 96 |
|
} |
| 97 |
|
|
| 98 |
< |
void registerMinimizers() { |
| 99 |
< |
MinimizerFactory::getInstance()->registerMinimizer(new MinimizerBuilder<SDMinimizer>("SD")); |
| 100 |
< |
MinimizerFactory::getInstance()->registerMinimizer(new MinimizerBuilder<PRCGMinimizer>("CG")); |
| 98 |
> |
void registerOptimizers() { |
| 99 |
> |
OptimizationFactory::getInstance()->registerOptimization(new OptimizationBuilder<QuantLib::SteepestDescent>("SD")); |
| 100 |
> |
OptimizationFactory::getInstance()->registerOptimization(new OptimizationBuilder<QuantLib::ConjugateGradient>("CG")); |
| 101 |
> |
OptimizationFactory::getInstance()->registerOptimization(new OptimizationBuilder<QuantLib::BFGS>("BFGS")); |
| 102 |
|
} |
| 103 |
|
|
| 104 |
|
void registerLattice(){ |
| 106 |
|
} |
| 107 |
|
|
| 108 |
|
void registerAll() { |
| 105 |
– |
registerForceFields(); |
| 109 |
|
registerIntegrators(); |
| 110 |
< |
registerMinimizers(); |
| 110 |
> |
registerOptimizers(); |
| 111 |
|
} |
| 112 |
|
|
| 113 |
|
} |
