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 1929 by gezelter, Mon Aug 19 13:12:00 2013 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;
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 <    for (atype1 = atomTypes->beginType(i1); atype1 != NULL;
121 <         atype1 = atomTypes->nextType(i1)) {
120 >      //for (atype1 = atomTypes->beginType(i1); atype1 != NULL;
121 >      //   atype1 = atomTypes->nextType(i1)) {
122        
123 <      // add it to the map:
124 <      AtomTypeProperties atp = atype1->getATP();    
125 <      
123 >      atype1 = *at;
124 >      atid1 = atype1->getIdent();
125 >      iHash_[atid1].resize(nTypes);
126 >      interactions_[atid1].resize(nTypes);
127 >
128 >      // add it to the map:      
129        pair<map<int,AtomType*>::iterator,bool> ret;    
130 <      ret = typeMap_.insert( pair<int, AtomType*>(atp.ident, atype1) );
130 >      ret = typeMap_.insert( pair<int, AtomType*>(atid1, atype1) );
131        if (ret.second == false) {
132          sprintf( painCave.errMsg,
133                   "InteractionManager already had a previous entry with ident %d\n",
134 <                 atp.ident);
134 >                 atype1->getIdent());
135          painCave.severity = OPENMD_INFO;
136          painCave.isFatal = 0;
137          simError();                
138        }
139      }
140 <    
140 >
141 >    if (atype1->isLennardJones()) {
142 >      sHash_[atid1] |= LJ_INTERACTION;
143 >    }
144 >    if (atype1->isElectrostatic()) {
145 >      sHash_[atid1] |= ELECTROSTATIC_INTERACTION;
146 >    }
147 >    if (atype1->isSticky()) {
148 >      sHash_[atid1] |= STICKY_INTERACTION;
149 >    }
150 >    if (atype1->isStickyPower()) {
151 >      sHash_[atid1] |= STICKY_INTERACTION;
152 >    }
153 >    if (atype1->isEAM()) {
154 >      sHash_[atid1] |= EAM_INTERACTION;
155 >    }
156 >    if (atype1->isSC()) {
157 >      sHash_[atid1] |= SC_INTERACTION;
158 >    }
159 >    if (atype1->isGayBerne()) {
160 >      sHash_[atid1] |= GB_INTERACTION;
161 >    }
162 >  
163      // Now, iterate over all known types and add to the interaction map:
164      
165      map<int, AtomType*>::iterator it1, it2;
166      for (it1 = typeMap_.begin(); it1 != typeMap_.end(); ++it1) {
167        atype1 = (*it1).second;
168 +      atid1 = atype1->getIdent();
169  
170        for( it2 = typeMap_.begin(); it2 != typeMap_.end(); ++it2) {        
171          atype2 = (*it2).second;
172 +        atid2 = atype2->getIdent();
173 +                              
174 +        iHash_[atid1][atid2] = 0;
175          
111 –        bool vdwExplicit = false;
112 –        bool metExplicit = false;
113 –        bool hbExplicit = false;
114 –                      
115 –        key = make_pair(atype1, atype2);
116 –        
176          if (atype1->isLennardJones() && atype2->isLennardJones()) {
177 <          interactions_[key].insert(lj_);
177 >          interactions_[atid1][atid2].insert(lj_);
178 >          iHash_[atid1][atid2] |= LJ_INTERACTION;
179          }
180          if (atype1->isElectrostatic() && atype2->isElectrostatic() ) {
181 <          interactions_[key].insert(electrostatic_);
181 >          interactions_[atid1][atid2].insert(electrostatic_);
182 >          iHash_[atid1][atid2] |= ELECTROSTATIC_INTERACTION;
183          }
184          if (atype1->isSticky() && atype2->isSticky() ) {
185 <          interactions_[key].insert(sticky_);
185 >          interactions_[atid1][atid2].insert(sticky_);
186 >          iHash_[atid1][atid2] |= STICKY_INTERACTION;
187          }
188          if (atype1->isStickyPower() && atype2->isStickyPower() ) {
189 <          interactions_[key].insert(sticky_);
189 >          interactions_[atid1][atid2].insert(sticky_);
190 >          iHash_[atid1][atid2] |= STICKY_INTERACTION;
191          }
192          if (atype1->isEAM() && atype2->isEAM() ) {
193 <          interactions_[key].insert(eam_);
193 >          interactions_[atid1][atid2].insert(eam_);
194 >          iHash_[atid1][atid2] |= EAM_INTERACTION;
195          }
196          if (atype1->isSC() && atype2->isSC() ) {
197 <          interactions_[key].insert(sc_);
197 >          interactions_[atid1][atid2].insert(sc_);
198 >          iHash_[atid1][atid2] |= SC_INTERACTION;
199          }
200          if (atype1->isGayBerne() && atype2->isGayBerne() ) {
201 <          interactions_[key].insert(gb_);
201 >          interactions_[atid1][atid2].insert(gb_);
202 >          iHash_[atid1][atid2] |= GB_INTERACTION;
203          }
204          if ((atype1->isGayBerne() && atype2->isLennardJones())
205              || (atype1->isLennardJones() && atype2->isGayBerne())) {
206 <          interactions_[key].insert(gb_);
206 >          interactions_[atid1][atid2].insert(gb_);
207 >          iHash_[atid1][atid2] |= GB_INTERACTION;
208          }
209          
210          // look for an explicitly-set non-bonded interaction type using the
211          // two atom types.
212          NonBondedInteractionType* nbiType = forceField_->getNonBondedInteractionType(atype1->getName(), atype2->getName());
213 +        
214 +        if (nbiType != NULL) {
215  
216 <        if (nbiType->isLennardJones()) {
217 <          // We found an explicit Lennard-Jones interaction.  
218 <          // 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 <        }
216 >          bool vdwExplicit = false;
217 >          bool metExplicit = false;
218 >          // bool hbExplicit = false;
219  
220 <        if (nbiType->isMorse()) {
221 <          if (vdwExplicit) {
222 <            sprintf( painCave.errMsg,
223 <                     "InteractionManager::initialize found more than one explicit\n"
224 <                     "\tvan der Waals interaction for atom types %s - %s\n",
225 <                     atype1->getName().c_str(), atype2->getName().c_str());
226 <            painCave.severity = OPENMD_ERROR;
227 <            painCave.isFatal = 1;
228 <            simError();
229 <          }
230 <          // We found an explicit Morse interaction.  
231 <          // override all other vdw entries for this pair of atom types:
232 <          set<NonBondedInteraction*>::iterator it;
233 <          for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it) {
234 <            InteractionFamily ifam = (*it)->getFamily();
174 <            if (ifam == VANDERWAALS_FAMILY) interactions_[key].erase(*it);
220 >          if (nbiType->isLennardJones()) {
221 >            // We found an explicit Lennard-Jones interaction.  
222 >            // override all other vdw entries for this pair of atom types:
223 >            set<NonBondedInteraction*>::iterator it;
224 >            for (it = interactions_[atid1][atid2].begin();
225 >                 it != interactions_[atid1][atid2].end(); ++it) {
226 >              InteractionFamily ifam = (*it)->getFamily();
227 >              if (ifam == VANDERWAALS_FAMILY) {
228 >                interactions_[atid1][atid2].erase(*it);
229 >                iHash_[atid1][atid2] ^= (*it)->getHash();
230 >              }
231 >            }
232 >            interactions_[atid1][atid2].insert(lj_);
233 >            iHash_[atid1][atid2] |= LJ_INTERACTION;
234 >            vdwExplicit = true;
235            }
236 <          interactions_[key].insert(morse_);
237 <          vdwExplicit = true;
238 <        }
239 <
240 <        if (nbiType->isEAM()) {
241 <          // We found an explicit EAM interaction.  
242 <          // override all other metallic entries for this pair of atom types:
243 <          set<NonBondedInteraction*>::iterator it;
244 <          for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it) {
245 <            InteractionFamily ifam = (*it)->getFamily();
246 <            if (ifam == METALLIC_FAMILY) interactions_[key].erase(*it);
236 >          
237 >          if (nbiType->isMorse()) {
238 >            if (vdwExplicit) {
239 >              sprintf( painCave.errMsg,
240 >                       "InteractionManager::initialize found more than one "
241 >                       "explicit \n"
242 >                       "\tvan der Waals interaction for atom types %s - %s\n",
243 >                       atype1->getName().c_str(), atype2->getName().c_str());
244 >              painCave.severity = OPENMD_ERROR;
245 >              painCave.isFatal = 1;
246 >              simError();
247 >            }
248 >            // We found an explicit Morse interaction.  
249 >            // override all other vdw entries for this pair of atom types:
250 >            set<NonBondedInteraction*>::iterator it;
251 >            for (it = interactions_[atid1][atid2].begin();
252 >                 it != interactions_[atid1][atid2].end(); ++it) {
253 >              InteractionFamily ifam = (*it)->getFamily();
254 >              if (ifam == VANDERWAALS_FAMILY) {
255 >                interactions_[atid1][atid2].erase(*it);
256 >                iHash_[atid1][atid2] ^= (*it)->getHash();
257 >              }
258 >            }
259 >            interactions_[atid1][atid2].insert(morse_);
260 >            iHash_[atid1][atid2] |= MORSE_INTERACTION;
261 >            vdwExplicit = true;
262            }
188 –          interactions_[key].insert(eam_);
189 –          metExplicit = true;
190 –        }
263  
264 <        if (nbiType->isSC()) {
265 <          if (metExplicit) {
266 <            sprintf( painCave.errMsg,
267 <                     "InteractionManager::initialize found more than one explicit\n"
268 <                     "\tmetallic interaction for atom types %s - %s\n",
269 <                     atype1->getName().c_str(), atype2->getName().c_str());
270 <            painCave.severity = OPENMD_ERROR;
271 <            painCave.isFatal = 1;
272 <            simError();
264 >          if (nbiType->isRepulsivePower()) {
265 >            if (vdwExplicit) {
266 >              sprintf( painCave.errMsg,
267 >                       "InteractionManager::initialize found more than one "
268 >                       "explicit \n"
269 >                       "\tvan der Waals interaction for atom types %s - %s\n",
270 >                       atype1->getName().c_str(), atype2->getName().c_str());
271 >              painCave.severity = OPENMD_ERROR;
272 >              painCave.isFatal = 1;
273 >              simError();
274 >            }
275 >            // We found an explicit RepulsivePower interaction.  
276 >            // override all other vdw entries for this pair of atom types:
277 >            set<NonBondedInteraction*>::iterator it;
278 >            for (it = interactions_[atid1][atid2].begin();
279 >                 it != interactions_[atid1][atid2].end(); ++it) {
280 >              InteractionFamily ifam = (*it)->getFamily();
281 >              if (ifam == VANDERWAALS_FAMILY) {
282 >                interactions_[atid1][atid2].erase(*it);
283 >                iHash_[atid1][atid2] ^= (*it)->getHash();
284 >              }
285 >            }
286 >            interactions_[atid1][atid2].insert(repulsivePower_);
287 >            iHash_[atid1][atid2] |= REPULSIVEPOWER_INTERACTION;
288 >            vdwExplicit = true;
289            }
290 <          // We found an explicit Sutton-Chen interaction.  
291 <          // override all other metallic entries for this pair of atom types:
292 <          set<NonBondedInteraction*>::iterator it;
293 <          for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it) {
294 <            InteractionFamily ifam = (*it)->getFamily();
295 <            if (ifam == METALLIC_FAMILY) interactions_[key].erase(*it);
290 >          
291 >          
292 >          if (nbiType->isEAM()) {
293 >            // We found an explicit EAM interaction.  
294 >            // override all other metallic entries for this pair of atom types:
295 >            set<NonBondedInteraction*>::iterator it;
296 >            for (it = interactions_[atid1][atid2].begin();
297 >                 it != interactions_[atid1][atid2].end(); ++it) {
298 >              InteractionFamily ifam = (*it)->getFamily();
299 >              if (ifam == METALLIC_FAMILY) {
300 >                interactions_[atid1][atid2].erase(*it);
301 >                iHash_[atid1][atid2] ^= (*it)->getHash();
302 >              }
303 >            }
304 >            interactions_[atid1][atid2].insert(eam_);
305 >            iHash_[atid1][atid2] |= EAM_INTERACTION;
306 >            metExplicit = true;
307            }
308 <          interactions_[key].insert(sc_);
309 <          metExplicit = true;
308 >          
309 >          if (nbiType->isSC()) {
310 >            if (metExplicit) {
311 >              sprintf( painCave.errMsg,
312 >                       "InteractionManager::initialize found more than one "
313 >                       "explicit\n"
314 >                       "\tmetallic interaction for atom types %s - %s\n",
315 >                       atype1->getName().c_str(), atype2->getName().c_str());
316 >              painCave.severity = OPENMD_ERROR;
317 >              painCave.isFatal = 1;
318 >              simError();
319 >            }
320 >            // We found an explicit Sutton-Chen interaction.  
321 >            // override all other metallic entries for this pair of atom types:
322 >            set<NonBondedInteraction*>::iterator it;
323 >            for (it = interactions_[atid1][atid2].begin();
324 >                 it != interactions_[atid1][atid2].end(); ++it) {
325 >              InteractionFamily ifam = (*it)->getFamily();
326 >              if (ifam == METALLIC_FAMILY) {
327 >                interactions_[atid1][atid2].erase(*it);
328 >                iHash_[atid1][atid2] ^= (*it)->getHash();
329 >              }
330 >            }
331 >            interactions_[atid1][atid2].insert(sc_);
332 >            iHash_[atid1][atid2] |= SC_INTERACTION;
333 >            metExplicit = true;
334 >          }
335 >          
336 >          if (nbiType->isMAW()) {
337 >            if (vdwExplicit) {
338 >              sprintf( painCave.errMsg,
339 >                       "InteractionManager::initialize found more than one "
340 >                       "explicit\n"
341 >                       "\tvan der Waals interaction for atom types %s - %s\n",
342 >                       atype1->getName().c_str(), atype2->getName().c_str());
343 >              painCave.severity = OPENMD_ERROR;
344 >              painCave.isFatal = 1;
345 >              simError();
346 >            }
347 >            // We found an explicit MAW interaction.  
348 >            // override all other vdw entries for this pair of atom types:
349 >            set<NonBondedInteraction*>::iterator it;
350 >            for (it = interactions_[atid1][atid2].begin();
351 >                 it != interactions_[atid1][atid2].end(); ++it) {
352 >              InteractionFamily ifam = (*it)->getFamily();
353 >              if (ifam == VANDERWAALS_FAMILY) {
354 >                interactions_[atid1][atid2].erase(*it);
355 >                iHash_[atid1][atid2] ^= (*it)->getHash();
356 >              }
357 >            }
358 >            interactions_[atid1][atid2].insert(maw_);
359 >            iHash_[atid1][atid2] |= MAW_INTERACTION;
360 >            vdwExplicit = true;
361 >          }        
362          }
363        }
364      }
365      
366 <    // make sure every pair of atom types has a non-bonded interaction:
367 <    for (atype1 = atomTypes->beginType(i1); atype1 != NULL;
368 <         atype1 = atomTypes->nextType(i1)) {
369 <      for (atype2 = atomTypes->beginType(i2); atype2 != NULL;
370 <           atype2 = atomTypes->nextType(i2)) {
371 <        key = make_pair(atype1, atype2);
372 <        
373 <        if (interactions_[key].size() == 0) {
366 >    
367 >    // Make sure every pair of atom types in this simulation has a
368 >    // non-bonded interaction.  If not, just inform the user.
369 >
370 >    set<AtomType*> simTypes = info_->getSimulatedAtomTypes();
371 >    set<AtomType*>::iterator it, jt;
372 >
373 >    for (it = simTypes.begin(); it != simTypes.end(); ++it) {
374 >      atype1 = (*it);
375 >      atid1 = atype1->getIdent();
376 >      for (jt = it; jt != simTypes.end(); ++jt) {
377 >        atype2 = (*jt);
378 >        atid1 = atype1->getIdent();
379 >        
380 >        if (interactions_[atid1][atid2].size() == 0) {
381            sprintf( painCave.errMsg,
382 <                   "InteractionManager unable to find an appropriate non-bonded\n"
383 <                   "\tinteraction for atom types %s - %s\n",
382 >                   "InteractionManager could not find a matching non-bonded\n"
383 >                   "\tinteraction for atom types %s - %s\n"
384 >                   "\tProceeding without this interaction.\n",
385                     atype1->getName().c_str(), atype2->getName().c_str());
386            painCave.severity = OPENMD_INFO;
387 <          painCave.isFatal = 1;
387 >          painCave.isFatal = 0;
388            simError();
389          }
390        }
391      }
392 <  }
393 <  
394 <  void InteractionManager::doPrePair(int *atid1, int *atid2, RealType *rij, RealType *rho_i_at_j, RealType *rho_j_at_i){
392 >
393 >    initialized_ = true;
394 >  }
395 >
396 >  void InteractionManager::setCutoffRadius(RealType rcut) {
397      
398 +    electrostatic_->setCutoffRadius(rcut);
399 +    eam_->setCutoffRadius(rcut);
400 +  }
401 +
402 +  void InteractionManager::doPrePair(InteractionData &idat){
403 +    
404      if (!initialized_) initialize();
405 <          
406 <    DensityData ddat;
405 >        
406 >    // excluded interaction, so just return
407 >    if (idat.excluded) return;
408  
409 <    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;
409 >    int& iHash = iHash_[idat.atid1][idat.atid2];
410  
411 <    pair<AtomType*, AtomType*> key = make_pair(ddat.atype1, ddat.atype2);
412 <    set<NonBondedInteraction*>::iterator it;
411 >    if ((iHash & EAM_INTERACTION) != 0) eam_->calcDensity(idat);
412 >    if ((iHash & SC_INTERACTION) != 0)  sc_->calcDensity(idat);
413  
414 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it){
415 <      if ((*it)->getFamily() == METALLIC_FAMILY) {
416 <        dynamic_cast<MetallicInteraction*>(*it)->calcDensity(ddat);
417 <      }
418 <    }
414 >    // set<NonBondedInteraction*>::iterator it;
415 >
416 >    // for (it = interactions_[ idat.atypes ].begin();
417 >    //      it != interactions_[ idat.atypes ].end(); ++it){
418 >    //   if ((*it)->getFamily() == METALLIC_FAMILY) {
419 >    //     dynamic_cast<MetallicInteraction*>(*it)->calcDensity(idat);
420 >    //   }
421 >    // }
422      
423      return;    
424    }
425    
426 <  void InteractionManager::doPreForce(int *atid, RealType *rho, RealType *frho, RealType *dfrhodrho){
426 >  void InteractionManager::doPreForce(SelfData &sdat){
427  
428      if (!initialized_) initialize();
429 <          
430 <    FunctionalData fdat;
429 >    
430 >    int& sHash = sHash_[sdat.atid];
431  
432 <    fdat.atype = typeMap_[*atid];
433 <    fdat.rho = *rho;
267 <    fdat.frho = *frho;
268 <    fdat.dfrhodrho = *dfrhodrho;
432 >    if ((sHash & EAM_INTERACTION) != 0) eam_->calcFunctional(sdat);
433 >    if ((sHash & SC_INTERACTION) != 0)  sc_->calcFunctional(sdat);
434  
435 <    pair<AtomType*, AtomType*> key = make_pair(fdat.atype, fdat.atype);
271 <    set<NonBondedInteraction*>::iterator it;
435 >    // set<NonBondedInteraction*>::iterator it;
436      
437 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it){
438 <      if ((*it)->getFamily() == METALLIC_FAMILY) {
439 <        dynamic_cast<MetallicInteraction*>(*it)->calcFunctional(fdat);
440 <      }
441 <    }
437 >    // for (it = interactions_[atid1][atid2].begin(); it != interactions_[atid1][atid2].end(); ++it){
438 >    //   if ((*it)->getFamily() == METALLIC_FAMILY) {
439 >    //     dynamic_cast<MetallicInteraction*>(*it)->calcFunctional(sdat);
440 >    //   }
441 >    // }
442      
443      return;    
444    }
445  
446 <  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){
446 >  void InteractionManager::doPair(InteractionData &idat){
447      
448      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;
449  
450 <    pair<AtomType*, AtomType*> key = make_pair(idat.atype1, idat.atype2);
314 <    set<NonBondedInteraction*>::iterator it;
450 >    int& iHash = iHash_[idat.atid1][idat.atid2];
451  
452 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it)
453 <      (*it)->calcForce(idat);
454 <    
455 <    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();
452 >    if ((iHash & ELECTROSTATIC_INTERACTION) != 0) electrostatic_->calcForce(idat);
453 >      
454 >    // electrostatics still has to worry about indirect
455 >    // contributions from excluded pairs of atoms, but nothing else does:
456  
457 <    return;    
332 <  }
457 >    if (idat.excluded) return;
458  
459 <  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){
459 >    if ((iHash & LJ_INTERACTION) != 0)             lj_->calcForce(idat);
460 >    if ((iHash & GB_INTERACTION) != 0)             gb_->calcForce(idat);
461 >    if ((iHash & STICKY_INTERACTION) != 0)         sticky_->calcForce(idat);
462 >    if ((iHash & MORSE_INTERACTION) != 0)          morse_->calcForce(idat);
463 >    if ((iHash & REPULSIVEPOWER_INTERACTION) != 0) repulsivePower_->calcForce(idat);
464 >    if ((iHash & EAM_INTERACTION) != 0)            eam_->calcForce(idat);
465 >    if ((iHash & SC_INTERACTION) != 0)             sc_->calcForce(idat);
466 >    if ((iHash & MAW_INTERACTION) != 0)            maw_->calcForce(idat);
467  
468 <    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);
468 >    // set<NonBondedInteraction*>::iterator it;
469  
470 <    pair<AtomType*, AtomType*> key = make_pair(skdat.atype1, skdat.atype2);
471 <    set<NonBondedInteraction*>::iterator it;
470 >    // for (it = interactions_[ idat.atypes ].begin();
471 >    //      it != interactions_[ idat.atypes ].end(); ++it) {
472  
473 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it){
474 <      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();
473 >    //   // electrostatics still has to worry about indirect
474 >    //   // contributions from excluded pairs of atoms:
475  
476 +    //   if (!idat.excluded || (*it)->getFamily() == ELECTROSTATIC_FAMILY) {
477 +    //     (*it)->calcForce(idat);
478 +    //   }
479 +    // }
480 +    
481      return;    
482    }
483  
484 <  void InteractionManager::doSelfCorrection(int *atid, RealType *eFrame, RealType *skippedCharge, RealType *pot, RealType *t){
484 >  void InteractionManager::doSelfCorrection(SelfData &sdat){
485  
486      if (!initialized_) initialize();
487      
488 <    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);
488 >    int& sHash = sHash_[sdat.atid];
489  
490 <    pair<AtomType*, AtomType*> key = make_pair(scdat.atype, scdat.atype);
393 <    set<NonBondedInteraction*>::iterator it;
490 >    if ((sHash & ELECTROSTATIC_INTERACTION) != 0) electrostatic_->calcSelfCorrection(sdat);
491  
492 <    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();
492 >    // set<NonBondedInteraction*>::iterator it;
493  
494 +    // for (it = interactions_[atid1][atid2].begin(); it != interactions_[atid1][atid2].end(); ++it){
495 +    //   if ((*it)->getFamily() == ELECTROSTATIC_FAMILY) {
496 +    //     dynamic_cast<ElectrostaticInteraction*>(*it)->calcSelfCorrection(sdat);
497 +    //   }
498 +    // }
499 +      
500      return;    
501    }
502  
503 +  void InteractionManager::doReciprocalSpaceSum(RealType &pot){
504 +    if (!initialized_) initialize();
505 +    electrostatic_->ReciprocalSpaceSum(pot);
506 +  }
507  
508    RealType InteractionManager::getSuggestedCutoffRadius(int *atid) {
509      if (!initialized_) initialize();
510 <    
510 >
511      AtomType* atype = typeMap_[*atid];
512  
414 –    pair<AtomType*, AtomType*> key = make_pair(atype, atype);
513      set<NonBondedInteraction*>::iterator it;
514      RealType cutoff = 0.0;
515      
516 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it)
517 <      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(atype, atype));  
516 >    for (it = interactions_[*atid][*atid].begin();
517 >         it != interactions_[*atid][*atid].end();
518 >         ++it)
519 >      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(make_pair(atype, atype)));  
520      return cutoff;    
521    }
522  
523 < } //end namespace OpenMD
523 >  RealType InteractionManager::getSuggestedCutoffRadius(AtomType* atype) {
524 >    if (!initialized_) initialize();
525 >    
526 >    int atid = atype->getIdent();
527  
528 < extern "C" {
529 <  
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) {  
528 >    set<NonBondedInteraction*>::iterator it;
529 >    RealType cutoff = 0.0;
530      
531 <    return OpenMD::InteractionManager::Instance()->doPreForce(atid, rho, frho,
532 <                                                              dfrhodrho);    
531 >    for (it = interactions_[atid][atid].begin();
532 >         it != interactions_[atid][atid].end(); ++it)
533 >      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(make_pair(atype, atype)));  
534 >    return cutoff;    
535    }
536 <  
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 < }
536 > } //end namespace OpenMD

Diff Legend

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