ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/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.
Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC

# Line 36 | Line 36
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).                        
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};
55 <
56 <  map<int, AtomType*> InteractionManager::typeMap_;
57 <  map<pair<AtomType*, AtomType*>, set<NonBondedInteraction*> > InteractionManager::interactions_;
58 <
59 <  LJ* InteractionManager::lj_ = new LJ();
61 <  GB* InteractionManager::gb_ = new GB();
62 <  Sticky* InteractionManager::sticky_ = new Sticky();
63 <  Morse* InteractionManager::morse_ = new Morse();
64 <  EAM* InteractionManager::eam_ = new EAM();
65 <  SC* InteractionManager::sc_ = new SC();
66 <  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;
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    void InteractionManager::initialize() {
# Line 84 | Line 69 | namespace OpenMD {
69      eam_->setForceField(forceField_);
70      sc_->setForceField(forceField_);
71      morse_->setForceField(forceField_);
72 +    electrostatic_->setSimInfo(info_);
73      electrostatic_->setForceField(forceField_);
74      maw_->setForceField(forceField_);
75 +    repulsivePower_->setForceField(forceField_);
76  
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 –
77      ForceField::AtomTypeContainer* atomTypes = forceField_->getAtomTypes();
78      ForceField::AtomTypeContainer::MapTypeIterator i1, i2;
79      AtomType* atype1;
# Line 118 | Line 85 | namespace OpenMD {
85           atype1 = atomTypes->nextType(i1)) {
86        
87        // add it to the map:
121 –      AtomTypeProperties atp = atype1->getATP();    
88        
89        pair<map<int,AtomType*>::iterator,bool> ret;    
90 <      ret = typeMap_.insert( pair<int, AtomType*>(atp.ident, atype1) );
90 >      ret = typeMap_.insert( pair<int, AtomType*>(atype1->getIdent(), atype1) );
91        if (ret.second == false) {
92          sprintf( painCave.errMsg,
93                   "InteractionManager already had a previous entry with ident %d\n",
94 <                 atp.ident);
94 >                 atype1->getIdent());
95          painCave.severity = OPENMD_INFO;
96          painCave.isFatal = 0;
97          simError();                
# Line 214 | Line 180 | namespace OpenMD {
180              interactions_[key].insert(morse_);
181              vdwExplicit = true;
182            }
183 +
184 +          if (nbiType->isRepulsivePower()) {
185 +            if (vdwExplicit) {
186 +              sprintf( painCave.errMsg,
187 +                       "InteractionManager::initialize found more than one "
188 +                       "explicit \n"
189 +                       "\tvan der Waals interaction for atom types %s - %s\n",
190 +                       atype1->getName().c_str(), atype2->getName().c_str());
191 +              painCave.severity = OPENMD_ERROR;
192 +              painCave.isFatal = 1;
193 +              simError();
194 +            }
195 +            // We found an explicit RepulsivePower interaction.  
196 +            // override all other vdw entries for this pair of atom types:
197 +            set<NonBondedInteraction*>::iterator it;
198 +            for (it = interactions_[key].begin();
199 +                 it != interactions_[key].end(); ++it) {
200 +              InteractionFamily ifam = (*it)->getFamily();
201 +              if (ifam == VANDERWAALS_FAMILY) interactions_[key].erase(*it);
202 +            }
203 +            interactions_[key].insert(repulsivePower_);
204 +            vdwExplicit = true;
205 +          }
206            
207 +          
208            if (nbiType->isEAM()) {
209              // We found an explicit EAM interaction.  
210              // override all other metallic entries for this pair of atom types:
# Line 278 | Line 268 | namespace OpenMD {
268      }
269      
270      
271 <    // make sure every pair of atom types in this simulation has a
272 <    // non-bonded interaction:
271 >    // Make sure every pair of atom types in this simulation has a
272 >    // non-bonded interaction.  If not, just inform the user.
273  
274      set<AtomType*> simTypes = info_->getSimulatedAtomTypes();
275      set<AtomType*>::iterator it, jt;
276 +
277      for (it = simTypes.begin(); it != simTypes.end(); ++it) {
278        atype1 = (*it);
279 <      for (jt = simTypes.begin(); jt != simTypes.end(); ++jt) {
279 >      for (jt = it; jt != simTypes.end(); ++jt) {
280          atype2 = (*jt);
281          key = make_pair(atype1, atype2);
282          
283          if (interactions_[key].size() == 0) {
284            sprintf( painCave.errMsg,
285 <                   "InteractionManager unable to find an appropriate non-bonded\n"
286 <                   "\tinteraction for atom types %s - %s\n",
285 >                   "InteractionManager could not find a matching non-bonded\n"
286 >                   "\tinteraction for atom types %s - %s\n"
287 >                   "\tProceeding without this interaction.\n",
288                     atype1->getName().c_str(), atype2->getName().c_str());
289            painCave.severity = OPENMD_INFO;
290 <          painCave.isFatal = 1;
290 >          painCave.isFatal = 0;
291            simError();
292          }
293        }
294      }
295  
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 –
296      initialized_ = true;
297    }
298 <  
299 <  /**
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() {
298 >
299 >  void InteractionManager::setCutoffRadius(RealType rcut) {
300      
301 <    Globals* simParams_ = info_->getSimParams();
302 <    
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 <    }
365 <
366 <    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 <    }
301 >    electrostatic_->setCutoffRadius(rcut);
302 >    eam_->setCutoffRadius(rcut);
303    }
304  
305 <
306 <  /**
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 <    }          
430 <    
431 <    if (simParams_->haveSwitchingFunctionType()) {
432 <      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_);
305 >  void InteractionManager::setSwitchingRadius(RealType rswitch) {
306 >    electrostatic_->setSwitchingRadius(rswitch);
307    }
308 <
308 >  
309    void InteractionManager::doPrePair(InteractionData idat){
310      
311      if (!initialized_) initialize();
312          
313 +    // excluded interaction, so just return
314 +    if (idat.excluded) return;
315 +
316      set<NonBondedInteraction*>::iterator it;
317  
318 <    for (it = interactions_[ *(idat.atypes) ].begin();
319 <         it != interactions_[ *(idat.atypes) ].end(); ++it){
318 >    for (it = interactions_[ idat.atypes ].begin();
319 >         it != interactions_[ idat.atypes ].end(); ++it){
320        if ((*it)->getFamily() == METALLIC_FAMILY) {
321          dynamic_cast<MetallicInteraction*>(*it)->calcDensity(idat);
322        }
# Line 489 | Line 344 | namespace OpenMD {
344    void InteractionManager::doPair(InteractionData idat){
345      
346      if (!initialized_) initialize();
347 <  
347 >
348      set<NonBondedInteraction*>::iterator it;
349  
350 <    for (it = interactions_[ *(idat.atypes) ].begin();
351 <         it != interactions_[ *(idat.atypes) ].end(); ++it)
497 <      (*it)->calcForce(idat);
498 <    
499 <    return;    
500 <  }
350 >    for (it = interactions_[ idat.atypes ].begin();
351 >         it != interactions_[ idat.atypes ].end(); ++it) {
352  
353 <  void InteractionManager::doSkipCorrection(InteractionData idat){
353 >      // electrostatics still has to worry about indirect
354 >      // contributions from excluded pairs of atoms:
355  
356 <    if (!initialized_) initialize();  
357 <    
506 <    set<NonBondedInteraction*>::iterator it;
507 <
508 <    for (it = interactions_[ *(idat.atypes) ].begin();
509 <         it != interactions_[ *(idat.atypes) ].end(); ++it){
510 <      if ((*it)->getFamily() == ELECTROSTATIC_FAMILY) {
511 <        dynamic_cast<ElectrostaticInteraction*>(*it)->calcSkipCorrection(idat);
356 >      if (!idat.excluded || (*it)->getFamily() == ELECTROSTATIC_FAMILY) {
357 >        (*it)->calcForce(idat);
358        }
359      }
360      

Diff Legend

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