| 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 |
|
|
| 43 |
|
#include "UseTheForce/CLAYFF.hpp" |
| 44 |
– |
#include "UseTheForce/DarkSide/lj_interface.h" |
| 44 |
|
#include "UseTheForce/ForceFieldFactory.hpp" |
| 45 |
+ |
#include "io/BaseAtomTypesSectionParser.hpp" |
| 46 |
|
#include "io/AtomTypesSectionParser.hpp" |
| 47 |
|
#include "io/LennardJonesAtomTypesSectionParser.hpp" |
| 48 |
|
#include "io/ChargeAtomTypesSectionParser.hpp" |
| 51 |
|
#include "io/OptionSectionParser.hpp" |
| 52 |
|
#include "UseTheForce/ForceFieldCreator.hpp" |
| 53 |
|
|
| 54 |
< |
namespace oopse { |
| 54 |
> |
namespace OpenMD { |
| 55 |
|
|
| 56 |
|
CLAYFF::CLAYFF(){ |
| 57 |
|
|
| 59 |
|
setForceFieldFileName("CLAYFF.frc"); |
| 60 |
|
|
| 61 |
|
spMan_.push_back(new OptionSectionParser(forceFieldOptions_)); |
| 62 |
+ |
spMan_.push_back(new BaseAtomTypesSectionParser()); |
| 63 |
|
spMan_.push_back(new AtomTypesSectionParser()); |
| 64 |
|
spMan_.push_back(new LennardJonesAtomTypesSectionParser(forceFieldOptions_)); |
| 65 |
|
spMan_.push_back(new ChargeAtomTypesSectionParser(forceFieldOptions_)); |
| 79 |
|
|
| 80 |
|
for (at = atomTypeCont_.beginType(i); at != NULL; |
| 81 |
|
at = atomTypeCont_.nextType(i)) { |
| 82 |
< |
at->makeFortranAtomType(); |
| 83 |
< |
} |
| 82 |
> |
// useBase sets the responsibilities, and these have to be done |
| 83 |
> |
// after the atomTypes and Base types have all been scanned: |
| 84 |
|
|
| 85 |
< |
for (at = atomTypeCont_.beginType(i); at != NULL; |
| 86 |
< |
at = atomTypeCont_.nextType(i)) { |
| 87 |
< |
at->complete(); |
| 85 |
> |
std::vector<AtomType*> ayb = at->allYourBase(); |
| 86 |
> |
if (ayb.size() > 1) { |
| 87 |
> |
for (int j = ayb.size()-1; j > 0; j--) { |
| 88 |
> |
|
| 89 |
> |
ayb[j-1]->useBase(ayb[j]); |
| 90 |
> |
|
| 91 |
> |
} |
| 92 |
> |
} |
| 93 |
|
} |
| 94 |
|
|
| 89 |
– |
int isError = 0; |
| 90 |
– |
|
| 95 |
|
delete ffStream; |
| 96 |
|
|
| 97 |
|
} |
| 98 |
|
|
| 99 |
|
CLAYFF::~CLAYFF(){ |
| 96 |
– |
destroyLJTypes(); |
| 100 |
|
} |
| 101 |
< |
} //end namespace oopse |
| 101 |
> |
} //end namespace OpenMD |
