| 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] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). |
| 40 |
+ |
* [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). |
| 41 |
|
*/ |
| 42 |
|
|
| 43 |
|
#include "primitives/DirectionalAtom.hpp" |
| 44 |
+ |
#include "types/DirectionalAdapter.hpp" |
| 45 |
+ |
#include "types/MultipoleAdapter.hpp" |
| 46 |
|
#include "utils/simError.h" |
| 47 |
< |
namespace oopse { |
| 47 |
> |
namespace OpenMD { |
| 48 |
|
|
| 49 |
< |
DirectionalAtom::DirectionalAtom(DirectionalAtomType* dAtomType) |
| 50 |
< |
: Atom(dAtomType){ |
| 49 |
> |
DirectionalAtom::DirectionalAtom(AtomType* dAtomType) |
| 50 |
> |
: Atom(dAtomType) { |
| 51 |
|
objType_= otDAtom; |
| 52 |
< |
if (dAtomType->isMultipole()) { |
| 53 |
< |
electroBodyFrame_ = dAtomType->getElectroBodyFrame(); |
| 52 |
> |
|
| 53 |
> |
DirectionalAdapter da = DirectionalAdapter(dAtomType); |
| 54 |
> |
I_ = da.getI(); |
| 55 |
> |
|
| 56 |
> |
MultipoleAdapter ma = MultipoleAdapter(dAtomType); |
| 57 |
> |
if (ma.isMultipole()) { |
| 58 |
> |
electroBodyFrame_ = ma.getElectroBodyFrame(); |
| 59 |
|
} |
| 60 |
< |
|
| 60 |
> |
|
| 61 |
|
// Check if one of the diagonal inertia tensor of this directional |
| 62 |
|
// atom is zero: |
| 63 |
|
int nLinearAxis = 0; |
| 64 |
|
Mat3x3d inertiaTensor = getI(); |
| 65 |
|
for (int i = 0; i < 3; i++) { |
| 66 |
< |
if (fabs(inertiaTensor(i, i)) < oopse::epsilon) { |
| 66 |
> |
if (fabs(inertiaTensor(i, i)) < OpenMD::epsilon) { |
| 67 |
|
linear_ = true; |
| 68 |
|
linearAxis_ = i; |
| 69 |
|
++ nLinearAxis; |
| 73 |
|
if (nLinearAxis > 1) { |
| 74 |
|
sprintf( painCave.errMsg, |
| 75 |
|
"Directional Atom warning.\n" |
| 76 |
< |
"\tOOPSE found more than one axis in this directional atom with a vanishing \n" |
| 76 |
> |
"\tOpenMD found more than one axis in this directional atom with a vanishing \n" |
| 77 |
|
"\tmoment of inertia."); |
| 78 |
|
painCave.isFatal = 0; |
| 79 |
|
simError(); |
| 81 |
|
} |
| 82 |
|
|
| 83 |
|
Mat3x3d DirectionalAtom::getI() { |
| 84 |
< |
return static_cast<DirectionalAtomType*>(getAtomType())->getI(); |
| 84 |
> |
return I_; |
| 85 |
|
} |
| 86 |
|
|
| 87 |
|
void DirectionalAtom::setPrevA(const RotMat3x3d& a) { |
| 142 |
|
ephi[1] = 0.0; |
| 143 |
|
ephi[2] = 1.0; |
| 144 |
|
|
| 145 |
+ |
//etheta[0] = -sphi; |
| 146 |
+ |
//etheta[1] = cphi; |
| 147 |
+ |
//etheta[2] = 0.0; |
| 148 |
+ |
|
| 149 |
|
etheta[0] = cphi; |
| 150 |
|
etheta[1] = sphi; |
| 151 |
|
etheta[2] = 0.0; |
