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

Comparing branches/development/src/UseTheForce/ForceField.cpp (file contents):
Revision 1535 by gezelter, Fri Dec 31 18:31:56 2010 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   /**
# Line 51 | Line 52
52   #include "UseTheForce/ForceField.hpp"
53   #include "utils/simError.h"
54   #include "utils/Tuple.hpp"
55 + #include "types/LennardJonesAdapter.hpp"
56 +
57   namespace OpenMD {
58  
59    ForceField::ForceField() {
# Line 448 | Line 451 | namespace OpenMD {
451    }
452    
453    NonBondedInteractionType* ForceField::getNonBondedInteractionType(const std::string &at1, const std::string &at2) {
454 +    
455      std::vector<std::string> keys;
456      keys.push_back(at1);
457      keys.push_back(at2);    
458 <  
458 >    
459      //try exact match first
460      NonBondedInteractionType* nbiType = nonBondedInteractionTypeCont_.find(keys);
461      if (nbiType) {
462        return nbiType;
463      } else {
464 <      //if no exact match found, try wild card match
465 <      return nonBondedInteractionTypeCont_.find(keys, wildCardAtomTypeName_);  
466 <    }    
464 >      AtomType* atype1;
465 >      AtomType* atype2;
466 >      std::vector<std::string> at1key;
467 >      at1key.push_back(at1);
468 >      atype1 = atomTypeCont_.find(at1key);
469 >      
470 >      std::vector<std::string> at2key;
471 >      at2key.push_back(at2);
472 >      atype2 = atomTypeCont_.find(at2key);
473 >      
474 >      // query atom types for their chains of responsibility
475 >      std::vector<AtomType*> at1Chain = atype1->allYourBase();
476 >      std::vector<AtomType*> at2Chain = atype2->allYourBase();
477 >      
478 >      std::vector<AtomType*>::iterator i;
479 >      std::vector<AtomType*>::iterator j;
480 >      
481 >      int ii = 0;
482 >      int jj = 0;
483 >      int nbiTypeScore;
484 >      
485 >      std::vector<std::pair<int, std::vector<std::string> > > foundNBI;
486 >      
487 >      for (i = at1Chain.begin(); i != at1Chain.end(); i++) {
488 >        jj = 0;
489 >        for (j = at2Chain.begin(); j != at2Chain.end(); j++) {
490 >          
491 >          nbiTypeScore = ii + jj;
492 >          
493 >          std::vector<std::string> myKeys;
494 >          myKeys.push_back((*i)->getName());
495 >          myKeys.push_back((*j)->getName());
496 >          
497 >          NonBondedInteractionType* nbiType = nonBondedInteractionTypeCont_.find(myKeys);
498 >          if (nbiType) {
499 >            foundNBI.push_back(std::make_pair(nbiTypeScore, myKeys));
500 >          }
501 >          jj++;
502 >        }
503 >        ii++;
504 >      }
505 >      
506 >      
507 >      if (foundNBI.size() > 0) {
508 >        // sort the foundNBI by the score:
509 >        std::sort(foundNBI.begin(), foundNBI.end());
510 >        
511 >        int bestScore = foundNBI[0].first;
512 >        std::vector<std::string> theKeys = foundNBI[0].second;
513 >        
514 >        NonBondedInteractionType* bestType = nonBondedInteractionTypeCont_.find(theKeys);        
515 >        return bestType;
516 >      } else {
517 >        //if no exact match found, try wild card match
518 >        return nonBondedInteractionTypeCont_.find(keys, wildCardAtomTypeName_);
519 >      }
520 >    }
521    }
522    
523    BondType* ForceField::getExactBondType(const std::string &at1,
# Line 579 | Line 637 | namespace OpenMD {
637    }
638    
639    RealType ForceField::getRcutFromAtomType(AtomType* at) {
582    /**@todo */
583    GenericData* data;
640      RealType rcut = 0.0;
641      
642 <    if (at->isLennardJones()) {
643 <      data = at->getPropertyByName("LennardJones");
644 <      if (data != NULL) {
589 <        LJParamGenericData* ljData = dynamic_cast<LJParamGenericData*>(data);
590 <        
591 <        if (ljData != NULL) {
592 <          LJParam ljParam = ljData->getData();
593 <          
594 <          //by default use 2.5*sigma as cutoff radius
595 <          rcut = 2.5 * ljParam.sigma;
596 <          
597 <        } else {
598 <          sprintf( painCave.errMsg,
599 <                   "Can not cast GenericData to LJParam\n");
600 <          painCave.severity = OPENMD_ERROR;
601 <          painCave.isFatal = 1;
602 <          simError();          
603 <        }            
604 <      } else {
605 <        sprintf( painCave.errMsg, "Can not find Parameters for LennardJones\n");
606 <        painCave.severity = OPENMD_ERROR;
607 <        painCave.isFatal = 1;
608 <        simError();          
609 <      }
642 >    LennardJonesAdapter lja = LennardJonesAdapter(at);
643 >    if (lja.isLennardJones()) {
644 >      rcut = 2.5 * lja.getSigma();
645      }
646      return rcut;    
647    }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines