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 1530 by gezelter, Tue Dec 28 21:47:55 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 52 | Line 52
52   #include "utils/simError.h"
53   #include "utils/Tuple.hpp"
54   #include "UseTheForce/DarkSide/atype_interface.h"
55 < #include "UseTheForce/DarkSide/fForceOptions_interface.h"
56 < #include "UseTheForce/DarkSide/switcheroo_interface.h"
57 < namespace oopse {
55 > namespace OpenMD {
56  
57    ForceField::ForceField() {
58 +
59      char* tempPath;
60      tempPath = getenv("FORCE_PARAM_PATH");
61 <
61 >    
62      if (tempPath == NULL) {
63        //convert a macro from compiler to a string in c++
64        STR_DEFINE(ffPath_, FRC_PATH );
# Line 71 | Line 70 | namespace oopse {
70  
71    ForceField::~ForceField() {
72      deleteAtypes();
74    deleteSwitch();
73    }
74  
75    AtomType* ForceField::getAtomType(const std::string &at) {
# Line 133 | Line 131 | namespace oopse {
131          ii++;
132        }
133  
136      // sort the foundBonds by the score:
134  
135 <      std::sort(foundBonds.begin(), foundBonds.end());
136 <      
137 <      int bestScore = foundBonds[0].first;
138 <      std::vector<std::string> theKeys = foundBonds[0].second;
139 <
140 <      std::cout << "best matching bond = " << theKeys[0] << "\t" << theKeys[1]  << "\t(score = "<< bestScore << ")\n";      
141 <      BondType* bestType = bondTypeCont_.find(theKeys);
142 <      if (bestType)
143 <        return bestType;
144 <      else {
145 <        //if no exact match found, try wild card match
146 <        return bondTypeCont_.find(keys, wildCardAtomTypeName_);      
135 >      if (foundBonds.size() > 0) {
136 >        // sort the foundBonds by the score:
137 >        std::sort(foundBonds.begin(), foundBonds.end());
138 >    
139 >        int bestScore = foundBonds[0].first;
140 >        std::vector<std::string> theKeys = foundBonds[0].second;
141 >        
142 >        BondType* bestType = bondTypeCont_.find(theKeys);
143 >        
144 >        return bestType;
145 >      } else {
146 >        //if no exact match found, try wild card match
147 >        return bondTypeCont_.find(keys, wildCardAtomTypeName_);      
148        }
149      }
150    }
# Line 220 | Line 218 | namespace oopse {
218          jj++;
219        }
220        
221 <      std::sort(foundBends.begin(), foundBends.end());
222 <
223 <      int jscore = foundBends[0].first;
224 <      int ikscore = foundBends[0].second;
225 <      std::vector<std::string> theKeys = foundBends[0].third;
226 <
227 <      std::cout << "best matching bend = " << theKeys[0] << "\t" <<theKeys[1]  << "\t" << theKeys[2] << "\t(scores = "<< jscore << "\t" << ikscore << ")\n";      
228 <
229 <      BendType* bestType = bendTypeCont_.find(theKeys);  
232 <      if (bestType)
233 <        return bestType;
234 <      else {
235 <      
221 >      if (foundBends.size() > 0) {
222 >        std::sort(foundBends.begin(), foundBends.end());
223 >        int jscore = foundBends[0].first;
224 >        int ikscore = foundBends[0].second;
225 >        std::vector<std::string> theKeys = foundBends[0].third;      
226 >        
227 >        BendType* bestType = bendTypeCont_.find(theKeys);  
228 >        return bestType;
229 >      } else {        
230          //if no exact match found, try wild card match
231          return bendTypeCont_.find(keys, wildCardAtomTypeName_);      
232        }
233      }
234    }
235  
242
236    TorsionType* ForceField::getTorsionType(const std::string &at1,
237                                            const std::string &at2,
238                                            const std::string &at3,
# Line 327 | Line 320 | namespace oopse {
320          jj++;
321        }
322        
323 <      std::sort(foundTorsions.begin(), foundTorsions.end());
323 >      if (foundTorsions.size() > 0) {
324 >        std::sort(foundTorsions.begin(), foundTorsions.end());
325 >        int jkscore = foundTorsions[0].first;
326 >        int ilscore = foundTorsions[0].second;
327 >        std::vector<std::string> theKeys = foundTorsions[0].third;
328 >        
329 >        TorsionType* bestType = torsionTypeCont_.find(theKeys);
330 >        return bestType;
331 >      } else {
332 >        //if no exact match found, try wild card match
333 >        return torsionTypeCont_.find(keys, wildCardAtomTypeName_);
334 >      }
335 >    }
336 >  }
337  
338 <      int jkscore = foundTorsions[0].first;
339 <      int ilscore = foundTorsions[0].second;
340 <      std::vector<std::string> theKeys = foundTorsions[0].third;
338 >  InversionType* ForceField::getInversionType(const std::string &at1,
339 >                                              const std::string &at2,
340 >                                              const std::string &at3,
341 >                                              const std::string &at4) {
342 >    std::vector<std::string> keys;
343 >    keys.push_back(at1);
344 >    keys.push_back(at2);    
345 >    keys.push_back(at3);    
346 >    keys.push_back(at4);    
347  
348 <      std::cout << "best matching torsion = " << theKeys[0] << "\t" <<theKeys[1]  << "\t" << theKeys[2] << "\t" << theKeys[3] << "\t(scores = "<< jkscore << "\t" << ilscore << ")\n";
348 >    //try exact match first
349 >    InversionType* inversionType = inversionTypeCont_.permutedFindSkippingFirstElement(keys);
350 >    if (inversionType) {
351 >      return inversionType;
352 >    } else {
353 >      
354 >      AtomType* atype1;
355 >      AtomType* atype2;
356 >      AtomType* atype3;
357 >      AtomType* atype4;
358 >      std::vector<std::string> at1key;
359 >      at1key.push_back(at1);
360 >      atype1 = atomTypeCont_.find(at1key);
361 >      
362 >      std::vector<std::string> at2key;
363 >      at2key.push_back(at2);
364 >      atype2 = atomTypeCont_.find(at2key);
365 >      
366 >      std::vector<std::string> at3key;
367 >      at3key.push_back(at3);
368 >      atype3 = atomTypeCont_.find(at3key);
369 >      
370 >      std::vector<std::string> at4key;
371 >      at4key.push_back(at4);
372 >      atype4 = atomTypeCont_.find(at4key);
373  
374 +      // query atom types for their chains of responsibility
375 +      std::vector<AtomType*> at1Chain = atype1->allYourBase();
376 +      std::vector<AtomType*> at2Chain = atype2->allYourBase();
377 +      std::vector<AtomType*> at3Chain = atype3->allYourBase();
378 +      std::vector<AtomType*> at4Chain = atype4->allYourBase();
379 +
380 +      std::vector<AtomType*>::iterator i;
381 +      std::vector<AtomType*>::iterator j;
382 +      std::vector<AtomType*>::iterator k;
383 +      std::vector<AtomType*>::iterator l;
384 +
385 +      int ii = 0;
386 +      int jj = 0;
387 +      int kk = 0;
388 +      int ll = 0;
389 +      int Iscore;
390 +      int JKLscore;
391        
392 <      TorsionType* bestType = torsionTypeCont_.find(theKeys);
393 <      if (bestType) {
394 <        return bestType;
392 >      std::vector<tuple3<int, int, std::vector<std::string> > > foundInversions;
393 >      
394 >      for (j = at2Chain.begin(); j != at2Chain.end(); j++) {
395 >        kk = 0;
396 >        for (k = at3Chain.begin(); k != at3Chain.end(); k++) {
397 >          ii = 0;      
398 >          for (i = at1Chain.begin(); i != at1Chain.end(); i++) {
399 >            ll = 0;
400 >            for (l = at4Chain.begin(); l != at4Chain.end(); l++) {
401 >              
402 >              Iscore = ii;
403 >              JKLscore = jj + kk + ll;
404 >              
405 >              std::vector<std::string> myKeys;
406 >              myKeys.push_back((*i)->getName());
407 >              myKeys.push_back((*j)->getName());
408 >              myKeys.push_back((*k)->getName());
409 >              myKeys.push_back((*l)->getName());
410 >              
411 >              InversionType* inversionType = inversionTypeCont_.permutedFindSkippingFirstElement(myKeys);
412 >              if (inversionType) {
413 >                foundInversions.push_back( make_tuple3(Iscore, JKLscore, myKeys) );
414 >              }
415 >              ll++;
416 >            }
417 >            ii++;
418 >          }
419 >          kk++;
420 >        }
421 >        jj++;
422 >      }
423 >        
424 >      if (foundInversions.size() > 0) {
425 >        std::sort(foundInversions.begin(), foundInversions.end());
426 >        int iscore = foundInversions[0].first;
427 >        int jklscore = foundInversions[0].second;
428 >        std::vector<std::string> theKeys = foundInversions[0].third;
429 >        
430 >        InversionType* bestType = inversionTypeCont_.permutedFindSkippingFirstElement(theKeys);
431 >        return bestType;
432        } else {
433          //if no exact match found, try wild card match
434 <        return torsionTypeCont_.find(keys, wildCardAtomTypeName_);
434 >        return inversionTypeCont_.find(keys, wildCardAtomTypeName_);
435        }
436      }
437    }
438 <
438 >  
439    NonBondedInteractionType* ForceField::getNonBondedInteractionType(const std::string &at1, const std::string &at2) {
440      std::vector<std::string> keys;
441      keys.push_back(at1);
# Line 390 | Line 480 | namespace oopse {
480      keys.push_back(at4);  
481      return torsionTypeCont_.find(keys);
482    }
483 <
483 >  
484 >  InversionType* ForceField::getExactInversionType(const std::string &at1,
485 >                                                   const std::string &at2,
486 >                                                   const std::string &at3,
487 >                                                   const std::string &at4){
488 >    std::vector<std::string> keys;
489 >    keys.push_back(at1);
490 >    keys.push_back(at2);    
491 >    keys.push_back(at3);    
492 >    keys.push_back(at4);  
493 >    return inversionTypeCont_.find(keys);
494 >  }
495 >  
496    NonBondedInteractionType* ForceField::getExactNonBondedInteractionType(const std::string &at1, const std::string &at2){
497      std::vector<std::string> keys;
498      keys.push_back(at1);
499      keys.push_back(at2);    
500      return nonBondedInteractionTypeCont_.find(keys);
501    }
502 +  
503  
401
504    bool ForceField::addAtomType(const std::string &at, AtomType* atomType) {
505      std::vector<std::string> keys;
506      keys.push_back(at);
507      return atomTypeCont_.add(keys, atomType);
508    }
509  
510 +  bool ForceField::replaceAtomType(const std::string &at, AtomType* atomType) {
511 +    std::vector<std::string> keys;
512 +    keys.push_back(at);
513 +    return atomTypeCont_.replace(keys, atomType);
514 +  }
515 +
516    bool ForceField::addBondType(const std::string &at1, const std::string &at2,
517                                 BondType* bondType) {
518      std::vector<std::string> keys;
# Line 435 | Line 543 | namespace oopse {
543      return torsionTypeCont_.add(keys, torsionType);
544    }
545  
546 +  bool ForceField::addInversionType(const std::string &at1,
547 +                                    const std::string &at2,
548 +                                    const std::string &at3,
549 +                                    const std::string &at4,
550 +                                    InversionType* inversionType) {
551 +    std::vector<std::string> keys;
552 +    keys.push_back(at1);
553 +    keys.push_back(at2);    
554 +    keys.push_back(at3);    
555 +    keys.push_back(at4);    
556 +    return inversionTypeCont_.add(keys, inversionType);
557 +  }
558 +  
559    bool ForceField::addNonBondedInteractionType(const std::string &at1,
560                                                 const std::string &at2,
561                                                 NonBondedInteractionType* nbiType) {
# Line 463 | Line 584 | namespace oopse {
584          } else {
585            sprintf( painCave.errMsg,
586                     "Can not cast GenericData to LJParam\n");
587 <          painCave.severity = OOPSE_ERROR;
587 >          painCave.severity = OPENMD_ERROR;
588            painCave.isFatal = 1;
589            simError();          
590          }            
591        } else {
592          sprintf( painCave.errMsg, "Can not find Parameters for LennardJones\n");
593 <        painCave.severity = OOPSE_ERROR;
593 >        painCave.severity = OPENMD_ERROR;
594          painCave.isFatal = 1;
595          simError();          
596        }
# Line 499 | Line 620 | namespace oopse {
620                   "\tHave you tried setting the FORCE_PARAM_PATH environment "
621                   "variable?\n",
622                   forceFieldFilename.c_str() );
623 <        painCave.severity = OOPSE_ERROR;
623 >        painCave.severity = OPENMD_ERROR;
624          painCave.isFatal = 1;
625          simError();
626        }
# Line 507 | Line 628 | namespace oopse {
628      return ffStream;
629    }
630  
631 <  void ForceField::setFortranForceOptions(){
511 <    ForceOptions theseFortranOptions;
512 <    forceFieldOptions_.makeFortranOptions(theseFortranOptions);
513 <    setfForceOptions(&theseFortranOptions);
514 <  }
515 < } //end namespace oopse
631 > } //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 1530 by gezelter, Tue Dec 28 21:47:55 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines