| 160 |
|
|
| 161 |
|
r12.normalize(); |
| 162 |
|
|
| 163 |
< |
AtomType* atype1 = static_cast<Atom*>(sd1)->getAtomType(); |
| 164 |
< |
MultipoleAdapter ma1 = MultipoleAdapter(atype1); |
| 165 |
< |
Vector3d vec; |
| 166 |
< |
if (ma1.isDipole() ) |
| 167 |
< |
vec = sd1->getDipole(); |
| 168 |
< |
else |
| 163 |
> |
Vector3d vec; |
| 164 |
> |
|
| 165 |
> |
if (sd1->isAtom()) { |
| 166 |
> |
AtomType* atype1 = static_cast<Atom*>(sd1)->getAtomType(); |
| 167 |
> |
MultipoleAdapter ma1 = MultipoleAdapter(atype1); |
| 168 |
> |
|
| 169 |
> |
if (ma1.isDipole() ) |
| 170 |
> |
vec = sd1->getDipole(); |
| 171 |
> |
else |
| 172 |
> |
vec = sd1->getA().transpose() * V3Z; |
| 173 |
> |
} else { |
| 174 |
|
vec = sd1->getA().transpose() * V3Z; |
| 175 |
< |
vec.normalize(); |
| 175 |
> |
} |
| 176 |
|
|
| 177 |
+ |
vec.normalize(); |
| 178 |
+ |
|
| 179 |
|
return dot(r12, vec); |
| 180 |
|
} |
| 181 |
|
|
| 182 |
|
RealType GofROmega::evaluateAngle(StuntDouble* sd1, StuntDouble* sd2) { |
| 176 |
– |
|
| 177 |
– |
AtomType* atype1 = static_cast<Atom*>(sd1)->getAtomType(); |
| 178 |
– |
AtomType* atype2 = static_cast<Atom*>(sd2)->getAtomType(); |
| 179 |
– |
|
| 180 |
– |
MultipoleAdapter ma1 = MultipoleAdapter(atype1); |
| 181 |
– |
MultipoleAdapter ma2 = MultipoleAdapter(atype2); |
| 182 |
– |
|
| 183 |
|
Vector3d v1, v2; |
| 184 |
|
|
| 185 |
< |
if (ma1.isDipole() ) |
| 186 |
< |
v1 = sd1->getDipole(); |
| 187 |
< |
else |
| 185 |
> |
if (sd1->isAtom()){ |
| 186 |
> |
AtomType* atype1 = static_cast<Atom*>(sd1)->getAtomType(); |
| 187 |
> |
MultipoleAdapter ma1 = MultipoleAdapter(atype1); |
| 188 |
> |
if (ma1.isDipole() ) |
| 189 |
> |
v1 = sd1->getDipole(); |
| 190 |
> |
else |
| 191 |
> |
v1 = sd1->getA().transpose() * V3Z; |
| 192 |
> |
} else { |
| 193 |
|
v1 = sd1->getA().transpose() * V3Z; |
| 194 |
< |
|
| 195 |
< |
if (ma2.isDipole() ) |
| 196 |
< |
v2 = sd2->getDipole(); |
| 197 |
< |
else |
| 194 |
> |
} |
| 195 |
> |
|
| 196 |
> |
if (sd2->isAtom()) { |
| 197 |
> |
AtomType* atype2 = static_cast<Atom*>(sd2)->getAtomType(); |
| 198 |
> |
MultipoleAdapter ma2 = MultipoleAdapter(atype2); |
| 199 |
> |
|
| 200 |
> |
if (ma2.isDipole() ) |
| 201 |
> |
v2 = sd2->getDipole(); |
| 202 |
> |
else |
| 203 |
> |
v2 = sd2->getA().transpose() * V3Z; |
| 204 |
> |
} else { |
| 205 |
|
v2 = sd2->getA().transpose() * V3Z; |
| 206 |
< |
|
| 206 |
> |
} |
| 207 |
> |
|
| 208 |
|
v1.normalize(); |
| 209 |
|
v2.normalize(); |
| 210 |
|
return dot(v1, v2); |
