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 1568 by gezelter, Wed May 25 16:20:37 2011 UTC vs.
trunk/src/nonbonded/InteractionManager.cpp (file contents), Revision 1927 by gezelter, Wed Aug 14 20:19:19 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 {
46  
47 <  InteractionManager* InteractionManager::_instance = NULL;
47 <  SimInfo* InteractionManager::info_ = NULL;
48 <  bool InteractionManager::initialized_ = false;
47 >  InteractionManager::InteractionManager() {
48  
49 <  RealType InteractionManager::rCut_ = 0.0;
50 <  RealType InteractionManager::rSwitch_ = 0.0;
51 <  CutoffMethod InteractionManager::cutoffMethod_ = SHIFTED_FORCE;
52 <  SwitchingFunctionType InteractionManager::sft_ = cubic;
53 <  RealType InteractionManager::vdwScale_[4] = {1.0, 0.0, 0.0, 0.0};
54 <  RealType InteractionManager::electrostaticScale_[4] = {1.0, 0.0, 0.0, 0.0};
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();
58 >    electrostatic_ = new Electrostatic();
59 >    maw_ = new MAW();
60 >  }
61  
62 <  map<int, AtomType*> InteractionManager::typeMap_;
63 <  map<pair<AtomType*, AtomType*>, set<NonBondedInteraction*> > InteractionManager::interactions_;
64 <
65 <  LJ* InteractionManager::lj_ = new LJ();
66 <  GB* InteractionManager::gb_ = new GB();
67 <  Sticky* InteractionManager::sticky_ = new Sticky();
68 <  Morse* InteractionManager::morse_ = new Morse();
69 <  EAM* InteractionManager::eam_ = new EAM();
70 <  SC* InteractionManager::sc_ = new SC();
71 <  Electrostatic* InteractionManager::electrostatic_ = new Electrostatic();
67 <  MAW* InteractionManager::maw_ = new MAW();
68 <  SwitchingFunction* InteractionManager::switcher_ = new SwitchingFunction();
69 <
70 <  InteractionManager* InteractionManager::Instance() {
71 <    if (!_instance) {
72 <      _instance = new InteractionManager();
73 <    }
74 <    return _instance;
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 <    
75 >
76 >    if (initialized_) return;
77 >
78      ForceField* forceField_ = info_->getForceField();
79      
80      lj_->setForceField(forceField_);
# Line 84 | Line 83 | namespace OpenMD {
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  
90 –    ForceFieldOptions& fopts = forceField_->getForceFieldOptions();
91 –
92 –    // Force fields can set options on how to scale van der Waals and electrostatic
93 –    // interactions for atoms connected via bonds, bends and torsions
94 –    // in this case the topological distance between atoms is:
95 –    // 0 = topologically unconnected
96 –    // 1 = bonded together
97 –    // 2 = connected via a bend
98 –    // 3 = connected via a torsion
99 –
100 –    vdwScale_[0] = 1.0;
101 –    vdwScale_[1] = fopts.getvdw12scale();
102 –    vdwScale_[2] = fopts.getvdw13scale();
103 –    vdwScale_[3] = fopts.getvdw14scale();
104 –
105 –    electrostaticScale_[0] = 1.0;
106 –    electrostaticScale_[1] = fopts.getelectrostatic12scale();
107 –    electrostaticScale_[2] = fopts.getelectrostatic13scale();
108 –    electrostaticScale_[3] = fopts.getelectrostatic14scale();    
109 –
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          
144 –        bool vdwExplicit = false;
145 –        bool metExplicit = false;
146 –        bool hbExplicit = false;
147 –                      
148 –        key = make_pair(atype1, atype2);
149 –        
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 >          // Pairs of fluctuating density EAM atoms have their
182 >          // interactions handled via the EAM routines.  All other
183 >          // interactions with these atoms are handled via normal
184 >          // electrostatic channels:
185 >          if (!(atype1->isEAM() && atype2->isEAM())) {
186 >            interactions_[atid1][atid2].insert(electrostatic_);
187 >            iHash_[atid1][atid2] |= ELECTROSTATIC_INTERACTION;
188 >          }
189          }
190          if (atype1->isSticky() && atype2->isSticky() ) {
191 <          interactions_[key].insert(sticky_);
191 >          interactions_[atid1][atid2].insert(sticky_);
192 >          iHash_[atid1][atid2] |= STICKY_INTERACTION;
193          }
194          if (atype1->isStickyPower() && atype2->isStickyPower() ) {
195 <          interactions_[key].insert(sticky_);
195 >          interactions_[atid1][atid2].insert(sticky_);
196 >          iHash_[atid1][atid2] |= STICKY_INTERACTION;
197          }
198          if (atype1->isEAM() && atype2->isEAM() ) {
199 <          interactions_[key].insert(eam_);
199 >          interactions_[atid1][atid2].insert(eam_);
200 >          iHash_[atid1][atid2] |= EAM_INTERACTION;
201          }
202          if (atype1->isSC() && atype2->isSC() ) {
203 <          interactions_[key].insert(sc_);
203 >          interactions_[atid1][atid2].insert(sc_);
204 >          iHash_[atid1][atid2] |= SC_INTERACTION;
205          }
206          if (atype1->isGayBerne() && atype2->isGayBerne() ) {
207 <          interactions_[key].insert(gb_);
207 >          interactions_[atid1][atid2].insert(gb_);
208 >          iHash_[atid1][atid2] |= GB_INTERACTION;
209          }
210          if ((atype1->isGayBerne() && atype2->isLennardJones())
211              || (atype1->isLennardJones() && atype2->isGayBerne())) {
212 <          interactions_[key].insert(gb_);
212 >          interactions_[atid1][atid2].insert(gb_);
213 >          iHash_[atid1][atid2] |= GB_INTERACTION;
214          }
215          
216          // look for an explicitly-set non-bonded interaction type using the
# Line 179 | Line 219 | namespace OpenMD {
219          
220          if (nbiType != NULL) {
221  
222 +          bool vdwExplicit = false;
223 +          bool metExplicit = false;
224 +          // bool hbExplicit = false;
225 +
226            if (nbiType->isLennardJones()) {
227              // We found an explicit Lennard-Jones interaction.  
228              // override all other vdw entries for this pair of atom types:
229              set<NonBondedInteraction*>::iterator it;
230 <            for (it = interactions_[key].begin();
231 <                 it != interactions_[key].end(); ++it) {
230 >            for (it = interactions_[atid1][atid2].begin();
231 >                 it != interactions_[atid1][atid2].end(); ++it) {
232                InteractionFamily ifam = (*it)->getFamily();
233 <              if (ifam == VANDERWAALS_FAMILY) interactions_[key].erase(*it);
233 >              if (ifam == VANDERWAALS_FAMILY) {
234 >                interactions_[atid1][atid2].erase(*it);
235 >                iHash_[atid1][atid2] ^= (*it)->getHash();
236 >              }
237              }
238 <            interactions_[key].insert(lj_);
238 >            interactions_[atid1][atid2].insert(lj_);
239 >            iHash_[atid1][atid2] |= LJ_INTERACTION;
240              vdwExplicit = true;
241            }
242            
# Line 206 | Line 254 | namespace OpenMD {
254              // We found an explicit Morse interaction.  
255              // override all other vdw entries for this pair of atom types:
256              set<NonBondedInteraction*>::iterator it;
257 <            for (it = interactions_[key].begin();
258 <                 it != interactions_[key].end(); ++it) {
257 >            for (it = interactions_[atid1][atid2].begin();
258 >                 it != interactions_[atid1][atid2].end(); ++it) {
259                InteractionFamily ifam = (*it)->getFamily();
260 <              if (ifam == VANDERWAALS_FAMILY) interactions_[key].erase(*it);
260 >              if (ifam == VANDERWAALS_FAMILY) {
261 >                interactions_[atid1][atid2].erase(*it);
262 >                iHash_[atid1][atid2] ^= (*it)->getHash();
263 >              }
264              }
265 <            interactions_[key].insert(morse_);
265 >            interactions_[atid1][atid2].insert(morse_);
266 >            iHash_[atid1][atid2] |= MORSE_INTERACTION;
267              vdwExplicit = true;
268            }
269 +
270 +          if (nbiType->isRepulsivePower()) {
271 +            if (vdwExplicit) {
272 +              sprintf( painCave.errMsg,
273 +                       "InteractionManager::initialize found more than one "
274 +                       "explicit \n"
275 +                       "\tvan der Waals interaction for atom types %s - %s\n",
276 +                       atype1->getName().c_str(), atype2->getName().c_str());
277 +              painCave.severity = OPENMD_ERROR;
278 +              painCave.isFatal = 1;
279 +              simError();
280 +            }
281 +            // We found an explicit RepulsivePower interaction.  
282 +            // override all other vdw entries for this pair of atom types:
283 +            set<NonBondedInteraction*>::iterator it;
284 +            for (it = interactions_[atid1][atid2].begin();
285 +                 it != interactions_[atid1][atid2].end(); ++it) {
286 +              InteractionFamily ifam = (*it)->getFamily();
287 +              if (ifam == VANDERWAALS_FAMILY) {
288 +                interactions_[atid1][atid2].erase(*it);
289 +                iHash_[atid1][atid2] ^= (*it)->getHash();
290 +              }
291 +            }
292 +            interactions_[atid1][atid2].insert(repulsivePower_);
293 +            iHash_[atid1][atid2] |= REPULSIVEPOWER_INTERACTION;
294 +            vdwExplicit = true;
295 +          }
296            
297 +          
298            if (nbiType->isEAM()) {
299              // We found an explicit EAM interaction.  
300              // override all other metallic entries for this pair of atom types:
301              set<NonBondedInteraction*>::iterator it;
302 <            for (it = interactions_[key].begin();
303 <                 it != interactions_[key].end(); ++it) {
302 >            for (it = interactions_[atid1][atid2].begin();
303 >                 it != interactions_[atid1][atid2].end(); ++it) {
304                InteractionFamily ifam = (*it)->getFamily();
305 <              if (ifam == METALLIC_FAMILY) interactions_[key].erase(*it);
305 >              if (ifam == METALLIC_FAMILY) {
306 >                interactions_[atid1][atid2].erase(*it);
307 >                iHash_[atid1][atid2] ^= (*it)->getHash();
308 >              }
309              }
310 <            interactions_[key].insert(eam_);
310 >            interactions_[atid1][atid2].insert(eam_);
311 >            iHash_[atid1][atid2] |= EAM_INTERACTION;
312              metExplicit = true;
313            }
314            
# Line 242 | Line 326 | namespace OpenMD {
326              // We found an explicit Sutton-Chen interaction.  
327              // override all other metallic entries for this pair of atom types:
328              set<NonBondedInteraction*>::iterator it;
329 <            for (it = interactions_[key].begin();
330 <                 it != interactions_[key].end(); ++it) {
329 >            for (it = interactions_[atid1][atid2].begin();
330 >                 it != interactions_[atid1][atid2].end(); ++it) {
331                InteractionFamily ifam = (*it)->getFamily();
332 <              if (ifam == METALLIC_FAMILY) interactions_[key].erase(*it);
332 >              if (ifam == METALLIC_FAMILY) {
333 >                interactions_[atid1][atid2].erase(*it);
334 >                iHash_[atid1][atid2] ^= (*it)->getHash();
335 >              }
336              }
337 <            interactions_[key].insert(sc_);
337 >            interactions_[atid1][atid2].insert(sc_);
338 >            iHash_[atid1][atid2] |= SC_INTERACTION;
339              metExplicit = true;
340            }
341            
# Line 265 | Line 353 | namespace OpenMD {
353              // We found an explicit MAW interaction.  
354              // override all other vdw entries for this pair of atom types:
355              set<NonBondedInteraction*>::iterator it;
356 <            for (it = interactions_[key].begin();
357 <                 it != interactions_[key].end(); ++it) {
356 >            for (it = interactions_[atid1][atid2].begin();
357 >                 it != interactions_[atid1][atid2].end(); ++it) {
358                InteractionFamily ifam = (*it)->getFamily();
359 <              if (ifam == VANDERWAALS_FAMILY) interactions_[key].erase(*it);
359 >              if (ifam == VANDERWAALS_FAMILY) {
360 >                interactions_[atid1][atid2].erase(*it);
361 >                iHash_[atid1][atid2] ^= (*it)->getHash();
362 >              }
363              }
364 <            interactions_[key].insert(maw_);
364 >            interactions_[atid1][atid2].insert(maw_);
365 >            iHash_[atid1][atid2] |= MAW_INTERACTION;
366              vdwExplicit = true;
367            }        
368          }
# Line 278 | Line 370 | namespace OpenMD {
370      }
371      
372      
373 <    // make sure every pair of atom types in this simulation has a
374 <    // non-bonded interaction:
373 >    // Make sure every pair of atom types in this simulation has a
374 >    // non-bonded interaction.  If not, just inform the user.
375  
376      set<AtomType*> simTypes = info_->getSimulatedAtomTypes();
377      set<AtomType*>::iterator it, jt;
378 +
379      for (it = simTypes.begin(); it != simTypes.end(); ++it) {
380        atype1 = (*it);
381 <      for (jt = simTypes.begin(); jt != simTypes.end(); ++jt) {
381 >      atid1 = atype1->getIdent();
382 >      for (jt = it; jt != simTypes.end(); ++jt) {
383          atype2 = (*jt);
384 <        key = make_pair(atype1, atype2);
384 >        atid1 = atype1->getIdent();
385          
386 <        if (interactions_[key].size() == 0) {
386 >        if (interactions_[atid1][atid2].size() == 0) {
387            sprintf( painCave.errMsg,
388 <                   "InteractionManager unable to find an appropriate non-bonded\n"
389 <                   "\tinteraction for atom types %s - %s\n",
388 >                   "InteractionManager could not find a matching non-bonded\n"
389 >                   "\tinteraction for atom types %s - %s\n"
390 >                   "\tProceeding without this interaction.\n",
391                     atype1->getName().c_str(), atype2->getName().c_str());
392            painCave.severity = OPENMD_INFO;
393 <          painCave.isFatal = 1;
393 >          painCave.isFatal = 0;
394            simError();
395          }
396        }
397      }
398  
304 –    setupCutoffs();
305 –    setupSwitching();
306 –
307 –    //int ljsp = cutoffMethod_ == SHIFTED_POTENTIAL ? 1 : 0;
308 –    //int ljsf = cutoffMethod_ == SHIFTED_FORCE ? 1 : 0;
309 –    //notifyFortranCutoffs(&rCut_, &rSwitch_, &ljsp, &ljsf);
310 –
399      initialized_ = true;
400    }
313 –  
314 –  /**
315 –   * setupCutoffs
316 –   *
317 –   * Sets the values of cutoffRadius and cutoffMethod
318 –   *
319 –   * cutoffRadius : realType
320 –   *  If the cutoffRadius was explicitly set, use that value.
321 –   *  If the cutoffRadius was not explicitly set:
322 –   *      Are there electrostatic atoms?  Use 12.0 Angstroms.
323 –   *      No electrostatic atoms?  Poll the atom types present in the
324 –   *      simulation for suggested cutoff values (e.g. 2.5 * sigma).
325 –   *      Use the maximum suggested value that was found.
326 –   *
327 –   * cutoffMethod : (one of HARD, SWITCHED, SHIFTED_FORCE, SHIFTED_POTENTIAL)
328 –   *      If cutoffMethod was explicitly set, use that choice.
329 –   *      If cutoffMethod was not explicitly set, use SHIFTED_FORCE
330 –   */
331 –  void InteractionManager::setupCutoffs() {
332 –    
333 –    Globals* simParams_ = info_->getSimParams();
334 –    
335 –    if (simParams_->haveCutoffRadius()) {
336 –      rCut_ = simParams_->getCutoffRadius();
337 –    } else {      
338 –      if (info_->usesElectrostaticAtoms()) {
339 –        sprintf(painCave.errMsg,
340 –                "InteractionManager::setupCutoffs: No value was set for the cutoffRadius.\n"
341 –                "\tOpenMD will use a default value of 12.0 angstroms"
342 –                "\tfor the cutoffRadius.\n");
343 –        painCave.isFatal = 0;
344 –        painCave.severity = OPENMD_INFO;
345 –        simError();
346 –        rCut_ = 12.0;
347 –      } else {
348 –        RealType thisCut;
349 –        set<AtomType*>::iterator i;
350 –        set<AtomType*> atomTypes;
351 –        atomTypes = info_->getSimulatedAtomTypes();        
352 –        for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
353 –          thisCut = getSuggestedCutoffRadius((*i));
354 –          rCut_ = max(thisCut, rCut_);
355 –        }
356 –        sprintf(painCave.errMsg,
357 –                "InteractionManager::setupCutoffs: No value was set for the cutoffRadius.\n"
358 –                "\tOpenMD will use %lf angstroms.\n",
359 –                rCut_);
360 –        painCave.isFatal = 0;
361 –        painCave.severity = OPENMD_INFO;
362 –        simError();
363 –      }            
364 –    }
401  
402 <    map<string, CutoffMethod> stringToCutoffMethod;
367 <    stringToCutoffMethod["HARD"] = HARD;
368 <    stringToCutoffMethod["SWITCHED"] = SWITCHED;
369 <    stringToCutoffMethod["SHIFTED_POTENTIAL"] = SHIFTED_POTENTIAL;    
370 <    stringToCutoffMethod["SHIFTED_FORCE"] = SHIFTED_FORCE;
371 <  
372 <    if (simParams_->haveCutoffMethod()) {
373 <      string cutMeth = toUpperCopy(simParams_->getCutoffMethod());
374 <      map<string, CutoffMethod>::iterator i;
375 <      i = stringToCutoffMethod.find(cutMeth);
376 <      if (i == stringToCutoffMethod.end()) {
377 <        sprintf(painCave.errMsg,
378 <                "InteractionManager::setupCutoffs: Could not find chosen cutoffMethod %s\n"
379 <                "\tShould be one of: "
380 <                "HARD, SWITCHED, SHIFTED_POTENTIAL, or SHIFTED_FORCE\n",
381 <                cutMeth.c_str());
382 <        painCave.isFatal = 1;
383 <        painCave.severity = OPENMD_ERROR;
384 <        simError();
385 <      } else {
386 <        cutoffMethod_ = i->second;
387 <      }
388 <    } else {
389 <      sprintf(painCave.errMsg,
390 <              "InteractionManager::setupCutoffs: No value was set for the cutoffMethod.\n"
391 <              "\tOpenMD will use SHIFTED_FORCE.\n");
392 <        painCave.isFatal = 0;
393 <        painCave.severity = OPENMD_INFO;
394 <        simError();
395 <        cutoffMethod_ = SHIFTED_FORCE;        
396 <    }
397 <  }
398 <
399 <
400 <  /**
401 <   * setupSwitching
402 <   *
403 <   * Sets the values of switchingRadius and
404 <   *  If the switchingRadius was explicitly set, use that value (but check it)
405 <   *  If the switchingRadius was not explicitly set: use 0.85 * cutoffRadius_
406 <   */
407 <  void InteractionManager::setupSwitching() {
408 <    Globals* simParams_ = info_->getSimParams();
409 <
410 <    if (simParams_->haveSwitchingRadius()) {
411 <      rSwitch_ = simParams_->getSwitchingRadius();
412 <      if (rSwitch_ > rCut_) {        
413 <        sprintf(painCave.errMsg,
414 <                "InteractionManager::setupSwitching: switchingRadius (%f) is larger than cutoffRadius(%f)\n",
415 <                rSwitch_, rCut_);
416 <        painCave.isFatal = 1;
417 <        painCave.severity = OPENMD_ERROR;
418 <        simError();
419 <      }
420 <    } else {      
421 <      rSwitch_ = 0.85 * rCut_;
422 <      sprintf(painCave.errMsg,
423 <              "InteractionManager::setupSwitching: No value was set for the switchingRadius.\n"
424 <              "\tOpenMD will use a default value of 85 percent of the cutoffRadius.\n"
425 <              "\tswitchingRadius = %f. for this simulation\n", rSwitch_);
426 <      painCave.isFatal = 0;
427 <      painCave.severity = OPENMD_WARNING;
428 <      simError();
429 <    }          
402 >  void InteractionManager::setCutoffRadius(RealType rcut) {
403      
404 <    if (simParams_->haveSwitchingFunctionType()) {
405 <      string funcType = simParams_->getSwitchingFunctionType();
433 <      toUpper(funcType);
434 <      if (funcType == "CUBIC") {
435 <        sft_ = cubic;
436 <      } else {
437 <        if (funcType == "FIFTH_ORDER_POLYNOMIAL") {
438 <          sft_ = fifth_order_poly;
439 <        } else {
440 <          // throw error        
441 <          sprintf( painCave.errMsg,
442 <                   "InteractionManager::setupSwitching : Unknown switchingFunctionType. (Input file specified %s .)\n"
443 <                   "\tswitchingFunctionType must be one of: "
444 <                   "\"cubic\" or \"fifth_order_polynomial\".",
445 <                   funcType.c_str() );
446 <          painCave.isFatal = 1;
447 <          painCave.severity = OPENMD_ERROR;
448 <          simError();
449 <        }          
450 <      }
451 <    }
452 <
453 <    switcher_->setSwitchType(sft_);
454 <    switcher_->setSwitch(rSwitch_, rCut_);
404 >    electrostatic_->setCutoffRadius(rcut);
405 >    eam_->setCutoffRadius(rcut);
406    }
407  
408 <  void InteractionManager::doPrePair(InteractionData idat){
408 >  void InteractionManager::doPrePair(InteractionData &idat){
409      
410      if (!initialized_) initialize();
411          
412 <    set<NonBondedInteraction*>::iterator it;
412 >    // excluded interaction, so just return
413 >    if (idat.excluded) return;
414  
415 <    for (it = interactions_[ *(idat.atypes) ].begin();
416 <         it != interactions_[ *(idat.atypes) ].end(); ++it){
417 <      if ((*it)->getFamily() == METALLIC_FAMILY) {
418 <        dynamic_cast<MetallicInteraction*>(*it)->calcDensity(idat);
419 <      }
420 <    }
415 >    int& iHash = iHash_[idat.atid1][idat.atid2];
416 >
417 >    if ((iHash & EAM_INTERACTION) != 0) eam_->calcDensity(idat);
418 >    if ((iHash & SC_INTERACTION) != 0)  sc_->calcDensity(idat);
419 >
420 >    // set<NonBondedInteraction*>::iterator it;
421 >
422 >    // for (it = interactions_[ idat.atypes ].begin();
423 >    //      it != interactions_[ idat.atypes ].end(); ++it){
424 >    //   if ((*it)->getFamily() == METALLIC_FAMILY) {
425 >    //     dynamic_cast<MetallicInteraction*>(*it)->calcDensity(idat);
426 >    //   }
427 >    // }
428      
429      return;    
430    }
431    
432 <  void InteractionManager::doPreForce(SelfData sdat){
432 >  void InteractionManager::doPreForce(SelfData &sdat){
433  
434      if (!initialized_) initialize();
435      
436 <    pair<AtomType*, AtomType*> key = make_pair(sdat.atype, sdat.atype);
437 <    set<NonBondedInteraction*>::iterator it;
436 >    int& sHash = sHash_[sdat.atid];
437 >
438 >    if ((sHash & EAM_INTERACTION) != 0) eam_->calcFunctional(sdat);
439 >    if ((sHash & SC_INTERACTION) != 0)  sc_->calcFunctional(sdat);
440 >
441 >    // set<NonBondedInteraction*>::iterator it;
442      
443 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it){
444 <      if ((*it)->getFamily() == METALLIC_FAMILY) {
445 <        dynamic_cast<MetallicInteraction*>(*it)->calcFunctional(sdat);
446 <      }
447 <    }
443 >    // for (it = interactions_[atid1][atid2].begin(); it != interactions_[atid1][atid2].end(); ++it){
444 >    //   if ((*it)->getFamily() == METALLIC_FAMILY) {
445 >    //     dynamic_cast<MetallicInteraction*>(*it)->calcFunctional(sdat);
446 >    //   }
447 >    // }
448      
449      return;    
450    }
451  
452 <  void InteractionManager::doPair(InteractionData idat){
452 >  void InteractionManager::doPair(InteractionData &idat){
453      
454      if (!initialized_) initialize();
492 –  
493 –    set<NonBondedInteraction*>::iterator it;
455  
456 <    for (it = interactions_[ *(idat.atypes) ].begin();
496 <         it != interactions_[ *(idat.atypes) ].end(); ++it)
497 <      (*it)->calcForce(idat);
498 <    
499 <    return;    
500 <  }
456 >    int& iHash = iHash_[idat.atid1][idat.atid2];
457  
458 <  void InteractionManager::doSkipCorrection(InteractionData idat){
458 >    if ((iHash & ELECTROSTATIC_INTERACTION) != 0) electrostatic_->calcForce(idat);
459 >      
460 >    // electrostatics still has to worry about indirect
461 >    // contributions from excluded pairs of atoms, but nothing else does:
462  
463 <    if (!initialized_) initialize();  
505 <    
506 <    set<NonBondedInteraction*>::iterator it;
463 >    if (idat.excluded) return;
464  
465 <    for (it = interactions_[ *(idat.atypes) ].begin();
466 <         it != interactions_[ *(idat.atypes) ].end(); ++it){
467 <      if ((*it)->getFamily() == ELECTROSTATIC_FAMILY) {
468 <        dynamic_cast<ElectrostaticInteraction*>(*it)->calcSkipCorrection(idat);
469 <      }
470 <    }
465 >    if ((iHash & LJ_INTERACTION) != 0)             lj_->calcForce(idat);
466 >    if ((iHash & GB_INTERACTION) != 0)             gb_->calcForce(idat);
467 >    if ((iHash & STICKY_INTERACTION) != 0)         sticky_->calcForce(idat);
468 >    if ((iHash & MORSE_INTERACTION) != 0)          morse_->calcForce(idat);
469 >    if ((iHash & REPULSIVEPOWER_INTERACTION) != 0) repulsivePower_->calcForce(idat);
470 >    if ((iHash & EAM_INTERACTION) != 0)            eam_->calcForce(idat);
471 >    if ((iHash & SC_INTERACTION) != 0)             sc_->calcForce(idat);
472 >    if ((iHash & MAW_INTERACTION) != 0)            maw_->calcForce(idat);
473 >
474 >    // set<NonBondedInteraction*>::iterator it;
475 >
476 >    // for (it = interactions_[ idat.atypes ].begin();
477 >    //      it != interactions_[ idat.atypes ].end(); ++it) {
478 >
479 >    //   // electrostatics still has to worry about indirect
480 >    //   // contributions from excluded pairs of atoms:
481 >
482 >    //   if (!idat.excluded || (*it)->getFamily() == ELECTROSTATIC_FAMILY) {
483 >    //     (*it)->calcForce(idat);
484 >    //   }
485 >    // }
486      
487      return;    
488    }
489  
490 <  void InteractionManager::doSelfCorrection(SelfData sdat){
490 >  void InteractionManager::doSelfCorrection(SelfData &sdat){
491  
492      if (!initialized_) initialize();
493      
494 <    pair<AtomType*, AtomType*> key = make_pair(sdat.atype, sdat.atype);
523 <    set<NonBondedInteraction*>::iterator it;
494 >    int& sHash = sHash_[sdat.atid];
495  
496 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it){
497 <      if ((*it)->getFamily() == ELECTROSTATIC_FAMILY) {
498 <        dynamic_cast<ElectrostaticInteraction*>(*it)->calcSelfCorrection(sdat);
499 <      }
500 <    }
496 >    if ((sHash & ELECTROSTATIC_INTERACTION) != 0) electrostatic_->calcSelfCorrection(sdat);
497 >
498 >    // set<NonBondedInteraction*>::iterator it;
499 >
500 >    // for (it = interactions_[atid1][atid2].begin(); it != interactions_[atid1][atid2].end(); ++it){
501 >    //   if ((*it)->getFamily() == ELECTROSTATIC_FAMILY) {
502 >    //     dynamic_cast<ElectrostaticInteraction*>(*it)->calcSelfCorrection(sdat);
503 >    //   }
504 >    // }
505        
506      return;    
507    }
508  
509 +  void InteractionManager::doReciprocalSpaceSum(RealType &pot){
510 +    if (!initialized_) initialize();
511 +    electrostatic_->ReciprocalSpaceSum(pot);
512 +  }
513 +
514    RealType InteractionManager::getSuggestedCutoffRadius(int *atid) {
515      if (!initialized_) initialize();
516 <    
516 >
517      AtomType* atype = typeMap_[*atid];
518  
539 –    pair<AtomType*, AtomType*> key = make_pair(atype, atype);
519      set<NonBondedInteraction*>::iterator it;
520      RealType cutoff = 0.0;
521      
522 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it)
523 <      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(key));  
522 >    for (it = interactions_[*atid][*atid].begin();
523 >         it != interactions_[*atid][*atid].end();
524 >         ++it)
525 >      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(make_pair(atype, atype)));  
526      return cutoff;    
527    }
528  
529    RealType InteractionManager::getSuggestedCutoffRadius(AtomType* atype) {
530      if (!initialized_) initialize();
531      
532 <    pair<AtomType*, AtomType*> key = make_pair(atype, atype);
532 >    int atid = atype->getIdent();
533 >
534      set<NonBondedInteraction*>::iterator it;
535      RealType cutoff = 0.0;
536      
537 <    for (it = interactions_[key].begin(); it != interactions_[key].end(); ++it)
538 <      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(key));  
537 >    for (it = interactions_[atid][atid].begin();
538 >         it != interactions_[atid][atid].end(); ++it)
539 >      cutoff = max(cutoff, (*it)->getSuggestedCutoffRadius(make_pair(atype, atype)));  
540      return cutoff;    
541    }
542   } //end namespace OpenMD

Diff Legend

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