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

Comparing branches/development/src/nonbonded/SC.cpp (file contents):
Revision 1505 by gezelter, Sun Oct 3 22:18:59 2010 UTC vs.
Revision 1868 by gezelter, Tue Apr 30 15:56:54 2013 UTC

# Line 35 | Line 35
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).                        
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
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 <stdio.h>
# Line 53 | Line 54 | namespace OpenMD {
54    SC::SC() : name_("SC"), initialized_(false), forceField_(NULL),
55               scRcut_(0.0), np_(3000) {}
56    
57 <  SCParam SC::getSCParam(AtomType* atomType) {
58 <    
59 <    // Do sanity checking on the AtomType we were passed before
60 <    // building any data structures:
61 <    if (!atomType->isSC()) {
62 <      sprintf( painCave.errMsg,
63 <               "SC::getSCParam was passed an atomType (%s) that does not\n"
64 <               "\tappear to be a Sutton-Chen (SC) atom.\n",
64 <               atomType->getName().c_str());
65 <      painCave.severity = OPENMD_ERROR;
66 <      painCave.isFatal = 1;
67 <      simError();
57 >  SC::~SC() {
58 >    initialized_ = false;
59 >
60 >    map<pair<AtomType*, AtomType*>, SCInteractionData>::iterator it;
61 >    for (it = MixingMap.begin(); it != MixingMap.end(); ++it) {
62 >      SCInteractionData mixer = (*it).second;
63 >      delete mixer.V;
64 >      delete mixer.phi;
65      }
69    
70    GenericData* data = atomType->getPropertyByName("SC");
71    if (data == NULL) {
72      sprintf( painCave.errMsg, "SC::getSCParam could not find SC\n"
73               "\tparameters for atomType %s.\n",
74               atomType->getName().c_str());
75      painCave.severity = OPENMD_ERROR;
76      painCave.isFatal = 1;
77      simError();
78    }
79    
80    SCParamGenericData* scData = dynamic_cast<SCParamGenericData*>(data);
81    if (scData == NULL) {
82      sprintf( painCave.errMsg,
83               "SC::getSCParam could not convert GenericData to SCParamGenericData\n"
84               "\tfor atom type %s\n", atomType->getName().c_str());
85      painCave.severity = OPENMD_ERROR;
86      painCave.isFatal = 1;
87      simError();          
88    }
89    
90    return scData->getData();
91  }
66  
67 <  RealType SC::getC(AtomType* atomType) {    
68 <    SCParam scParam = getSCParam(atomType);
69 <    return scParam.c;
67 >    MixingMap.clear();
68 >    SCMap.clear();
69 >    SClist.clear();
70    }
71 <
98 <  RealType SC::getM(AtomType* atomType) {    
99 <    SCParam scParam = getSCParam(atomType);
100 <    return scParam.m;
101 <  }
102 <
71 >        
72    RealType SC::getM(AtomType* atomType1, AtomType* atomType2) {    
73 <    RealType m1 = getM(atomType1);
74 <    RealType m2 = getM(atomType2);
73 >    SuttonChenAdapter sca1 = SuttonChenAdapter(atomType1);
74 >    SuttonChenAdapter sca2 = SuttonChenAdapter(atomType2);
75 >    RealType m1 = sca1.getM();
76 >    RealType m2 = sca2.getM();
77      return 0.5 * (m1 + m2);
78    }
79  
109  RealType SC::getN(AtomType* atomType) {    
110    SCParam scParam = getSCParam(atomType);
111    return scParam.n;
112  }
113
80    RealType SC::getN(AtomType* atomType1, AtomType* atomType2) {    
81 <    RealType n1 = getN(atomType1);
82 <    RealType n2 = getN(atomType2);
81 >    SuttonChenAdapter sca1 = SuttonChenAdapter(atomType1);
82 >    SuttonChenAdapter sca2 = SuttonChenAdapter(atomType2);
83 >    RealType n1 = sca1.getN();
84 >    RealType n2 = sca2.getN();
85      return 0.5 * (n1 + n2);
86    }
87  
120  RealType SC::getAlpha(AtomType* atomType) {    
121    SCParam scParam = getSCParam(atomType);
122    return scParam.alpha;
123  }
124
88    RealType SC::getAlpha(AtomType* atomType1, AtomType* atomType2) {    
89 <    RealType alpha1 = getAlpha(atomType1);
90 <    RealType alpha2 = getAlpha(atomType2);
89 >    SuttonChenAdapter sca1 = SuttonChenAdapter(atomType1);
90 >    SuttonChenAdapter sca2 = SuttonChenAdapter(atomType2);
91 >    RealType alpha1 = sca1.getAlpha();
92 >    RealType alpha2 = sca2.getAlpha();
93  
94      ForceFieldOptions& fopts = forceField_->getForceFieldOptions();
95      std::string DistanceMix = fopts.getDistanceMixingRule();
# Line 136 | Line 101 | namespace OpenMD {
101        return 0.5 * (alpha1 + alpha2);
102    }
103  
104 <  RealType SC::getEpsilon(AtomType* atomType) {    
105 <    SCParam scParam = getSCParam(atomType);
106 <    return scParam.epsilon;
107 <  }
108 <
144 <  RealType SC::getEpsilon(AtomType* atomType1, AtomType* atomType2) {    
145 <    RealType epsilon1 = getEpsilon(atomType1);
146 <    RealType epsilon2 = getEpsilon(atomType2);
104 >  RealType SC::getEpsilon(AtomType* atomType1, AtomType* atomType2) {  
105 >    SuttonChenAdapter sca1 = SuttonChenAdapter(atomType1);
106 >    SuttonChenAdapter sca2 = SuttonChenAdapter(atomType2);
107 >    RealType epsilon1 = sca1.getEpsilon();
108 >    RealType epsilon2 = sca2.getEpsilon();
109      return sqrt(epsilon1 * epsilon2);
110    }
111  
# Line 155 | Line 117 | namespace OpenMD {
117  
118      for (at = atomTypes->beginType(i); at != NULL;
119           at = atomTypes->nextType(i)) {
120 <      if (at->isSC())
120 >      SuttonChenAdapter sca = SuttonChenAdapter(at);
121 >      if (sca.isSuttonChen())
122          addType(at);
123      }    
124      initialized_ = true;
# Line 165 | Line 128 | namespace OpenMD {
128  
129    void SC::addType(AtomType* atomType){
130  
131 +    SuttonChenAdapter sca = SuttonChenAdapter(atomType);
132      SCAtomData scAtomData;
133      
134 <    scAtomData.c = getC(atomType);
135 <    scAtomData.m = getM(atomType);
136 <    scAtomData.n = getN(atomType);
137 <    scAtomData.alpha = getAlpha(atomType);
138 <    scAtomData.epsilon = getEpsilon(atomType);
134 >    scAtomData.c = sca.getC();
135 >    scAtomData.m = sca.getM();
136 >    scAtomData.n = sca.getN();
137 >    scAtomData.alpha = sca.getAlpha();
138 >    scAtomData.epsilon = sca.getEpsilon();
139      scAtomData.rCut = 2.0 * scAtomData.alpha;
140  
141      // add it to the map:
178    AtomTypeProperties atp = atomType->getATP();    
142  
143      pair<map<int,AtomType*>::iterator,bool> ret;    
144 <    ret = SClist.insert( pair<int, AtomType*>(atp.ident, atomType) );
144 >    ret = SClist.insert( pair<int, AtomType*>(atomType->getIdent(), atomType) );
145      if (ret.second == false) {
146        sprintf( painCave.errMsg,
147                 "SC already had a previous entry with ident %d\n",
148 <               atp.ident);
148 >               atomType->getIdent() );
149        painCave.severity = OPENMD_INFO;
150        painCave.isFatal = 0;
151        simError();        
# Line 302 | Line 265 | namespace OpenMD {
265      return;
266    }
267  
268 <  void SC::calcDensity(DensityData ddat) {
268 >  void SC::calcDensity(InteractionData &idat) {
269      
270      if (!initialized_) initialize();
271      
272 <    SCInteractionData mixer = MixingMap[make_pair(ddat.atype1, ddat.atype2)];
272 >    SCInteractionData mixer = MixingMap[ idat.atypes ];
273  
274      RealType rcij = mixer.rCut;
275  
276 <    if (ddat.rij < rcij) {
277 <      ddat.rho_i_at_j = mixer.phi->getValueAt(ddat.rij);
278 <      ddat.rho_j_at_i = ddat.rho_i_at_j;
279 <    } else {
280 <      ddat.rho_i_at_j = 0.0;
281 <      ddat.rho_j_at_i = 0.0;
319 <    }
320 <
276 >    if ( *(idat.rij)  < rcij) {
277 >      RealType rho = mixer.phi->getValueAt( *(idat.rij) );
278 >      *(idat.rho1) += rho;
279 >      *(idat.rho2) += rho;
280 >    }
281 >    
282      return;
283    }
284  
285 <  void SC::calcFunctional(FunctionalData fdat) {
285 >  void SC::calcFunctional(SelfData &sdat) {
286  
287      if (!initialized_) initialize();
288  
289 <    SCAtomData data1 = SCMap[fdat.atype];
290 <    
291 <    fdat.frho = - data1.c * data1.epsilon * sqrt(fdat.rho);
292 <    fdat.dfrhodrho = 0.5 * fdat.frho / fdat.rho;
293 <    
289 >    SCAtomData data1 = SCMap[sdat.atype];
290 >  
291 >    RealType u = - data1.c * data1.epsilon * sqrt( *(sdat.rho) );
292 >    *(sdat.frho) = u;
293 >    *(sdat.dfrhodrho) = 0.5 * *(sdat.frho) / *(sdat.rho);
294 >
295 >    (*(sdat.pot))[METALLIC_FAMILY] += u;
296 >    if (sdat.doParticlePot) {
297 >      *(sdat.particlePot) += u;
298 >    }
299 >
300      return;
301    }
302    
303  
304 <  void SC::calcForce(InteractionData idat) {
304 >  void SC::calcForce(InteractionData &idat) {
305      
306      if (!initialized_) initialize();
307      
308 <    SCAtomData data1 = SCMap[idat.atype1];
309 <    SCAtomData data2 = SCMap[idat.atype2];
308 >    SCAtomData data1 = SCMap[idat.atypes.first];
309 >    SCAtomData data2 = SCMap[idat.atypes.second];
310  
311 <    SCInteractionData mixer = MixingMap[make_pair(idat.atype1, idat.atype2)];
311 >    SCInteractionData mixer = MixingMap[idat.atypes];
312  
313      RealType rcij = mixer.rCut;
314  
315 <    if (idat.rij < rcij) {
315 >    if ( *(idat.rij)  < rcij) {
316        RealType vcij = mixer.vCut;
317        
318        pair<RealType, RealType> res;
319        
320 <      res = mixer.phi->getValueAndDerivativeAt(idat.rij);
320 >      res = mixer.phi->getValueAndDerivativeAt( *(idat.rij) );
321        RealType rhtmp = res.first;
322        RealType drhodr = res.second;
323        
324 <      res = mixer.V->getValueAndDerivativeAt(idat.rij);
324 >      res = mixer.V->getValueAndDerivativeAt( *(idat.rij) );
325        RealType vptmp = res.first;
326        RealType dvpdr = res.second;
327        
328        RealType pot_temp = vptmp - vcij;
329 <      idat.vpair += pot_temp;
329 >      *(idat.vpair) += pot_temp;
330        
331 <      RealType dudr = drhodr * (idat.dfrho1 + idat.dfrho2) + dvpdr;
331 >      RealType dudr = drhodr * ( *(idat.dfrho1) + *(idat.dfrho2) ) + dvpdr;
332        
333 <      idat.f1 += idat.d * dudr / idat.rij;
333 >      *(idat.f1) += *(idat.d) * dudr / *(idat.rij) ;
334          
335 <      // particle_pot is the difference between the full potential
336 <      // and the full potential without the presence of a particular
337 <      // particle (atom1).
338 <      //
339 <      // This reduces the density at other particle locations, so
340 <      // we need to recompute the density at atom2 assuming atom1
341 <      // didn't contribute.  This then requires recomputing the
342 <      // density functional for atom2 as well.
343 <      //
344 <      // Most of the particle_pot heavy lifting comes from the
345 <      // pair interaction, and will be handled by vpair.
335 >      if (idat.doParticlePot) {
336 >        // particlePot is the difference between the full potential and
337 >        // the full potential without the presence of a particular
338 >        // particle (atom1).
339 >        //
340 >        // This reduces the density at other particle locations, so we
341 >        // need to recompute the density at atom2 assuming atom1 didn't
342 >        // contribute.  This then requires recomputing the density
343 >        // functional for atom2 as well.
344 >        
345 >        *(idat.particlePot1) -= data2.c * data2.epsilon *
346 >          sqrt( *(idat.rho2) - rhtmp) + *(idat.frho2);
347 >
348 >        *(idat.particlePot2) -= data1.c * data1.epsilon *
349 >          sqrt( *(idat.rho1) - rhtmp) + *(idat.frho1);
350 >      }
351        
352 <      idat.fshift1 = - data1.c * data1.epsilon * sqrt(idat.rho1 - rhtmp);
381 <      idat.fshift2 = - data2.c * data2.epsilon * sqrt(idat.rho2 - rhtmp);
382 <      
383 <      idat.pot += pot_temp;
352 >      (*(idat.pot))[METALLIC_FAMILY] += pot_temp;
353      }
354        
355      return;    
356    }
357  
358 <  RealType SC::getSuggestedCutoffRadius(AtomType* at1, AtomType* at2) {
358 >  RealType SC::getSuggestedCutoffRadius(pair<AtomType*, AtomType*> atypes) {
359      if (!initialized_) initialize();  
360 <    pair<AtomType*, AtomType*> key = make_pair(at1, at2);
360 >
361      map<pair<AtomType*, AtomType*>, SCInteractionData>::iterator it;
362 <    it = MixingMap.find(key);
362 >    it = MixingMap.find(atypes);
363      if (it == MixingMap.end())
364        return 0.0;
365      else  {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines