| 80 |
|
} |
| 81 |
|
|
| 82 |
|
void LJ::initialize() { |
| 83 |
– |
ForceField::AtomTypeContainer* atomTypes = forceField_->getAtomTypes(); |
| 84 |
– |
ForceField::AtomTypeContainer::MapTypeIterator i; |
| 85 |
– |
AtomType* at; |
| 83 |
|
|
| 84 |
< |
for (at = atomTypes->beginType(i); at != NULL; |
| 85 |
< |
at = atomTypes->nextType(i)) { |
| 86 |
< |
LennardJonesAdapter lja = LennardJonesAdapter(at); |
| 87 |
< |
if (lja.isLennardJones()){ |
| 88 |
< |
addType(at); |
| 89 |
< |
} |
| 84 |
> |
LJtypes.clear(); |
| 85 |
> |
LJtids.clear(); |
| 86 |
> |
MixingMap.clear(); |
| 87 |
> |
nLJ_ = 0; |
| 88 |
> |
|
| 89 |
> |
LJtids.resize( forceField_->getNAtomType(), -1); |
| 90 |
> |
|
| 91 |
> |
set<AtomType*>::iterator at; |
| 92 |
> |
for (at = simTypes_.begin(); at != simTypes_.end(); ++at) { |
| 93 |
> |
if ((*at)->isLennardJones()) nLJ_++; |
| 94 |
|
} |
| 95 |
+ |
|
| 96 |
+ |
MixingMap.resize(nLJ_); |
| 97 |
+ |
|
| 98 |
+ |
for (at = simTypes_.begin(); at != simTypes_.end(); ++at) { |
| 99 |
+ |
if ((*at)->isLennardJones()) addType(*at); |
| 100 |
+ |
} |
| 101 |
+ |
|
| 102 |
|
ForceField::NonBondedInteractionTypeContainer* nbiTypes = forceField_->getNonBondedInteractionTypes(); |
| 103 |
|
ForceField::NonBondedInteractionTypeContainer::MapTypeIterator j; |
| 104 |
|
NonBondedInteractionType* nbt; |
| 105 |
|
ForceField::NonBondedInteractionTypeContainer::KeyType keys; |
| 106 |
|
|
| 99 |
– |
|
| 107 |
|
for (nbt = nbiTypes->beginType(j); nbt != NULL; |
| 108 |
|
nbt = nbiTypes->nextType(j)) { |
| 109 |
|
|
| 132 |
|
} |
| 133 |
|
initialized_ = true; |
| 134 |
|
} |
| 128 |
– |
|
| 135 |
|
|
| 136 |
|
|
| 137 |
|
void LJ::addType(AtomType* atomType){ |
| 141 |
|
RealType epsilon1 = lja1.getEpsilon(); |
| 142 |
|
|
| 143 |
|
// add it to the map: |
| 144 |
< |
|
| 145 |
< |
pair<map<int,AtomType*>::iterator,bool> ret; |
| 146 |
< |
ret = LJMap.insert( pair<int, AtomType*>(atomType->getIdent(), atomType) ); |
| 144 |
> |
int atid = atomType->getIdent(); |
| 145 |
> |
int ljtid = LJtypes.size(); |
| 146 |
> |
|
| 147 |
> |
pair<set<int>::iterator,bool> ret; |
| 148 |
> |
ret = LJtypes.insert( atid ); |
| 149 |
|
if (ret.second == false) { |
| 150 |
|
sprintf( painCave.errMsg, |
| 151 |
|
"LJ already had a previous entry with ident %d\n", |
| 152 |
< |
atomType->getIdent()); |
| 152 |
> |
atid) ; |
| 153 |
|
painCave.severity = OPENMD_INFO; |
| 154 |
|
painCave.isFatal = 0; |
| 155 |
|
simError(); |
| 156 |
|
} |
| 157 |
< |
|
| 157 |
> |
|
| 158 |
> |
LJtids[atid] = ljtid; |
| 159 |
> |
MixingMap[ljtid].resize( nLJ_ ); |
| 160 |
> |
|
| 161 |
|
// Now, iterate over all known types and add to the mixing map: |
| 162 |
|
|
| 163 |
< |
std::map<int, AtomType*>::iterator it; |
| 164 |
< |
for( it = LJMap.begin(); it != LJMap.end(); ++it) { |
| 154 |
< |
|
| 155 |
< |
AtomType* atype2 = (*it).second; |
| 163 |
> |
std::set<int>::iterator it; |
| 164 |
> |
for( it = LJtypes.begin(); it != LJtypes.end(); ++it) { |
| 165 |
|
|
| 166 |
+ |
int ljtid2 = LJtids[ (*it) ]; |
| 167 |
+ |
AtomType* atype2 = forceField_->getAtomType( (*it) ); |
| 168 |
+ |
|
| 169 |
|
LJInteractionData mixer; |
| 170 |
|
mixer.sigma = getSigma(atomType, atype2); |
| 171 |
|
mixer.epsilon = getEpsilon(atomType, atype2); |
| 172 |
|
mixer.sigmai = 1.0 / mixer.sigma; |
| 173 |
|
mixer.explicitlySet = false; |
| 174 |
+ |
MixingMap[ljtid2].resize( nLJ_ ); |
| 175 |
|
|
| 176 |
< |
std::pair<AtomType*, AtomType*> key1, key2; |
| 177 |
< |
key1 = std::make_pair(atomType, atype2); |
| 178 |
< |
key2 = std::make_pair(atype2, atomType); |
| 166 |
< |
|
| 167 |
< |
MixingMap[key1] = mixer; |
| 168 |
< |
if (key2 != key1) { |
| 169 |
< |
MixingMap[key2] = mixer; |
| 176 |
> |
MixingMap[ljtid][ljtid2] = mixer; |
| 177 |
> |
if (ljtid2 != ljtid) { |
| 178 |
> |
MixingMap[ljtid2][ljtid] = mixer; |
| 179 |
|
} |
| 180 |
|
} |
| 181 |
|
} |
| 188 |
|
mixer.sigmai = 1.0 / mixer.sigma; |
| 189 |
|
mixer.explicitlySet = true; |
| 190 |
|
|
| 191 |
< |
std::pair<AtomType*, AtomType*> key1, key2; |
| 192 |
< |
key1 = std::make_pair(atype1, atype2); |
| 193 |
< |
key2 = std::make_pair(atype2, atype1); |
| 191 |
> |
int atid1 = atype1->getIdent(); |
| 192 |
> |
int atid2 = atype2->getIdent(); |
| 193 |
> |
|
| 194 |
> |
int ljtid1, ljtid2; |
| 195 |
> |
|
| 196 |
> |
pair<set<int>::iterator,bool> ret; |
| 197 |
> |
ret = LJtypes.insert( atid1 ); |
| 198 |
> |
if (ret.second == false) { |
| 199 |
> |
// already had this type in the LJMap, just get the ljtid: |
| 200 |
> |
ljtid1 = LJtids[ atid1 ]; |
| 201 |
> |
} else { |
| 202 |
> |
// didn't already have it, so make a new one and assign it: |
| 203 |
> |
ljtid1 = nLJ_; |
| 204 |
> |
LJtids[atid1] = nLJ_; |
| 205 |
> |
nLJ_++; |
| 206 |
> |
} |
| 207 |
> |
|
| 208 |
> |
ret = LJtypes.insert( atid2 ); |
| 209 |
> |
if (ret.second == false) { |
| 210 |
> |
// already had this type in the LJMap, just get the ljtid: |
| 211 |
> |
ljtid2 = LJtids[ atid2 ]; |
| 212 |
> |
} else { |
| 213 |
> |
// didn't already have it, so make a new one and assign it: |
| 214 |
> |
ljtid2 = nLJ_; |
| 215 |
> |
LJtids[atid2] = nLJ_; |
| 216 |
> |
nLJ_++; |
| 217 |
> |
} |
| 218 |
|
|
| 219 |
< |
MixingMap[key1] = mixer; |
| 220 |
< |
if (key2 != key1) { |
| 221 |
< |
MixingMap[key2] = mixer; |
| 219 |
> |
MixingMap.resize(nLJ_); |
| 220 |
> |
MixingMap[ljtid1].resize(nLJ_); |
| 221 |
> |
|
| 222 |
> |
MixingMap[ljtid1][ljtid2] = mixer; |
| 223 |
> |
if (ljtid2 != ljtid1) { |
| 224 |
> |
MixingMap[ljtid2].resize(nLJ_); |
| 225 |
> |
MixingMap[ljtid2][ljtid1] = mixer; |
| 226 |
|
} |
| 227 |
|
} |
| 228 |
|
|
| 229 |
|
void LJ::calcForce(InteractionData &idat) { |
| 230 |
|
if (!initialized_) initialize(); |
| 194 |
– |
map<pair<AtomType*, AtomType*>, LJInteractionData>::iterator it; |
| 195 |
– |
it = MixingMap.find( idat.atypes ); |
| 231 |
|
|
| 232 |
< |
if (it != MixingMap.end()) { |
| 198 |
< |
|
| 199 |
< |
LJInteractionData mixer = (*it).second; |
| 200 |
< |
|
| 201 |
< |
RealType sigmai = mixer.sigmai; |
| 202 |
< |
RealType epsilon = mixer.epsilon; |
| 203 |
< |
|
| 204 |
< |
RealType ros; |
| 205 |
< |
RealType rcos; |
| 206 |
< |
RealType myPot = 0.0; |
| 207 |
< |
RealType myPotC = 0.0; |
| 208 |
< |
RealType myDeriv = 0.0; |
| 209 |
< |
RealType myDerivC = 0.0; |
| 210 |
< |
|
| 211 |
< |
ros = *(idat.rij) * sigmai; |
| 212 |
< |
|
| 213 |
< |
getLJfunc(ros, myPot, myDeriv); |
| 214 |
< |
|
| 215 |
< |
if (idat.shiftedPot) { |
| 216 |
< |
rcos = *(idat.rcut) * sigmai; |
| 217 |
< |
getLJfunc(rcos, myPotC, myDerivC); |
| 218 |
< |
myDerivC = 0.0; |
| 219 |
< |
} else if (idat.shiftedForce) { |
| 220 |
< |
rcos = *(idat.rcut) * sigmai; |
| 221 |
< |
getLJfunc(rcos, myPotC, myDerivC); |
| 222 |
< |
myPotC = myPotC + myDerivC * (*(idat.rij) - *(idat.rcut)) * sigmai; |
| 223 |
< |
} else { |
| 224 |
< |
myPotC = 0.0; |
| 225 |
< |
myDerivC = 0.0; |
| 226 |
< |
} |
| 232 |
> |
LJInteractionData &mixer = MixingMap[LJtids[idat.atid1]][LJtids[idat.atid2]]; |
| 233 |
|
|
| 234 |
< |
RealType pot_temp = *(idat.vdwMult) * epsilon * (myPot - myPotC); |
| 235 |
< |
*(idat.vpair) += pot_temp; |
| 236 |
< |
|
| 237 |
< |
RealType dudr = *(idat.sw) * *(idat.vdwMult) * epsilon * (myDeriv - |
| 238 |
< |
myDerivC)*sigmai; |
| 239 |
< |
|
| 240 |
< |
(*(idat.pot))[VANDERWAALS_FAMILY] += *(idat.sw) * pot_temp; |
| 241 |
< |
*(idat.f1) += *(idat.d) * dudr / *(idat.rij); |
| 234 |
> |
RealType sigmai = mixer.sigmai; |
| 235 |
> |
RealType epsilon = mixer.epsilon; |
| 236 |
> |
|
| 237 |
> |
RealType ros; |
| 238 |
> |
RealType rcos; |
| 239 |
> |
RealType myPot = 0.0; |
| 240 |
> |
RealType myPotC = 0.0; |
| 241 |
> |
RealType myDeriv = 0.0; |
| 242 |
> |
RealType myDerivC = 0.0; |
| 243 |
> |
|
| 244 |
> |
ros = *(idat.rij) * sigmai; |
| 245 |
> |
|
| 246 |
> |
getLJfunc(ros, myPot, myDeriv); |
| 247 |
> |
|
| 248 |
> |
if (idat.shiftedPot) { |
| 249 |
> |
rcos = *(idat.rcut) * sigmai; |
| 250 |
> |
getLJfunc(rcos, myPotC, myDerivC); |
| 251 |
> |
myDerivC = 0.0; |
| 252 |
> |
} else if (idat.shiftedForce) { |
| 253 |
> |
rcos = *(idat.rcut) * sigmai; |
| 254 |
> |
getLJfunc(rcos, myPotC, myDerivC); |
| 255 |
> |
myPotC = myPotC + myDerivC * (*(idat.rij) - *(idat.rcut)) * sigmai; |
| 256 |
> |
} else { |
| 257 |
> |
myPotC = 0.0; |
| 258 |
> |
myDerivC = 0.0; |
| 259 |
|
} |
| 260 |
+ |
|
| 261 |
+ |
RealType pot_temp = *(idat.vdwMult) * epsilon * (myPot - myPotC); |
| 262 |
+ |
*(idat.vpair) += pot_temp; |
| 263 |
+ |
|
| 264 |
+ |
RealType dudr = *(idat.sw) * *(idat.vdwMult) * epsilon * (myDeriv - |
| 265 |
+ |
myDerivC)*sigmai; |
| 266 |
+ |
(*(idat.pot))[VANDERWAALS_FAMILY] += *(idat.sw) * pot_temp; |
| 267 |
+ |
*(idat.f1) += *(idat.d) * dudr / *(idat.rij); |
| 268 |
+ |
|
| 269 |
|
return; |
| 270 |
|
} |
| 271 |
|
|
| 286 |
|
|
| 287 |
|
RealType LJ::getSuggestedCutoffRadius(pair<AtomType*, AtomType*> atypes) { |
| 288 |
|
if (!initialized_) initialize(); |
| 289 |
< |
map<pair<AtomType*, AtomType*>, LJInteractionData>::iterator it; |
| 290 |
< |
it = MixingMap.find(atypes); |
| 291 |
< |
if (it == MixingMap.end()) |
| 292 |
< |
return 0.0; |
| 293 |
< |
else { |
| 294 |
< |
LJInteractionData mixer = (*it).second; |
| 289 |
> |
|
| 290 |
> |
int atid1 = atypes.first->getIdent(); |
| 291 |
> |
int atid2 = atypes.second->getIdent(); |
| 292 |
> |
int ljtid1 = LJtids[atid1]; |
| 293 |
> |
int ljtid2 = LJtids[atid2]; |
| 294 |
> |
|
| 295 |
> |
if (ljtid1 == -1 || ljtid2 == -1) return 0.0; |
| 296 |
> |
else { |
| 297 |
> |
LJInteractionData mixer = MixingMap[ljtid1][ljtid2]; |
| 298 |
|
return 2.5 * mixer.sigma; |
| 299 |
|
} |
| 300 |
|
} |
| 301 |
< |
|
| 301 |
> |
|
| 302 |
|
} |
