| 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 |
> |
//OptionSectionParser must come first to set options for other parsers |
| 69 |
> |
//DirectionalAtomTypesSectionParser should be before |
| 70 |
|
//AtomTypesSectionParser since these two section parsers will actually |
| 71 |
|
//create "real" AtomTypes (AtomTypesSectionParser will create AtomType |
| 72 |
< |
//and DirectionalAtomTypesSectionParser will creat DirectionalAtomType |
| 72 |
> |
//and DirectionalAtomTypesSectionParser will create DirectionalAtomType |
| 73 |
|
//which is a subclass of AtomType, therefore it should come first). Other |
| 74 |
|
//AtomTypes Section Parser will not create the "real" AtomType, they only |
| 75 |
< |
//add and set some attribute of the AtomType. Thus their order are not |
| 76 |
< |
//important. AtomTypesSectionParser should be added before other atom |
| 75 |
> |
//add and set some attribute of the AtomType. Thus the ordering of these |
| 76 |
> |
//are not important. AtomTypesSectionParser should be added before other atom |
| 77 |
|
//type section parsers. Make sure they are added after |
| 78 |
|
//DirectionalAtomTypesSectionParser and AtomTypesSectionParser. The order |
| 79 |
|
//of BondTypesSectionParser, BendTypesSectionParser and |
| 80 |
|
//TorsionTypesSectionParser are not important. |
| 81 |
< |
|
| 82 |
< |
spMan_.push_back(new ShapeAtomTypesSectionParser()); |
| 83 |
< |
spMan_.push_back(new DirectionalAtomTypesSectionParser()); |
| 81 |
> |
spMan_.push_back(new OptionSectionParser(forceFieldOptions_)); |
| 82 |
> |
spMan_.push_back(new ShapeAtomTypesSectionParser(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 BondTypesSectionParser(forceFieldOptions_)); |
| 90 |
> |
spMan_.push_back(new BendTypesSectionParser(forceFieldOptions_)); |
| 91 |
> |
spMan_.push_back(new TorsionTypesSectionParser(forceFieldOptions_)); |
| 92 |
|
|
| 93 |
< |
} |
| 94 |
< |
|
| 93 |
> |
} |
| 94 |
> |
|
| 95 |
|
SHAPES_FF::~SHAPES_FF(){ |
| 96 |
|
// We need to clean up the fortran side so we don't have bad things happen if |
| 97 |
|
// we try to create a second EAM force field. |
| 98 |
< |
destroyEAMTypes(); |
| 98 |
> |
destroyShapeTypes(); |
| 99 |
|
} |
| 100 |
< |
} //end namespace oopse |
| 101 |
< |
|
| 99 |
< |
void SHAPES_FF::parse(const std::string& filename) { |
| 100 |
> |
|
| 101 |
> |
void SHAPES_FF::parse(const std::string& filename) { |
| 102 |
|
ifstrstream* ffStream; |
| 103 |
|
ffStream = openForceFieldFile(filename); |
| 104 |
< |
|
| 104 |
> |
|
| 105 |
|
spMan_.parse(*ffStream, *this); |
| 106 |
< |
|
| 106 |
> |
|
| 107 |
|
ForceField::AtomTypeContainer::MapTypeIterator i; |
| 108 |
|
AtomType* at; |
| 109 |
< |
|
| 109 |
> |
|
| 110 |
|
for (at = atomTypeCont_.beginType(i); at != NULL; at = atomTypeCont_.nextType(i)) { |
| 111 |
< |
at->makeFortranAtomType(); |
| 111 |
> |
at->makeFortranAtomType(); |
| 112 |
|
} |
| 113 |
< |
|
| 113 |
> |
|
| 114 |
|
for (at = atomTypeCont_.beginType(i); at != NULL; at = atomTypeCont_.nextType(i)) { |
| 115 |
< |
at->complete(); |
| 115 |
> |
at->complete(); |
| 116 |
|
} |
| 117 |
|
|
| 118 |
+ |
int isError = 0; |
| 119 |
+ |
completeShapeFF(&isError); |
| 120 |
+ |
|
| 121 |
|
delete ffStream; |
| 122 |
< |
} |
| 123 |
< |
|
| 124 |
< |
|
| 125 |
< |
double SHAPES_FF::getRcutFromAtomType(AtomType* at){ |
| 126 |
< |
|
| 127 |
< |
} |
| 128 |
< |
|
| 124 |
< |
|
| 122 |
> |
} |
| 123 |
> |
|
| 124 |
> |
|
| 125 |
> |
// RealType SHAPES_FF::getRcutFromAtomType(AtomType* at){ |
| 126 |
> |
// } |
| 127 |
> |
} //end namespace oopse |
| 128 |
> |
|
