| 43 |
|
#include "UseTheForce/DUFF.hpp" |
| 44 |
|
#include "UseTheForce/DarkSide/lj_interface.h" |
| 45 |
|
#include "UseTheForce/DarkSide/sticky_interface.h" |
| 46 |
+ |
#include "UseTheForce/DarkSide/gb_interface.h" |
| 47 |
|
#include "UseTheForce/ForceFieldFactory.hpp" |
| 48 |
|
#include "io/DirectionalAtomTypesSectionParser.hpp" |
| 49 |
|
#include "io/AtomTypesSectionParser.hpp" |
| 51 |
|
#include "io/ChargeAtomTypesSectionParser.hpp" |
| 52 |
|
#include "io/MultipoleAtomTypesSectionParser.hpp" |
| 53 |
|
#include "io/StickyAtomTypesSectionParser.hpp" |
| 54 |
+ |
#include "io/StickyPowerAtomTypesSectionParser.hpp" |
| 55 |
+ |
#include "io/GayBerneAtomTypesSectionParser.hpp" |
| 56 |
|
#include "io/BondTypesSectionParser.hpp" |
| 57 |
|
#include "io/BendTypesSectionParser.hpp" |
| 58 |
|
#include "io/TorsionTypesSectionParser.hpp" |
| 59 |
+ |
#include "io/OptionSectionParser.hpp" |
| 60 |
|
#include "UseTheForce/ForceFieldCreator.hpp" |
| 61 |
|
|
| 62 |
|
namespace oopse { |
| 63 |
|
|
| 64 |
< |
DUFF::DUFF(){ |
| 64 |
> |
DUFF::DUFF(){ |
| 65 |
|
|
| 66 |
|
//set default force field filename |
| 67 |
|
setForceFieldFileName("DUFF2.frc"); |
| 68 |
|
|
| 69 |
< |
//the order of adding section parsers are important |
| 70 |
< |
//DirectionalAtomTypesSectionParser should be added before AtomTypesSectionParser Since |
| 71 |
< |
//These two section parsers will actually create "real" AtomTypes (AtomTypesSectionParser will create |
| 72 |
< |
//AtomType and DirectionalAtomTypesSectionParser will creat DirectionalAtomType which is a subclass |
| 73 |
< |
//of AtomType, therefore it should come first). Other AtomTypes Section Parser will not create the |
| 74 |
< |
//"real" AtomType, they only add and set some attribute of the AtomType. Thus their order are not |
| 75 |
< |
//important. AtomTypesSectionParser should be added before other atom type section parsers. |
| 76 |
< |
//Make sure they are added after DirectionalAtomTypesSectionParser and AtomTypesSectionParser. |
| 77 |
< |
//The order of BondTypesSectionParser, BendTypesSectionParser and TorsionTypesSectionParser are |
| 78 |
< |
//not important. |
| 79 |
< |
spMan_.push_back(new DirectionalAtomTypesSectionParser()); |
| 69 |
> |
//The order of adding section parsers is important. |
| 70 |
> |
//OptionSectionParser must come first to set options for other parsers |
| 71 |
> |
//DirectionalAtomTypesSectionParser should be added before |
| 72 |
> |
//AtomTypesSectionParser, and these two section parsers will actually |
| 73 |
> |
//create "real" AtomTypes (AtomTypesSectionParser will create AtomType and |
| 74 |
> |
//DirectionalAtomTypesSectionParser will create DirectionalAtomType, which |
| 75 |
> |
//is a subclass of AtomType and should come first). Other AtomTypes Section |
| 76 |
> |
//Parser will not create the "real" AtomType, they only add and set some |
| 77 |
> |
//attribute of the AtomType. Thus their order are not important. |
| 78 |
> |
//AtomTypesSectionParser should be added before other atom type section |
| 79 |
> |
//parsers. Make sure they are added after DirectionalAtomTypesSectionParser |
| 80 |
> |
//and AtomTypesSectionParser. The order of BondTypesSectionParser, |
| 81 |
> |
//BendTypesSectionParser and TorsionTypesSectionParser are not important. |
| 82 |
> |
spMan_.push_back(new OptionSectionParser(forceFieldOptions_)); |
| 83 |
> |
spMan_.push_back(new DirectionalAtomTypesSectionParser(forceFieldOptions_)); |
| 84 |
|
spMan_.push_back(new AtomTypesSectionParser()); |
| 85 |
< |
spMan_.push_back(new LennardJonesAtomTypesSectionParser()); |
| 86 |
< |
spMan_.push_back(new ChargeAtomTypesSectionParser()); |
| 87 |
< |
spMan_.push_back(new MultipoleAtomTypesSectionParser()); |
| 88 |
< |
spMan_.push_back(new StickyAtomTypesSectionParser()); |
| 89 |
< |
spMan_.push_back(new BondTypesSectionParser()); |
| 90 |
< |
spMan_.push_back(new BendTypesSectionParser()); |
| 91 |
< |
spMan_.push_back(new TorsionTypesSectionParser()); |
| 85 |
> |
spMan_.push_back(new LennardJonesAtomTypesSectionParser(forceFieldOptions_)); |
| 86 |
> |
spMan_.push_back(new ChargeAtomTypesSectionParser(forceFieldOptions_)); |
| 87 |
> |
spMan_.push_back(new MultipoleAtomTypesSectionParser(forceFieldOptions_)); |
| 88 |
> |
spMan_.push_back(new StickyAtomTypesSectionParser(forceFieldOptions_)); |
| 89 |
> |
spMan_.push_back(new StickyPowerAtomTypesSectionParser(forceFieldOptions_)); |
| 90 |
> |
spMan_.push_back(new GayBerneAtomTypesSectionParser(forceFieldOptions_)); |
| 91 |
> |
spMan_.push_back(new BondTypesSectionParser(forceFieldOptions_)); |
| 92 |
> |
spMan_.push_back(new BendTypesSectionParser(forceFieldOptions_)); |
| 93 |
> |
spMan_.push_back(new TorsionTypesSectionParser(forceFieldOptions_)); |
| 94 |
|
|
| 95 |
< |
} |
| 95 |
> |
} |
| 96 |
|
|
| 97 |
< |
void DUFF::parse(const std::string& filename) { |
| 97 |
> |
void DUFF::parse(const std::string& filename) { |
| 98 |
|
ifstrstream* ffStream; |
| 99 |
|
ffStream = openForceFieldFile(filename); |
| 100 |
|
|
| 103 |
|
ForceField::AtomTypeContainer::MapTypeIterator i; |
| 104 |
|
AtomType* at; |
| 105 |
|
|
| 106 |
< |
for (at = atomTypeCont_.beginType(i); at != NULL; at = atomTypeCont_.nextType(i)) { |
| 107 |
< |
at->makeFortranAtomType(); |
| 106 |
> |
for (at = atomTypeCont_.beginType(i); at != NULL; |
| 107 |
> |
at = atomTypeCont_.nextType(i)) { |
| 108 |
> |
at->makeFortranAtomType(); |
| 109 |
|
} |
| 110 |
|
|
| 111 |
< |
for (at = atomTypeCont_.beginType(i); at != NULL; at = atomTypeCont_.nextType(i)) { |
| 112 |
< |
at->complete(); |
| 111 |
> |
for (at = atomTypeCont_.beginType(i); at != NULL; |
| 112 |
> |
at = atomTypeCont_.nextType(i)) { |
| 113 |
> |
at->complete(); |
| 114 |
|
} |
| 115 |
+ |
|
| 116 |
+ |
int isError = 0; |
| 117 |
+ |
|
| 118 |
+ |
delete ffStream; |
| 119 |
|
|
| 120 |
< |
} |
| 120 |
> |
} |
| 121 |
|
|
| 122 |
+ |
DUFF::~DUFF(){ |
| 123 |
+ |
destroyLJTypes(); |
| 124 |
+ |
destroyStickyTypes(); |
| 125 |
+ |
destroyGayBerneTypes(); |
| 126 |
+ |
} |
| 127 |
|
} //end namespace oopse |
