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