# | Line 57 | Line 57 | |
---|---|---|
57 | #include "UseTheForce/EAM_FF.hpp" | |
58 | #include "UseTheForce/ForceFieldFactory.hpp" | |
59 | #include "UseTheForce/ForceFieldCreator.hpp" | |
60 | + | #include "UseTheForce/SHAPES_FF.hpp" |
61 | #include "lattice/LatticeFactory.hpp" | |
62 | #include "lattice/LatticeCreator.hpp" | |
63 | #include "lattice/FCCLattice.hpp" | |
# | Line 72 | Line 73 | namespace oopse { | |
73 | ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("LJ")); | |
74 | //in theory, EAM can also be merged | |
75 | ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM_FF>("EAM")); | |
76 | + | //heck, that worked... let's try merging SHAPES |
77 | + | ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES")); |
78 | + | |
79 | } | |
80 | ||
81 | void registerIntegrators() { |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |