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

Comparing:
trunk/src/UseTheForce/ForceField.cpp (file contents), Revision 1269 by gezelter, Tue Jul 1 13:28:23 2008 UTC vs.
branches/development/src/UseTheForce/ForceField.cpp (file contents), Revision 1473 by gezelter, Tue Jul 20 15:43:00 2010 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
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).                        
40   */
41  
42   /**
# Line 54 | Line 54
54   #include "UseTheForce/DarkSide/atype_interface.h"
55   #include "UseTheForce/DarkSide/fForceOptions_interface.h"
56   #include "UseTheForce/DarkSide/switcheroo_interface.h"
57 < namespace oopse {
57 > namespace OpenMD {
58  
59    ForceField::ForceField() {
60 +
61      char* tempPath;
62      tempPath = getenv("FORCE_PARAM_PATH");
63 <
63 >    
64      if (tempPath == NULL) {
65        //convert a macro from compiler to a string in c++
66        STR_DEFINE(ffPath_, FRC_PATH );
# Line 71 | Line 72 | namespace oopse {
72  
73    ForceField::~ForceField() {
74      deleteAtypes();
75 <    deleteSwitch();
75 >    deleteSwitch();  
76    }
77  
78    AtomType* ForceField::getAtomType(const std::string &at) {
# Line 133 | Line 134 | namespace oopse {
134          ii++;
135        }
136  
136      // sort the foundBonds by the score:
137  
138 <      std::sort(foundBonds.begin(), foundBonds.end());
139 <      
140 <      int bestScore = foundBonds[0].first;
141 <      std::vector<std::string> theKeys = foundBonds[0].second;
142 <
143 <      std::cout << "best matching bond = " << theKeys[0] << "\t" << theKeys[1]  << "\t(score = "<< bestScore << ")\n";      
144 <      BondType* bestType = bondTypeCont_.find(theKeys);
145 <      if (bestType)
146 <        return bestType;
147 <      else {
148 <        //if no exact match found, try wild card match
149 <        return bondTypeCont_.find(keys, wildCardAtomTypeName_);      
138 >      if (foundBonds.size() > 0) {
139 >        // sort the foundBonds by the score:
140 >        std::sort(foundBonds.begin(), foundBonds.end());
141 >    
142 >        int bestScore = foundBonds[0].first;
143 >        std::vector<std::string> theKeys = foundBonds[0].second;
144 >        
145 >        BondType* bestType = bondTypeCont_.find(theKeys);
146 >        
147 >        return bestType;
148 >      } else {
149 >        //if no exact match found, try wild card match
150 >        return bondTypeCont_.find(keys, wildCardAtomTypeName_);      
151        }
152      }
153    }
# Line 220 | Line 221 | namespace oopse {
221          jj++;
222        }
223        
224 <      std::sort(foundBends.begin(), foundBends.end());
225 <
226 <      int jscore = foundBends[0].first;
227 <      int ikscore = foundBends[0].second;
228 <      std::vector<std::string> theKeys = foundBends[0].third;
229 <
230 <      std::cout << "best matching bend = " << theKeys[0] << "\t" <<theKeys[1]  << "\t" << theKeys[2] << "\t(scores = "<< jscore << "\t" << ikscore << ")\n";      
231 <
232 <      BendType* bestType = bendTypeCont_.find(theKeys);  
232 <      if (bestType)
233 <        return bestType;
234 <      else {
235 <      
224 >      if (foundBends.size() > 0) {
225 >        std::sort(foundBends.begin(), foundBends.end());
226 >        int jscore = foundBends[0].first;
227 >        int ikscore = foundBends[0].second;
228 >        std::vector<std::string> theKeys = foundBends[0].third;      
229 >        
230 >        BendType* bestType = bendTypeCont_.find(theKeys);  
231 >        return bestType;
232 >      } else {        
233          //if no exact match found, try wild card match
234          return bendTypeCont_.find(keys, wildCardAtomTypeName_);      
235        }
236      }
237    }
238  
242
239    TorsionType* ForceField::getTorsionType(const std::string &at1,
240                                            const std::string &at2,
241                                            const std::string &at3,
# Line 327 | Line 323 | namespace oopse {
323          jj++;
324        }
325        
326 <      std::sort(foundTorsions.begin(), foundTorsions.end());
326 >      if (foundTorsions.size() > 0) {
327 >        std::sort(foundTorsions.begin(), foundTorsions.end());
328 >        int jkscore = foundTorsions[0].first;
329 >        int ilscore = foundTorsions[0].second;
330 >        std::vector<std::string> theKeys = foundTorsions[0].third;
331 >        
332 >        TorsionType* bestType = torsionTypeCont_.find(theKeys);
333 >        return bestType;
334 >      } else {
335 >        //if no exact match found, try wild card match
336 >        return torsionTypeCont_.find(keys, wildCardAtomTypeName_);
337 >      }
338 >    }
339 >  }
340  
341 <      int jkscore = foundTorsions[0].first;
342 <      int ilscore = foundTorsions[0].second;
343 <      std::vector<std::string> theKeys = foundTorsions[0].third;
341 >  InversionType* ForceField::getInversionType(const std::string &at1,
342 >                                              const std::string &at2,
343 >                                              const std::string &at3,
344 >                                              const std::string &at4) {
345 >    std::vector<std::string> keys;
346 >    keys.push_back(at1);
347 >    keys.push_back(at2);    
348 >    keys.push_back(at3);    
349 >    keys.push_back(at4);    
350  
351 <      std::cout << "best matching torsion = " << theKeys[0] << "\t" <<theKeys[1]  << "\t" << theKeys[2] << "\t" << theKeys[3] << "\t(scores = "<< jkscore << "\t" << ilscore << ")\n";
351 >    //try exact match first
352 >    InversionType* inversionType = inversionTypeCont_.permutedFindSkippingFirstElement(keys);
353 >    if (inversionType) {
354 >      return inversionType;
355 >    } else {
356 >      
357 >      AtomType* atype1;
358 >      AtomType* atype2;
359 >      AtomType* atype3;
360 >      AtomType* atype4;
361 >      std::vector<std::string> at1key;
362 >      at1key.push_back(at1);
363 >      atype1 = atomTypeCont_.find(at1key);
364 >      
365 >      std::vector<std::string> at2key;
366 >      at2key.push_back(at2);
367 >      atype2 = atomTypeCont_.find(at2key);
368 >      
369 >      std::vector<std::string> at3key;
370 >      at3key.push_back(at3);
371 >      atype3 = atomTypeCont_.find(at3key);
372 >      
373 >      std::vector<std::string> at4key;
374 >      at4key.push_back(at4);
375 >      atype4 = atomTypeCont_.find(at4key);
376  
377 +      // query atom types for their chains of responsibility
378 +      std::vector<AtomType*> at1Chain = atype1->allYourBase();
379 +      std::vector<AtomType*> at2Chain = atype2->allYourBase();
380 +      std::vector<AtomType*> at3Chain = atype3->allYourBase();
381 +      std::vector<AtomType*> at4Chain = atype4->allYourBase();
382 +
383 +      std::vector<AtomType*>::iterator i;
384 +      std::vector<AtomType*>::iterator j;
385 +      std::vector<AtomType*>::iterator k;
386 +      std::vector<AtomType*>::iterator l;
387 +
388 +      int ii = 0;
389 +      int jj = 0;
390 +      int kk = 0;
391 +      int ll = 0;
392 +      int Iscore;
393 +      int JKLscore;
394        
395 <      TorsionType* bestType = torsionTypeCont_.find(theKeys);
396 <      if (bestType) {
397 <        return bestType;
395 >      std::vector<tuple3<int, int, std::vector<std::string> > > foundInversions;
396 >      
397 >      for (j = at2Chain.begin(); j != at2Chain.end(); j++) {
398 >        kk = 0;
399 >        for (k = at3Chain.begin(); k != at3Chain.end(); k++) {
400 >          ii = 0;      
401 >          for (i = at1Chain.begin(); i != at1Chain.end(); i++) {
402 >            ll = 0;
403 >            for (l = at4Chain.begin(); l != at4Chain.end(); l++) {
404 >              
405 >              Iscore = ii;
406 >              JKLscore = jj + kk + ll;
407 >              
408 >              std::vector<std::string> myKeys;
409 >              myKeys.push_back((*i)->getName());
410 >              myKeys.push_back((*j)->getName());
411 >              myKeys.push_back((*k)->getName());
412 >              myKeys.push_back((*l)->getName());
413 >              
414 >              InversionType* inversionType = inversionTypeCont_.permutedFindSkippingFirstElement(myKeys);
415 >              if (inversionType) {
416 >                foundInversions.push_back( make_tuple3(Iscore, JKLscore, myKeys) );
417 >              }
418 >              ll++;
419 >            }
420 >            ii++;
421 >          }
422 >          kk++;
423 >        }
424 >        jj++;
425 >      }
426 >        
427 >      if (foundInversions.size() > 0) {
428 >        std::sort(foundInversions.begin(), foundInversions.end());
429 >        int iscore = foundInversions[0].first;
430 >        int jklscore = foundInversions[0].second;
431 >        std::vector<std::string> theKeys = foundInversions[0].third;
432 >        
433 >        InversionType* bestType = inversionTypeCont_.permutedFindSkippingFirstElement(theKeys);
434 >        return bestType;
435        } else {
436          //if no exact match found, try wild card match
437 <        return torsionTypeCont_.find(keys, wildCardAtomTypeName_);
437 >        return inversionTypeCont_.find(keys, wildCardAtomTypeName_);
438        }
439      }
440    }
441 <
441 >  
442    NonBondedInteractionType* ForceField::getNonBondedInteractionType(const std::string &at1, const std::string &at2) {
443      std::vector<std::string> keys;
444      keys.push_back(at1);
# Line 390 | Line 483 | namespace oopse {
483      keys.push_back(at4);  
484      return torsionTypeCont_.find(keys);
485    }
486 <
486 >  
487 >  InversionType* ForceField::getExactInversionType(const std::string &at1,
488 >                                                   const std::string &at2,
489 >                                                   const std::string &at3,
490 >                                                   const std::string &at4){
491 >    std::vector<std::string> keys;
492 >    keys.push_back(at1);
493 >    keys.push_back(at2);    
494 >    keys.push_back(at3);    
495 >    keys.push_back(at4);  
496 >    return inversionTypeCont_.find(keys);
497 >  }
498 >  
499    NonBondedInteractionType* ForceField::getExactNonBondedInteractionType(const std::string &at1, const std::string &at2){
500      std::vector<std::string> keys;
501      keys.push_back(at1);
502      keys.push_back(at2);    
503      return nonBondedInteractionTypeCont_.find(keys);
504    }
505 +  
506  
401
507    bool ForceField::addAtomType(const std::string &at, AtomType* atomType) {
508      std::vector<std::string> keys;
509      keys.push_back(at);
510      return atomTypeCont_.add(keys, atomType);
511    }
512  
513 +  bool ForceField::replaceAtomType(const std::string &at, AtomType* atomType) {
514 +    std::vector<std::string> keys;
515 +    keys.push_back(at);
516 +    return atomTypeCont_.replace(keys, atomType);
517 +  }
518 +
519    bool ForceField::addBondType(const std::string &at1, const std::string &at2,
520                                 BondType* bondType) {
521      std::vector<std::string> keys;
# Line 435 | Line 546 | namespace oopse {
546      return torsionTypeCont_.add(keys, torsionType);
547    }
548  
549 +  bool ForceField::addInversionType(const std::string &at1,
550 +                                    const std::string &at2,
551 +                                    const std::string &at3,
552 +                                    const std::string &at4,
553 +                                    InversionType* inversionType) {
554 +    std::vector<std::string> keys;
555 +    keys.push_back(at1);
556 +    keys.push_back(at2);    
557 +    keys.push_back(at3);    
558 +    keys.push_back(at4);    
559 +    return inversionTypeCont_.add(keys, inversionType);
560 +  }
561 +  
562    bool ForceField::addNonBondedInteractionType(const std::string &at1,
563                                                 const std::string &at2,
564                                                 NonBondedInteractionType* nbiType) {
# Line 463 | Line 587 | namespace oopse {
587          } else {
588            sprintf( painCave.errMsg,
589                     "Can not cast GenericData to LJParam\n");
590 <          painCave.severity = OOPSE_ERROR;
590 >          painCave.severity = OPENMD_ERROR;
591            painCave.isFatal = 1;
592            simError();          
593          }            
594        } else {
595          sprintf( painCave.errMsg, "Can not find Parameters for LennardJones\n");
596 <        painCave.severity = OOPSE_ERROR;
596 >        painCave.severity = OPENMD_ERROR;
597          painCave.isFatal = 1;
598          simError();          
599        }
# Line 499 | Line 623 | namespace oopse {
623                   "\tHave you tried setting the FORCE_PARAM_PATH environment "
624                   "variable?\n",
625                   forceFieldFilename.c_str() );
626 <        painCave.severity = OOPSE_ERROR;
626 >        painCave.severity = OPENMD_ERROR;
627          painCave.isFatal = 1;
628          simError();
629        }
# Line 512 | Line 636 | namespace oopse {
636      forceFieldOptions_.makeFortranOptions(theseFortranOptions);
637      setfForceOptions(&theseFortranOptions);
638    }
639 < } //end namespace oopse
639 > } //end namespace OpenMD

Comparing:
trunk/src/UseTheForce/ForceField.cpp (property svn:keywords), Revision 1269 by gezelter, Tue Jul 1 13:28:23 2008 UTC vs.
branches/development/src/UseTheForce/ForceField.cpp (property svn:keywords), Revision 1473 by gezelter, Tue Jul 20 15:43:00 2010 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines