ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/nonbonded/InteractionManager.cpp
(Generate patch)

Comparing:
branches/development/src/nonbonded/InteractionManager.cpp (file contents), Revision 1505 by gezelter, Sun Oct 3 22:18:59 2010 UTC vs.
trunk/src/nonbonded/InteractionManager.cpp (file contents), Revision 2005 by gezelter, Wed Jun 11 18:37:56 2014 UTC

# Line 35 | Line 35
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]  Vardeman & Gezelter, in progress (2009).                        
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (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 "nonbonded/InteractionManager.hpp"
44  
45   namespace OpenMD {
45 –
46 –  bool InteractionManager::initialized_ = false;
47 –  ForceField* InteractionManager::forceField_ = NULL;  
48 –  InteractionManager* InteractionManager::_instance = NULL;
49 –  map<int, AtomType*> InteractionManager::typeMap_;
50 –  map<pair<AtomType*, AtomType*>, set<NonBondedInteraction*> > InteractionManager::interactions_;
51 –
52 –  InteractionManager* InteractionManager::Instance() {
53 –    if (!_instance) {
54 –      _instance = new InteractionManager();
55 –    }
56 –    return _instance;
57 –  }
46  
47 <  void InteractionManager::initialize() {
48 <    
47 >  InteractionManager::InteractionManager() {
48 >
49 >    initialized_ = false;
50 >        
51      lj_ = new LJ();
52      gb_ = new GB();
53      sticky_ = new Sticky();
54 +    morse_ = new Morse();
55 +    repulsivePower_ = new RepulsivePower();
56      eam_ = new EAM();
57      sc_ = new SC();
66 –    morse_ = new Morse();
58      electrostatic_ = new Electrostatic();
59 +    maw_ = new MAW();
60 +  }
61  
62 +  InteractionManager::~InteractionManager() {
63 +    delete lj_;
64 +    delete gb_;
65 +    delete sticky_;
66 +    delete morse_;
67 +    delete repulsivePower_;
68 +    delete eam_;
69 +    delete sc_;
70 +    delete electrostatic_;
71 +    delete maw_;
72 +  }
73 +
74 +  void InteractionManager::initialize() {
75 +
76 +    if (initialized_) return;
77 +
78 +    ForceField* forceField_ = info_->getForceField();
79 +    
80      lj_->setForceField(forceField_);
81      gb_->setForceField(forceField_);
82      sticky_->setForceField(forceField_);
83      eam_->setForceField(forceField_);
84      sc_->setForceField(forceField_);
85      morse_->setForceField(forceField_);
86 +    electrostatic_->setSimInfo(info_);
87      electrostatic_->setForceField(forceField_);
88 +    maw_->setForceField(forceField_);
89 +    repulsivePower_->setForceField(forceField_);
90  
91      ForceField::AtomTypeContainer* atomTypes = forceField_->getAtomTypes();
92 +    int nTypes = atomTypes->size();
93 +    sHash_.resize(nTypes);
94 +    iHash_.resize(nTypes);
95 +    interactions_.resize(nTypes);
96      ForceField::AtomTypeContainer::MapTypeIterator i1, i2;
97      AtomType* atype1;
98      AtomType* atype2;
99 <    pair<AtomType*, AtomType*> key;
100 <    pair<set<NonBondedInteraction*>::iterator, bool> ret;
101 <    
102 <    for (atype1 = atomTypes->beginType(i1); atype1 != NULL;
103 <         atype1 = atomTypes->nextType(i1)) {
104 <      
105 <      // add it to the map:
106 <      AtomTypeProperties atp = atype1->getATP();    
107 <      
99 >    int atid1, atid2;
100 >
101 >    // We only need to worry about the types that are actually in the simulation:
102 >
103 >    set<AtomType*> atypes = info_->getSimulatedAtomTypes();
104 >
105 >    lj_->setSimulatedAtomTypes(atypes);
106 >    gb_->setSimulatedAtomTypes(atypes);
107 >    sticky_->setSimulatedAtomTypes(atypes);
108 >    eam_->setSimulatedAtomTypes(atypes);
109 >    sc_->setSimulatedAtomTypes(atypes);
110 >    morse_->setSimulatedAtomTypes(atypes);
111 >    electrostatic_->setSimInfo(info_);
112 >    electrostatic_->setSimulatedAtomTypes(atypes);
113 >    maw_->setSimulatedAtomTypes(atypes);
114 >    repulsivePower_->setSimulatedAtomTypes(atypes);
115 >
116 >    set<AtomType*>::iterator at;
117 >
118 >    for (at = atypes.begin(); at != atypes.end(); ++at) {
119 >          
120 >      atype1 = *at;
121 >      atid1 = atype1->getIdent();
122 >      iHash_[atid1].resize(nTypes);
123 >      interactions_[atid1].resize(nTypes);
124 >
125 >      // add it to the map:      
126        pair<map<int,AtomType*>::iterator,bool> ret;    
127 <      ret = typeMap_.insert( pair<int, AtomType*>(atp.ident, atype1) );
127 >      ret = typeMap_.insert( pair<int, AtomType*>(atid1, atype1) );
128        if (ret.second == false) {
129          sprintf( painCave.errMsg,
130                   "InteractionManager already had a previous entry with ident %d\n",
131 <                 atp.ident);
131 >                 atype1->getIdent());
132          painCave.severity = OPENMD_INFO;
133          painCave.isFatal = 0;
134          simError();                
135        }
136 +          
137 +      if (atype1->isLennardJones()) {
138 +        sHash_[atid1] |= LJ_INTERACTION;
139 +      }
140 +      if (atype1->isElectrostatic()) {
141 +        sHash_[atid1] |= ELECTROSTATIC_INTERACTION;
142 +      }
143 +      if (atype1->isSticky()) {
144 +        sHash_[atid1] |= STICKY_INTERACTION;
145 +      }
146 +      if (atype1->isStickyPower()) {
147 +        sHash_[atid1] |= STICKY_INTERACTION;
148 +      }
149 +      if (atype1->isEAM()) {      
150 +        sHash_[atid1] |= EAM_INTERACTION;
151 +      }
152 +      if (atype1->isSC()) {
153 +        sHash_[atid1] |= SC_INTERACTION;
154 +      }
155 +      if (atype1->isGayBerne()) {
156 +        sHash_[atid1] |= GB_INTERACTION;
157 +      }
158      }
101 –    
159      // Now, iterate over all known types and add to the interaction map:
160      
161      map<int, AtomType*>::iterator it1, it2;
162      for (it1 = typeMap_.begin(); it1 != typeMap_.end(); ++it1) {
163        atype1 = (*it1).second;
164 +      atid1 = atype1->getIdent();
165  
166        for( it2 = typeMap_.begin(); it2 != typeMap_.end(); ++it2) {        
167          atype2 = (*it2).second;
168 +        atid2 = atype2->getIdent();
169 +                              
170 +        iHash_[atid1][atid2] = 0;
171          
111 –        bool vdwExplicit = false;
112 –        bool metExplicit = false;
113 –        bool hbExplicit = false;
114 –                      
115 –        key = make_pair(atype1, atype2);
116 –        
172          if (atype1->isLennardJones() && atype2->isLennardJones()) {
173 <          interactions_[key].insert(lj_);
173 >          interactions_[atid1][atid2].insert(lj_);
174 >          iHash_[atid1][atid2] |= LJ_INTERACTION;
175          }
176          if (atype1->isElectrostatic() && atype2->isElectrostatic() ) {
177 <          interactions_[key].insert(electrostatic_);
177 >          interactions_[atid1][atid2].insert(electrostatic_);
178 >          iHash_[atid1][atid2] |= ELECTROSTATIC_INTERACTION;
179          }
180          if (atype1->isSticky() && atype2->isSticky() ) {
181 <          interactions_[key].insert(sticky_);
181 >          interactions_[atid1][atid2].insert(sticky_);
182 >          iHash_[atid1][atid2] |= STICKY_INTERACTION;
183          }
184          if (atype1->isStickyPower() && atype2->isStickyPower() ) {
185 <          interactions_[key].insert(sticky_);
185 >          interactions_[atid1][atid2].insert(sticky_);
186 >          iHash_[atid1][atid2] |= STICKY_INTERACTION;
187          }
188          if (atype1->isEAM() && atype2->isEAM() ) {
189 <          interactions_[key].insert(eam_);
189 >          interactions_[atid1][atid2].insert(eam_);
190 >          iHash_[atid1][atid2] |= EAM_INTERACTION;
191          }
192          if (atype1->isSC() && atype2->isSC() ) {
193 <          interactions_[key].insert(sc_);
193 >          interactions_[atid1][atid2].insert(sc_);
194 >          iHash_[atid1][atid2] |= SC_INTERACTION;
195          }
196          if (atype1->isGayBerne() && atype2->isGayBerne() ) {
197 <          interactions_[key].insert(gb_);
197 >          interactions_[atid1][atid2].insert(gb_);
198 >          iHash_[atid1][atid2] |= GB_INTERACTION;
199          }
200          if ((atype1->isGayBerne() && atype2->isLennardJones())
201              || (atype1->isLennardJones() && atype2->isGayBerne())) {
202 <          interactions_[key].insert(gb_);
202 >          interactions_[atid1][atid2].insert(gb_);
203 >          iHash_[atid1][atid2] |= GB_INTERACTION;
204          }
205          
206          // look for an explicitly-set non-bonded interaction type using the
207          // two atom types.
208          NonBondedInteractionType* nbiType = forceField_->getNonBondedInteractionType(atype1->getName(), atype2->getName());
209 +        
210 +        if (nbiType != NULL) {
211  
212 <        if (nbiType->isLennardJones()) {
213 <          // We found an explicit Lennard-Jones interaction.  
214 <          // override all other vdw entries for this pair of atom types:
150 <          set<NonBondedInteraction*>::iterator it;
151 <          for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it) {
152 <            InteractionFamily ifam = (*it)->getFamily();
153 <            if (ifam == VANDERWAALS_FAMILY) interactions_[key].erase(*it);
154 <          }
155 <          interactions_[key].insert(lj_);
156 <          vdwExplicit = true;
157 <        }
212 >          bool vdwExplicit = false;
213 >          bool metExplicit = false;
214 >          // bool hbExplicit = false;
215  
216 <        if (nbiType->isMorse()) {
217 <          if (vdwExplicit) {
218 <            sprintf( painCave.errMsg,
219 <                     "InteractionManager::initialize found more than one explicit\n"
220 <                     "\tvan der Waals interaction for atom types %s - %s\n",
221 <                     atype1->getName().c_str(), atype2->getName().c_str());
222 <            painCave.severity = OPENMD_ERROR;
223 <            painCave.isFatal = 1;
224 <            simError();
225 <          }
226 <          // We found an explicit Morse interaction.  
227 <          // override all other vdw entries for this pair of atom types:
228 <          set<NonBondedInteraction*>::iterator it;
229 <          for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it) {
230 <            InteractionFamily ifam = (*it)->getFamily();
174 <            if (ifam == VANDERWAALS_FAMILY) interactions_[key].erase(*it);
216 >          if (nbiType->isLennardJones()) {
217 >            // We found an explicit Lennard-Jones interaction.  
218 >            // override all other vdw entries for this pair of atom types:
219 >            set<NonBondedInteraction*>::iterator it;
220 >            for (it = interactions_[atid1][atid2].begin();
221 >                 it != interactions_[atid1][atid2].end(); ++it) {
222 >              InteractionFamily ifam = (*it)->getFamily();
223 >              if (ifam == VANDERWAALS_FAMILY) {
224 >                interactions_[atid1][atid2].erase(*it);
225 >                iHash_[atid1][atid2] ^= (*it)->getHash();
226 >              }
227 >            }
228 >            interactions_[atid1][atid2].insert(lj_);
229 >            iHash_[atid1][atid2] |= LJ_INTERACTION;
230 >            vdwExplicit = true;
231            }
232 <          interactions_[key].insert(morse_);
233 <          vdwExplicit = true;
234 <        }
235 <
236 <        if (nbiType->isEAM()) {
237 <          // We found an explicit EAM interaction.  
238 <          // override all other metallic entries for this pair of atom types:
239 <          set<NonBondedInteraction*>::iterator it;
240 <          for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it) {
241 <            InteractionFamily ifam = (*it)->getFamily();
242 <            if (ifam == METALLIC_FAMILY) interactions_[key].erase(*it);
232 >          
233 >          if (nbiType->isMorse()) {
234 >            if (vdwExplicit) {
235 >              sprintf( painCave.errMsg,
236 >                       "InteractionManager::initialize found more than one "
237 >                       "explicit \n"
238 >                       "\tvan der Waals interaction for atom types %s - %s\n",
239 >                       atype1->getName().c_str(), atype2->getName().c_str());
240 >              painCave.severity = OPENMD_ERROR;
241 >              painCave.isFatal = 1;
242 >              simError();
243 >            }
244 >            // We found an explicit Morse interaction.  
245 >            // override all other vdw entries for this pair of atom types:
246 >            set<NonBondedInteraction*>::iterator it;
247 >            for (it = interactions_[atid1][atid2].begin();
248 >                 it != interactions_[atid1][atid2].end(); ++it) {
249 >              InteractionFamily ifam = (*it)->getFamily();
250 >              if (ifam == VANDERWAALS_FAMILY) {
251 >                interactions_[atid1][atid2].erase(*it);
252 >                iHash_[atid1][atid2] ^= (*it)->getHash();
253 >              }
254 >            }
255 >            interactions_[atid1][atid2].insert(morse_);
256 >            iHash_[atid1][atid2] |= MORSE_INTERACTION;
257 >            vdwExplicit = true;
258            }
188 –          interactions_[key].insert(eam_);
189 –          metExplicit = true;
190 –        }
259  
260 <        if (nbiType->isSC()) {
261 <          if (metExplicit) {
262 <            sprintf( painCave.errMsg,
263 <                     "InteractionManager::initialize found more than one explicit\n"
264 <                     "\tmetallic interaction for atom types %s - %s\n",
265 <                     atype1->getName().c_str(), atype2->getName().c_str());
266 <            painCave.severity = OPENMD_ERROR;
267 <            painCave.isFatal = 1;
268 <            simError();
260 >          if (nbiType->isRepulsivePower()) {
261 >            if (vdwExplicit) {
262 >              sprintf( painCave.errMsg,
263 >                       "InteractionManager::initialize found more than one "
264 >                       "explicit \n"
265 >                       "\tvan der Waals interaction for atom types %s - %s\n",
266 >                       atype1->getName().c_str(), atype2->getName().c_str());
267 >              painCave.severity = OPENMD_ERROR;
268 >              painCave.isFatal = 1;
269 >              simError();
270 >            }
271 >            // We found an explicit RepulsivePower interaction.  
272 >            // override all other vdw entries for this pair of atom types:
273 >            set<NonBondedInteraction*>::iterator it;
274 >            for (it = interactions_[atid1][atid2].begin();
275 >                 it != interactions_[atid1][atid2].end(); ++it) {
276 >              InteractionFamily ifam = (*it)->getFamily();
277 >              if (ifam == VANDERWAALS_FAMILY) {
278 >                interactions_[atid1][atid2].erase(*it);
279 >                iHash_[atid1][atid2] ^= (*it)->getHash();
280 >              }
281 >            }
282 >            interactions_[atid1][atid2].insert(repulsivePower_);
283 >            iHash_[atid1][atid2] |= REPULSIVEPOWER_INTERACTION;
284 >            vdwExplicit = true;
285            }
286 <          // We found an explicit Sutton-Chen interaction.  
287 <          // override all other metallic entries for this pair of atom types:
288 <          set<NonBondedInteraction*>::iterator it;
289 <          for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it) {
290 <            InteractionFamily ifam = (*it)->getFamily();
291 <            if (ifam == METALLIC_FAMILY) interactions_[key].erase(*it);
286 >          
287 >          
288 >          if (nbiType->isEAM()) {
289 >            // We found an explicit EAM interaction.  
290 >            // override all other metallic entries for this pair of atom types:
291 >            set<NonBondedInteraction*>::iterator it;
292 >            for (it = interactions_[atid1][atid2].begin();
293 >                 it != interactions_[atid1][atid2].end(); ++it) {
294 >              InteractionFamily ifam = (*it)->getFamily();
295 >              if (ifam == METALLIC_FAMILY) {
296 >                interactions_[atid1][atid2].erase(*it);
297 >                iHash_[atid1][atid2] ^= (*it)->getHash();
298 >              }
299 >            }
300 >            interactions_[atid1][atid2].insert(eam_);
301 >            iHash_[atid1][atid2] |= EAM_INTERACTION;
302 >            metExplicit = true;
303            }
304 <          interactions_[key].insert(sc_);
305 <          metExplicit = true;
304 >          
305 >          if (nbiType->isSC()) {
306 >            if (metExplicit) {
307 >              sprintf( painCave.errMsg,
308 >                       "InteractionManager::initialize found more than one "
309 >                       "explicit\n"
310 >                       "\tmetallic interaction for atom types %s - %s\n",
311 >                       atype1->getName().c_str(), atype2->getName().c_str());
312 >              painCave.severity = OPENMD_ERROR;
313 >              painCave.isFatal = 1;
314 >              simError();
315 >            }
316 >            // We found an explicit Sutton-Chen interaction.  
317 >            // override all other metallic entries for this pair of atom types:
318 >            set<NonBondedInteraction*>::iterator it;
319 >            for (it = interactions_[atid1][atid2].begin();
320 >                 it != interactions_[atid1][atid2].end(); ++it) {
321 >              InteractionFamily ifam = (*it)->getFamily();
322 >              if (ifam == METALLIC_FAMILY) {
323 >                interactions_[atid1][atid2].erase(*it);
324 >                iHash_[atid1][atid2] ^= (*it)->getHash();
325 >              }
326 >            }
327 >            interactions_[atid1][atid2].insert(sc_);
328 >            iHash_[atid1][atid2] |= SC_INTERACTION;
329 >            metExplicit = true;
330 >          }
331 >          
332 >          if (nbiType->isMAW()) {
333 >            if (vdwExplicit) {
334 >              sprintf( painCave.errMsg,
335 >                       "InteractionManager::initialize found more than one "
336 >                       "explicit\n"
337 >                       "\tvan der Waals interaction for atom types %s - %s\n",
338 >                       atype1->getName().c_str(), atype2->getName().c_str());
339 >              painCave.severity = OPENMD_ERROR;
340 >              painCave.isFatal = 1;
341 >              simError();
342 >            }
343 >            // We found an explicit MAW interaction.  
344 >            // override all other vdw entries for this pair of atom types:
345 >            set<NonBondedInteraction*>::iterator it;
346 >            for (it = interactions_[atid1][atid2].begin();
347 >                 it != interactions_[atid1][atid2].end(); ++it) {
348 >              InteractionFamily ifam = (*it)->getFamily();
349 >              if (ifam == VANDERWAALS_FAMILY) {
350 >                interactions_[atid1][atid2].erase(*it);
351 >                iHash_[atid1][atid2] ^= (*it)->getHash();
352 >              }
353 >            }
354 >            interactions_[atid1][atid2].insert(maw_);
355 >            iHash_[atid1][atid2] |= MAW_INTERACTION;
356 >            vdwExplicit = true;
357 >          }        
358          }
359        }
360      }
361      
362 <    // make sure every pair of atom types has a non-bonded interaction:
363 <    for (atype1 = atomTypes->beginType(i1); atype1 != NULL;
364 <         atype1 = atomTypes->nextType(i1)) {
365 <      for (atype2 = atomTypes->beginType(i2); atype2 != NULL;
366 <           atype2 = atomTypes->nextType(i2)) {
367 <        key = make_pair(atype1, atype2);
368 <        
369 <        if (interactions_[key].size() == 0) {
362 >    
363 >    // Make sure every pair of atom types in this simulation has a
364 >    // non-bonded interaction.  If not, just inform the user.
365 >
366 >    set<AtomType*> simTypes = info_->getSimulatedAtomTypes();
367 >    set<AtomType*>::iterator it, jt;
368 >
369 >    for (it = simTypes.begin(); it != simTypes.end(); ++it) {
370 >      atype1 = (*it);
371 >      atid1 = atype1->getIdent();
372 >      for (jt = it; jt != simTypes.end(); ++jt) {
373 >        atype2 = (*jt);
374 >        atid2 = atype2->getIdent();
375 >        
376 >        if (interactions_[atid1][atid2].size() == 0) {
377            sprintf( painCave.errMsg,
378 <                   "InteractionManager unable to find an appropriate non-bonded\n"
379 <                   "\tinteraction for atom types %s - %s\n",
378 >                   "InteractionManager could not find a matching non-bonded\n"
379 >                   "\tinteraction for atom types %s - %s\n"
380 >                   "\tProceeding without this interaction.\n",
381                     atype1->getName().c_str(), atype2->getName().c_str());
382            painCave.severity = OPENMD_INFO;
383 <          painCave.isFatal = 1;
383 >          painCave.isFatal = 0;
384            simError();
385          }
386        }
387      }
388 <  }
389 <  
390 <  void InteractionManager::doPrePair(int *atid1, int *atid2, RealType *rij, RealType *rho_i_at_j, RealType *rho_j_at_i){
388 >
389 >    initialized_ = true;
390 >  }
391 >
392 >  void InteractionManager::setCutoffRadius(RealType rcut) {
393      
394 +    electrostatic_->setCutoffRadius(rcut);
395 +    eam_->setCutoffRadius(rcut);
396 +  }
397 +
398 +  void InteractionManager::doPrePair(InteractionData &idat){
399 +    
400      if (!initialized_) initialize();
401 <          
402 <    DensityData ddat;
401 >        
402 >    // excluded interaction, so just return
403 >    if (idat.excluded) return;
404  
405 <    ddat.atype1 = typeMap_[*atid1];
242 <    ddat.atype2 = typeMap_[*atid2];
243 <    ddat.rij = *rij;
244 <    ddat.rho_i_at_j = *rho_i_at_j;
245 <    ddat.rho_j_at_i = *rho_j_at_i;
405 >    int& iHash = iHash_[idat.atid1][idat.atid2];
406  
407 <    pair<AtomType*, AtomType*> key = make_pair(ddat.atype1, ddat.atype2);
408 <    set<NonBondedInteraction*>::iterator it;
407 >    if ((iHash & EAM_INTERACTION) != 0) eam_->calcDensity(idat);
408 >    if ((iHash & SC_INTERACTION) != 0)  sc_->calcDensity(idat);
409  
410 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it){
411 <      if ((*it)->getFamily() == METALLIC_FAMILY) {
412 <        dynamic_cast<MetallicInteraction*>(*it)->calcDensity(ddat);
413 <      }
414 <    }
410 >    // set<NonBondedInteraction*>::iterator it;
411 >
412 >    // for (it = interactions_[ idat.atypes ].begin();
413 >    //      it != interactions_[ idat.atypes ].end(); ++it){
414 >    //   if ((*it)->getFamily() == METALLIC_FAMILY) {
415 >    //     dynamic_cast<MetallicInteraction*>(*it)->calcDensity(idat);
416 >    //   }
417 >    // }
418      
419      return;    
420    }
421    
422 <  void InteractionManager::doPreForce(int *atid, RealType *rho, RealType *frho, RealType *dfrhodrho){
422 >  void InteractionManager::doPreForce(SelfData &sdat){
423  
424      if (!initialized_) initialize();
425 <          
426 <    FunctionalData fdat;
425 >    
426 >    int& sHash = sHash_[sdat.atid];
427  
428 <    fdat.atype = typeMap_[*atid];
429 <    fdat.rho = *rho;
267 <    fdat.frho = *frho;
268 <    fdat.dfrhodrho = *dfrhodrho;
428 >    if ((sHash & EAM_INTERACTION) != 0) eam_->calcFunctional(sdat);
429 >    if ((sHash & SC_INTERACTION) != 0)  sc_->calcFunctional(sdat);
430  
431 <    pair<AtomType*, AtomType*> key = make_pair(fdat.atype, fdat.atype);
271 <    set<NonBondedInteraction*>::iterator it;
431 >    // set<NonBondedInteraction*>::iterator it;
432      
433 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it){
434 <      if ((*it)->getFamily() == METALLIC_FAMILY) {
435 <        dynamic_cast<MetallicInteraction*>(*it)->calcFunctional(fdat);
436 <      }
437 <    }
433 >    // for (it = interactions_[atid1][atid2].begin(); it != interactions_[atid1][atid2].end(); ++it){
434 >    //   if ((*it)->getFamily() == METALLIC_FAMILY) {
435 >    //     dynamic_cast<MetallicInteraction*>(*it)->calcFunctional(sdat);
436 >    //   }
437 >    // }
438      
439      return;    
440    }
441  
442 <  void InteractionManager::doPair(int *atid1, int *atid2, RealType *d, RealType *r, RealType *r2, RealType *rcut, RealType *sw, RealType *vdwMult,RealType *electroMult, RealType *pot, RealType *vpair, RealType *f1, RealType *eFrame1, RealType *eFrame2, RealType *A1, RealType *A2, RealType *t1, RealType *t2, RealType *rho1, RealType *rho2, RealType *dfrho1, RealType *dfrho2, RealType *fshift1, RealType *fshift2){
442 >  void InteractionManager::doPair(InteractionData &idat){
443      
444      if (!initialized_) initialize();
285 –    
286 –    InteractionData idat;
287 –    
288 –    idat.atype1 = typeMap_[*atid1];
289 –    idat.atype2 = typeMap_[*atid2];
290 –    idat.d = Vector3d(d);
291 –    idat.rij = *r;
292 –    idat.r2 = *r2;
293 –    idat.rcut = *rcut;
294 –    idat.sw = *sw;
295 –    idat.vdwMult = *vdwMult;
296 –    idat.electroMult = *electroMult;
297 –    idat.pot = *pot;
298 –    idat.vpair = *vpair;
299 –    idat.f1 = Vector3d(f1);
300 –    idat.eFrame1 = Mat3x3d(eFrame1);
301 –    idat.eFrame2 = Mat3x3d(eFrame2);
302 –    idat.A1 = RotMat3x3d(A1);
303 –    idat.A2 = RotMat3x3d(A2);
304 –    idat.t1 = Vector3d(t1);
305 –    idat.t2 = Vector3d(t2);
306 –    idat.rho1 = *rho1;
307 –    idat.rho2 = *rho2;
308 –    idat.dfrho1 = *dfrho1;
309 –    idat.dfrho2 = *dfrho2;
310 –    idat.fshift1 = *fshift1;
311 –    idat.fshift2 = *fshift2;
445  
446 <    pair<AtomType*, AtomType*> key = make_pair(idat.atype1, idat.atype2);
314 <    set<NonBondedInteraction*>::iterator it;
446 >    int& iHash = iHash_[idat.atid1][idat.atid2];
447  
448 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it)
449 <      (*it)->calcForce(idat);
450 <    
451 <    f1[0] = idat.f1.x();
320 <    f1[1] = idat.f1.y();
321 <    f1[2] = idat.f1.z();
322 <    
323 <    t1[0] = idat.t1.x();
324 <    t1[1] = idat.t1.y();
325 <    t1[2] = idat.t1.z();
326 <    
327 <    t2[0] = idat.t2.x();
328 <    t2[1] = idat.t2.y();
329 <    t2[2] = idat.t2.z();
448 >    if ((iHash & ELECTROSTATIC_INTERACTION) != 0) electrostatic_->calcForce(idat);
449 >      
450 >    // electrostatics still has to worry about indirect
451 >    // contributions from excluded pairs of atoms, but nothing else does:
452  
453 <    return;    
332 <  }
453 >    if (idat.excluded) return;
454  
455 <  void InteractionManager::doSkipCorrection(int *atid1, int *atid2, RealType *d, RealType *r, RealType *skippedCharge1, RealType *skippedCharge2, RealType *sw, RealType *electroMult, RealType *pot, RealType *vpair, RealType *f1, RealType *eFrame1, RealType *eFrame2, RealType *t1, RealType *t2){
455 >    if ((iHash & LJ_INTERACTION) != 0)             lj_->calcForce(idat);
456 >    if ((iHash & GB_INTERACTION) != 0)             gb_->calcForce(idat);
457 >    if ((iHash & STICKY_INTERACTION) != 0)         sticky_->calcForce(idat);
458 >    if ((iHash & MORSE_INTERACTION) != 0)          morse_->calcForce(idat);
459 >    if ((iHash & REPULSIVEPOWER_INTERACTION) != 0) repulsivePower_->calcForce(idat);
460 >    if ((iHash & EAM_INTERACTION) != 0)            eam_->calcForce(idat);
461 >    if ((iHash & SC_INTERACTION) != 0)             sc_->calcForce(idat);
462 >    if ((iHash & MAW_INTERACTION) != 0)            maw_->calcForce(idat);
463  
464 <    if (!initialized_) initialize();
337 <    
338 <    SkipCorrectionData skdat;
339 <    
340 <    skdat.atype1 = typeMap_[*atid1];
341 <    skdat.atype2 = typeMap_[*atid2];
342 <    skdat.d = Vector3d(d);
343 <    skdat.rij = *r;
344 <    skdat.skippedCharge1 = *skippedCharge1;
345 <    skdat.skippedCharge2 = *skippedCharge2;
346 <    skdat.sw = *sw;
347 <    skdat.electroMult = *electroMult;
348 <    skdat.pot = *pot;
349 <    skdat.vpair = *vpair;
350 <    skdat.f1 = Vector3d(f1);
351 <    skdat.eFrame1 = Mat3x3d(eFrame1);
352 <    skdat.eFrame2 = Mat3x3d(eFrame2);
353 <    skdat.t1 = Vector3d(t1);
354 <    skdat.t2 = Vector3d(t2);
464 >    // set<NonBondedInteraction*>::iterator it;
465  
466 <    pair<AtomType*, AtomType*> key = make_pair(skdat.atype1, skdat.atype2);
467 <    set<NonBondedInteraction*>::iterator it;
466 >    // for (it = interactions_[ idat.atypes ].begin();
467 >    //      it != interactions_[ idat.atypes ].end(); ++it) {
468  
469 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it){
470 <      if ((*it)->getFamily() == ELECTROSTATIC_FAMILY) {
361 <        dynamic_cast<ElectrostaticInteraction*>(*it)->calcSkipCorrection(skdat);
362 <      }
363 <    }
364 <    
365 <    f1[0] = skdat.f1.x();
366 <    f1[1] = skdat.f1.y();
367 <    f1[2] = skdat.f1.z();
368 <    
369 <    t1[0] = skdat.t1.x();
370 <    t1[1] = skdat.t1.y();
371 <    t1[2] = skdat.t1.z();
372 <    
373 <    t2[0] = skdat.t2.x();
374 <    t2[1] = skdat.t2.y();
375 <    t2[2] = skdat.t2.z();
469 >    //   // electrostatics still has to worry about indirect
470 >    //   // contributions from excluded pairs of atoms:
471  
472 +    //   if (!idat.excluded || (*it)->getFamily() == ELECTROSTATIC_FAMILY) {
473 +    //     (*it)->calcForce(idat);
474 +    //   }
475 +    // }
476 +    
477      return;    
478    }
479  
480 <  void InteractionManager::doSelfCorrection(int *atid, RealType *eFrame, RealType *skippedCharge, RealType *pot, RealType *t){
480 >  void InteractionManager::doSelfCorrection(SelfData &sdat){
481  
482      if (!initialized_) initialize();
483      
484 <    SelfCorrectionData scdat;
385 <    
386 <    scdat.atype = typeMap_[*atid];
387 <    scdat.eFrame = Mat3x3d(eFrame);
388 <    scdat.skippedCharge = *skippedCharge;
389 <    scdat.pot = *pot;
390 <    scdat.t = Vector3d(t);
484 >    int& sHash = sHash_[sdat.atid];
485  
486 <    pair<AtomType*, AtomType*> key = make_pair(scdat.atype, scdat.atype);
393 <    set<NonBondedInteraction*>::iterator it;
486 >    if ((sHash & ELECTROSTATIC_INTERACTION) != 0) electrostatic_->calcSelfCorrection(sdat);
487  
488 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it){
396 <      if ((*it)->getFamily() == ELECTROSTATIC_FAMILY) {
397 <        dynamic_cast<ElectrostaticInteraction*>(*it)->calcSelfCorrection(scdat);
398 <      }
399 <    }
400 <        
401 <    t[0] = scdat.t.x();
402 <    t[1] = scdat.t.y();
403 <    t[2] = scdat.t.z();
488 >    // set<NonBondedInteraction*>::iterator it;
489  
490 +    // for (it = interactions_[atid1][atid2].begin(); it != interactions_[atid1][atid2].end(); ++it){
491 +    //   if ((*it)->getFamily() == ELECTROSTATIC_FAMILY) {
492 +    //     dynamic_cast<ElectrostaticInteraction*>(*it)->calcSelfCorrection(sdat);
493 +    //   }
494 +    // }
495 +      
496      return;    
497    }
498  
499 +  void InteractionManager::doReciprocalSpaceSum(RealType &pot){
500 +    if (!initialized_) initialize();
501 +    electrostatic_->ReciprocalSpaceSum(pot);
502 +  }
503  
504    RealType InteractionManager::getSuggestedCutoffRadius(int *atid) {
505      if (!initialized_) initialize();
506 <    
506 >
507      AtomType* atype = typeMap_[*atid];
508  
414 –    pair<AtomType*, AtomType*> key = make_pair(atype, atype);
509      set<NonBondedInteraction*>::iterator it;
510      RealType cutoff = 0.0;
511      
512 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it)
513 <      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(atype, atype));  
512 >    for (it = interactions_[*atid][*atid].begin();
513 >         it != interactions_[*atid][*atid].end();
514 >         ++it)
515 >      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(make_pair(atype, atype)));  
516      return cutoff;    
517    }
518  
519 < } //end namespace OpenMD
519 >  RealType InteractionManager::getSuggestedCutoffRadius(AtomType* atype) {
520 >    if (!initialized_) initialize();
521 >    
522 >    int atid = atype->getIdent();
523  
524 < extern "C" {
525 <  
427 < #define fortranDoPrePair FC_FUNC(do_prepair, DO_PREPAIR)
428 < #define fortranDoPreForce FC_FUNC(do_preforce, DO_PREFORCE)
429 < #define fortranDoPair FC_FUNC(do_pair, DO_PAIR)
430 < #define fortranDoSkipCorrection FC_FUNC(do_skip_correction, DO_SKIP_CORRECTION)
431 < #define fortranDoSelfCorrection FC_FUNC(do_self_correction, DO_SELF_CORRECTION)
432 < #define fortranGetCutoff FC_FUNC(get_cutoff, GET_CUTOFF)
433 <
434 <  void fortranDoPrePair(int *atid1, int *atid2, RealType *rij,
435 <                        RealType *rho_i_at_j, RealType *rho_j_at_i) {
436 <            
437 <    return OpenMD::InteractionManager::Instance()->doPrePair(atid1, atid2, rij,
438 <                                                             rho_i_at_j,  
439 <                                                             rho_j_at_i);
440 <  }
441 <  void fortranDoPreforce(int *atid, RealType *rho, RealType *frho,
442 <                         RealType *dfrhodrho) {  
524 >    set<NonBondedInteraction*>::iterator it;
525 >    RealType cutoff = 0.0;
526      
527 <    return OpenMD::InteractionManager::Instance()->doPreForce(atid, rho, frho,
528 <                                                              dfrhodrho);    
527 >    for (it = interactions_[atid][atid].begin();
528 >         it != interactions_[atid][atid].end(); ++it)
529 >      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(make_pair(atype, atype)));  
530 >    return cutoff;    
531    }
532 <  
448 <  void fortranDoPair(int *atid1, int *atid2, RealType *d, RealType *r,
449 <                     RealType *r2, RealType *rcut, RealType *sw,
450 <                     RealType *vdwMult, RealType *electroMult, RealType *pot,
451 <                     RealType *vpair, RealType *f1, RealType *eFrame1,
452 <                     RealType *eFrame2, RealType *A1, RealType *A2,
453 <                     RealType *t1, RealType *t2, RealType *rho1, RealType *rho2,
454 <                     RealType *dfrho1, RealType *dfrho2, RealType *fshift1,
455 <                     RealType *fshift2){
456 <    
457 <    return OpenMD::InteractionManager::Instance()->doPair(atid1, atid2, d, r,
458 <                                                          r2, rcut, sw,
459 <                                                          vdwMult, electroMult,
460 <                                                          pot, vpair, f1,
461 <                                                          eFrame1, eFrame2,
462 <                                                          A1, A2, t1, t2, rho1,
463 <                                                          rho2, dfrho1, dfrho2,
464 <                                                          fshift1, fshift2);
465 <  }
466 <  
467 <  void fortranDoSkipCorrection(int *atid1, int *atid2, RealType *d,
468 <                               RealType *r, RealType *skippedCharge1,
469 <                               RealType *skippedCharge2, RealType *sw,
470 <                               RealType *electroMult, RealType *pot,
471 <                               RealType *vpair, RealType *f1,
472 <                               RealType *eFrame1, RealType *eFrame2,
473 <                               RealType *t1, RealType *t2){
474 <    
475 <    return OpenMD::InteractionManager::Instance()->doSkipCorrection(atid1,
476 <                                                                    atid2, d,
477 <                                                                    r,
478 <                                                                    skippedCharge1,
479 <                                                                    skippedCharge2,
480 <                                                                    sw, electroMult, pot,
481 <                                                                    vpair, f1, eFrame1,
482 <                                                                    eFrame2, t1, t2);
483 <  }
484 <  
485 <  void fortranDoSelfCorrection(int *atid, RealType *eFrame, RealType *skippedCharge,
486 <                               RealType *pot, RealType *t) {
487 <    
488 <    return OpenMD::InteractionManager::Instance()->doSelfCorrection(atid,
489 <                                                                    eFrame,
490 <                                                                    skippedCharge,
491 <                                                                    pot, t);
492 <  }
493 <  RealType fortranGetCutoff(int *atid) {    
494 <    return OpenMD::InteractionManager::Instance()->getSuggestedCutoffRadius(atid);
495 <  }
496 < }
532 > } //end namespace OpenMD

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines