ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/nonbonded/Sticky.cpp
(Generate patch)

Comparing branches/development/src/nonbonded/Sticky.cpp (file contents):
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1833 by gezelter, Tue Jan 15 16:28:22 2013 UTC

# Line 46 | Line 46
46   #include <cmath>
47   #include "nonbonded/Sticky.hpp"
48   #include "nonbonded/LJ.hpp"
49 + #include "types/StickyAdapter.hpp"
50   #include "utils/simError.h"
51  
52   using namespace std;
53   namespace OpenMD {
54    
55    Sticky::Sticky() : name_("Sticky"), initialized_(false), forceField_(NULL) {}
55  
56  StickyParam Sticky::getStickyParam(AtomType* atomType) {
56      
58    // Do sanity checking on the AtomType we were passed before
59    // building any data structures:
60    if (!atomType->isSticky() && !atomType->isStickyPower()) {
61      sprintf( painCave.errMsg,
62               "Sticky::getStickyParam was passed an atomType (%s) that does\n"
63               "\tnot appear to be a Sticky atom.\n",
64               atomType->getName().c_str());
65      painCave.severity = OPENMD_ERROR;
66      painCave.isFatal = 1;
67      simError();
68    }
69    
70    DirectionalAtomType* daType = dynamic_cast<DirectionalAtomType*>(atomType);
71    GenericData* data = daType->getPropertyByName("Sticky");
72    if (data == NULL) {
73      sprintf( painCave.errMsg, "Sticky::getStickyParam could not find\n"
74               "\tSticky parameters for atomType %s.\n",
75               daType->getName().c_str());
76      painCave.severity = OPENMD_ERROR;
77      painCave.isFatal = 1;
78      simError();
79    }
80    
81    StickyParamGenericData* stickyData = dynamic_cast<StickyParamGenericData*>(data);
82    if (stickyData == NULL) {
83      sprintf( painCave.errMsg,
84               "Sticky::getStickyParam could not convert GenericData to\n"
85               "\tStickyParamGenericData for atom type %s\n",
86               daType->getName().c_str());
87      painCave.severity = OPENMD_ERROR;
88      painCave.isFatal = 1;
89      simError();          
90    }
91    
92    return stickyData->getData();
93  }
94  
57    void Sticky::initialize() {    
58      
59      ForceFieldOptions& fopts = forceField_->getForceFieldOptions();
# Line 104 | Line 66 | namespace OpenMD {
66      for (at = atomTypes->beginType(i); at != NULL;
67           at = atomTypes->nextType(i)) {
68        
69 <      if (at->isSticky() || at->isStickyPower())
70 <        addType(at);
69 >      StickyAdapter sa = StickyAdapter(at);
70 >      if (sa.isSticky()) addType(at);
71      }
72      
73      initialized_ = true;
# Line 113 | Line 75 | namespace OpenMD {
75        
76    void Sticky::addType(AtomType* atomType){
77      // add it to the map:
116    AtomTypeProperties atp = atomType->getATP();    
78      
79      pair<map<int,AtomType*>::iterator,bool> ret;    
80 <    ret = StickyMap.insert( pair<int, AtomType*>(atp.ident, atomType) );
80 >    ret = StickyMap.insert( pair<int, AtomType*>(atomType->getIdent(),
81 >                                                 atomType) );
82      if (ret.second == false) {
83        sprintf( painCave.errMsg,
84                 "Sticky already had a previous entry with ident %d\n",
85 <               atp.ident);
85 >               atomType->getIdent() );
86        painCave.severity = OPENMD_INFO;
87        painCave.isFatal = 0;
88        simError();        
89 <    }
89 >    }  
90      
91 <    RealType w0i, v0i, v0pi, rli, rui, rlpi, rupi;
130 <    
131 <    StickyParam sticky1 = getStickyParam(atomType);
91 >    StickyAdapter sticky1 = StickyAdapter(atomType);
92  
93      // Now, iterate over all known types and add to the mixing map:
94      
# Line 136 | Line 96 | namespace OpenMD {
96      for( it = StickyMap.begin(); it != StickyMap.end(); ++it) {
97        
98        AtomType* atype2 = (*it).second;
99 <    
100 <      StickyParam sticky2 = getStickyParam(atype2);
99 >      
100 >      StickyAdapter sticky2 = StickyAdapter(atype2);
101  
102        StickyInteractionData mixer;        
103            
# Line 146 | Line 106 | namespace OpenMD {
106        // Lorentz- Berthelot mixing rules (which happen to do the right thing
107        // when atomType and atype2 happen to be the same.
108        
109 <      mixer.rl   = 0.5 * ( sticky1.rl + sticky2.rl );
110 <      mixer.ru   = 0.5 * ( sticky1.ru + sticky2.ru );
111 <      mixer.rlp  = 0.5 * ( sticky1.rlp + sticky2.rlp );
112 <      mixer.rup  = 0.5 * ( sticky1.rup + sticky2.rup );
109 >      mixer.rl   = 0.5 * ( sticky1.getRl() + sticky2.getRl() );
110 >      mixer.ru   = 0.5 * ( sticky1.getRu() + sticky2.getRu() );
111 >      mixer.rlp  = 0.5 * ( sticky1.getRlp() + sticky2.getRlp() );
112 >      mixer.rup  = 0.5 * ( sticky1.getRup() + sticky2.getRup() );
113        mixer.rbig = max(mixer.ru, mixer.rup);
114 <      mixer.w0  = sqrt( sticky1.w0   * sticky2.w0  );
115 <      mixer.v0  = sqrt( sticky1.v0   * sticky2.v0  );
116 <      mixer.v0p = sqrt( sticky1.v0p  * sticky2.v0p );
117 <      mixer.isPower = atomType->isStickyPower() && atype2->isStickyPower();
114 >      mixer.w0  = sqrt( sticky1.getW0()   * sticky2.getW0()  );
115 >      mixer.v0  = sqrt( sticky1.getV0()   * sticky2.getV0()  );
116 >      mixer.v0p = sqrt( sticky1.getV0p()  * sticky2.getV0p() );
117 >      mixer.isPower = sticky1.isStickyPower() && sticky2.isStickyPower();
118  
119        CubicSpline* s = new CubicSpline();
120        s->addPoint(mixer.rl, 1.0);
# Line 331 | Line 291 | namespace OpenMD {
291            // sticky power has no w' function:
292            w = frac1 * wi * wi2 + frac2*wi + frac1*wj*wj2 + frac2*wj + v0p;
293            wp = 0.0;
294 <          dwi = frac1*3.0*wi2*dwi + frac2*dwi;
295 <          dwj = frac1*3.0*wj2*dwi + frac2*dwi;
294 >          dwi = frac1*RealType(3.0)*wi2*dwi + frac2*dwi;
295 >          dwj = frac1*RealType(3.0)*wj2*dwi + frac2*dwi;
296            dwip = V3Zero;
297            dwjp = V3Zero;
298 <          dwidu = frac1*3.0*wi2*dwidu + frac2*dwidu;
299 <          dwidu = frac1*3.0*wj2*dwjdu + frac2*dwjdu;
298 >          dwidu = frac1*RealType(3.0)*wi2*dwidu + frac2*dwidu;
299 >          dwidu = frac1*RealType(3.0)*wj2*dwjdu + frac2*dwjdu;
300            dwipdu = V3Zero;
301            dwjpdu = V3Zero;
302            sp = 0.0;
303            dspdr = 0.0;
304          }
305          
306 <        *(idat.vpair) += 0.5*(v0*s*w + v0p*sp*wp);
307 <        (*(idat.pot))[HYDROGENBONDING_FAMILY] += 0.5*(v0*s*w + v0p*sp*wp)* *(idat.sw) ;
306 >
307 >
308 >        *(idat.vpair) += RealType(0.5)*(v0*s*w + v0p*sp*wp);
309 >        (*(idat.pot))[HYDROGENBONDING_FAMILY] += RealType(0.5)*(v0*s*w + v0p*sp*wp)* *(idat.sw) ;
310          
311          // do the torques first since they are easy:
312          // remember that these are still in the body-fixed axes
313          
314 <        Vector3d ti = 0.5* *(idat.sw) *(v0*s*dwidu + v0p*sp*dwipdu);
315 <        Vector3d tj = 0.5* *(idat.sw) *(v0*s*dwjdu + v0p*sp*dwjpdu);
314 >        Vector3d ti = RealType(0.5)* *(idat.sw) *(v0*s*dwidu + v0p*sp*dwipdu);
315 >        Vector3d tj = RealType(0.5)* *(idat.sw) *(v0*s*dwjdu + v0p*sp*dwjpdu);
316          
317          // go back to lab frame using transpose of rotation matrix:
318          
# Line 369 | Line 331 | namespace OpenMD {
331          
332          // now assemble these with the radial-only terms:
333          
334 <        *(idat.f1) += 0.5 * ((v0*dsdr*w + v0p*dspdr*wp) * *(idat.d) /
335 <                             *(idat.rij)  + fii - fjj);
334 >        *(idat.f1) += RealType(0.5) * ((v0*dsdr*w + v0p*dspdr*wp) * *(idat.d) /
335 >                                       *(idat.rij)  + fii - fjj);
336          
337        }
338      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines