| 74 |
|
AtomInfo* atomInfo = new AtomInfo(); |
| 75 |
|
atomInfo->atomTypeName = name; |
| 76 |
|
atomInfo->pos = refPos; |
| 77 |
< |
atomInfo->dipole = refVec; |
| 77 |
> |
atomInfo->vec = refVec; |
| 78 |
|
atomInfo->hasVector = true; |
| 79 |
|
sites_->addAtomInfo(atomInfo); |
| 80 |
|
} |
| 82 |
|
void ReplacementVisitor::visit(DirectionalAtom *datom) { |
| 83 |
|
std::vector<AtomInfo*>atoms; |
| 84 |
|
|
| 85 |
< |
RotMat3x3d rotMatrix; |
| 86 |
< |
RotMat3x3d rotTrans; |
| 87 |
< |
AtomInfo * atomInfo; |
| 85 |
> |
RotMat3x3d A; |
| 86 |
> |
RotMat3x3d Atrans; |
| 87 |
> |
Mat3x3d I; |
| 88 |
|
Vector3d pos; |
| 89 |
+ |
Vector3d vel; |
| 90 |
+ |
Vector3d frc; |
| 91 |
+ |
Vector3d trq; |
| 92 |
+ |
Vector3d j; |
| 93 |
+ |
Mat3x3d skewMat; |
| 94 |
+ |
|
| 95 |
|
Vector3d newVec; |
| 96 |
< |
Quat4d q; |
| 96 |
> |
AtomInfo * atomInfo; |
| 97 |
|
AtomData * atomData; |
| 98 |
|
GenericData *data; |
| 99 |
|
bool haveAtomData; |
| 117 |
|
atomData = new AtomData; |
| 118 |
|
haveAtomData = false; |
| 119 |
|
} |
| 120 |
< |
|
| 115 |
< |
|
| 120 |
> |
|
| 121 |
|
pos = datom->getPos(); |
| 122 |
< |
q = datom->getQ(); |
| 123 |
< |
rotMatrix = datom->getA(); |
| 122 |
> |
vel = datom->getVel(); |
| 123 |
> |
|
| 124 |
> |
j = datom->getJ(); |
| 125 |
> |
I = datom->getI(); |
| 126 |
> |
A = datom->getA(); |
| 127 |
> |
|
| 128 |
> |
skewMat(0, 0) = 0; |
| 129 |
> |
skewMat(0, 1) = j[2] / I(2, 2); |
| 130 |
> |
skewMat(0, 2) = -j[1] / I(1, 1); |
| 131 |
> |
skewMat(1, 0) = -j[2] / I(2, 2); |
| 132 |
> |
skewMat(1, 1) = 0; |
| 133 |
> |
skewMat(1, 2) = j[0] / I(0, 0); |
| 134 |
> |
skewMat(2, 0) = j[1] / I(1, 1); |
| 135 |
> |
skewMat(2, 1) = -j[0] / I(0, 0); |
| 136 |
> |
skewMat(2, 2) = 0; |
| 137 |
> |
Mat3x3d mat = (A * skewMat).transpose(); |
| 138 |
|
|
| 139 |
|
// We need A^T to convert from body-fixed to space-fixed: |
| 140 |
< |
rotTrans = rotMatrix.transpose(); |
| 140 |
> |
Atrans = A.transpose(); |
| 141 |
|
|
| 142 |
|
AtomInfo* siteInfo; |
| 143 |
|
std::vector<AtomInfo*>::iterator iter; |
| 145 |
|
for( siteInfo = sites_->beginAtomInfo(iter); siteInfo; |
| 146 |
|
siteInfo = sites_->nextAtomInfo(iter) ) { |
| 147 |
|
|
| 148 |
< |
newVec = rotTrans * siteInfo->pos; |
| 148 |
> |
newVec = Atrans * siteInfo->pos; |
| 149 |
|
|
| 150 |
|
atomInfo = new AtomInfo; |
| 151 |
|
atomInfo->atomTypeName = siteInfo->atomTypeName; |
| 152 |
|
atomInfo->pos = pos + newVec; |
| 153 |
|
|
| 154 |
|
if (siteInfo->hasVector) { |
| 155 |
< |
newVec = rotTrans * siteInfo->dipole; |
| 156 |
< |
atomInfo->dipole = newVec; |
| 155 |
> |
newVec = Atrans * siteInfo->vec; |
| 156 |
> |
atomInfo->vec = newVec; |
| 157 |
|
} else { |
| 158 |
< |
atomInfo->dipole = V3Zero; |
| 158 |
> |
atomInfo->vec = V3Zero; |
| 159 |
|
} |
| 160 |
< |
|
| 160 |
> |
|
| 161 |
> |
atomInfo->vel = vel + mat * siteInfo->pos; |
| 162 |
> |
atomInfo->hasVelocity = true; |
| 163 |
> |
|
| 164 |
|
atomData->addAtomInfo(atomInfo); |
| 165 |
|
} |
| 166 |
|
if (!haveAtomData) { |
