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

Comparing:
branches/development/src/nonbonded/EAM.cpp (file contents), Revision 1482 by gezelter, Tue Jul 27 14:55:15 2010 UTC vs.
trunk/src/nonbonded/EAM.cpp (file contents), Revision 1929 by gezelter, Mon Aug 19 13:12:00 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 50 | Line 51 | namespace OpenMD {
51  
52   namespace OpenMD {
53  
54 <  bool EAM::initialized_ = false;
55 <  RealType EAM::eamRcut_ = 0.0;
55 <  EAMMixingMethod EAM::mixMeth_ = eamJohnson;
56 <  ForceField* EAM::forceField_ = NULL;
57 <  map<int, AtomType*> EAM::EAMlist;
58 <  map<AtomType*, EAMAtomData> EAM::EAMMap;
59 <  map<pair<AtomType*, AtomType*>, EAMInteractionData> EAM::MixingMap;
60 <
54 >  EAM::EAM() : name_("EAM"), initialized_(false), forceField_(NULL),
55 >               mixMeth_(eamJohnson), eamRcut_(0.0), haveCutoffRadius_(false) {}
56    
57 <  EAM* EAM::_instance = NULL;
57 >  CubicSpline* EAM::getPhi(AtomType* atomType1, AtomType* atomType2) {  
58 >    EAMAdapter ea1 = EAMAdapter(atomType1);
59 >    EAMAdapter ea2 = EAMAdapter(atomType2);
60 >    CubicSpline* z1 = ea1.getZ();
61 >    CubicSpline* z2 = ea2.getZ();
62  
63 <  EAM* EAM::Instance() {
64 <    if (!_instance) {
65 <      _instance = new EAM();
66 <    }
67 <    return _instance;
69 <  }
70 <  
71 <  EAMParam EAM::getEAMParam(AtomType* atomType) {
72 <    
73 <    // Do sanity checking on the AtomType we were passed before
74 <    // building any data structures:
75 <    if (!atomType->isEAM()) {
76 <      sprintf( painCave.errMsg,
77 <               "EAM::getEAMParam was passed an atomType (%s) that does not\n"
78 <               "\tappear to be an embedded atom method (EAM) atom.\n",
79 <               atomType->getName().c_str());
80 <      painCave.severity = OPENMD_ERROR;
81 <      painCave.isFatal = 1;
82 <      simError();
83 <    }
84 <    
85 <    GenericData* data = atomType->getPropertyByName("EAM");
86 <    if (data == NULL) {
87 <      sprintf( painCave.errMsg, "EAM::getEAMParam could not find EAM\n"
88 <               "\tparameters for atomType %s.\n",
89 <               atomType->getName().c_str());
90 <      painCave.severity = OPENMD_ERROR;
91 <      painCave.isFatal = 1;
92 <      simError();
93 <    }
94 <    
95 <    EAMParamGenericData* eamData = dynamic_cast<EAMParamGenericData*>(data);
96 <    if (eamData == NULL) {
97 <      sprintf( painCave.errMsg,
98 <               "EAM::getEAMParam could not convert GenericData to EAMParam for\n"
99 <               "\tatom type %s\n", atomType->getName().c_str());
100 <      painCave.severity = OPENMD_ERROR;
101 <      painCave.isFatal = 1;
102 <      simError();          
103 <    }
104 <    
105 <    return eamData->getData();
106 <  }
63 >    // Thise prefactors convert the charge-charge interactions into
64 >    // kcal / mol all were computed assuming distances are measured in
65 >    // angstroms Charge-Charge, assuming charges are measured in
66 >    // electrons.  Matches value in Electrostatics.cpp
67 >    pre11_ = 332.0637778;
68  
108  CubicSpline* EAM::getZ(AtomType* atomType) {    
109    EAMParam eamParam = getEAMParam(atomType);
110    int nr = eamParam.nr;
111    RealType dr = eamParam.dr;
112    vector<RealType> rvals;
113    
114    for (int i = 0; i < nr; i++) rvals.push_back(RealType(i) * dr);
115      
116    CubicSpline* cs = new CubicSpline();
117    cs->addPoints(rvals, eamParam.Z);
118    return cs;
119  }
120
121  RealType EAM::getRcut(AtomType* atomType) {    
122    EAMParam eamParam = getEAMParam(atomType);
123    return eamParam.rcut;
124  }
125
126  CubicSpline* EAM::getRho(AtomType* atomType) {    
127    EAMParam eamParam = getEAMParam(atomType);
128    int nr = eamParam.nr;
129    RealType dr = eamParam.dr;
130    vector<RealType> rvals;
131    
132    for (int i = 0; i < nr; i++) rvals.push_back(RealType(i) * dr);
133      
134    CubicSpline* cs = new CubicSpline();
135    cs->addPoints(rvals, eamParam.rho);
136    return cs;
137  }
138
139  CubicSpline* EAM::getF(AtomType* atomType) {    
140    EAMParam eamParam = getEAMParam(atomType);
141    int nrho = eamParam.nrho;
142    RealType drho = eamParam.drho;
143    vector<RealType> rhovals;
144    vector<RealType> scaledF;
145    
146    for (int i = 0; i < nrho; i++) {
147      rhovals.push_back(RealType(i) * drho);
148      scaledF.push_back( eamParam.F[i] * 23.06054 );
149    }
150      
151    CubicSpline* cs = new CubicSpline();
152    cs->addPoints(rhovals, scaledF);
153    return cs;
154  }
155  
156  CubicSpline* EAM::getPhi(AtomType* atomType1, AtomType* atomType2) {    
157    EAMParam eamParam1 = getEAMParam(atomType1);
158    EAMParam eamParam2 = getEAMParam(atomType2);
159    CubicSpline* z1 = getZ(atomType1);
160    CubicSpline* z2 = getZ(atomType2);
161
69      // make the r grid:
70  
164
71      // we need phi out to the largest value we'll encounter in the radial space;
72      
73      RealType rmax = 0.0;
74 <    rmax = max(rmax, eamParam1.rcut);
75 <    rmax = max(rmax, eamParam1.nr * eamParam1.dr);
74 >    rmax = max(rmax, ea1.getRcut());
75 >    rmax = max(rmax, ea1.getNr() * ea1.getDr());
76  
77 <    rmax = max(rmax, eamParam2.rcut);
78 <    rmax = max(rmax, eamParam2.nr * eamParam2.dr);
77 >    rmax = max(rmax, ea2.getRcut());
78 >    rmax = max(rmax, ea2.getNr() * ea2.getDr());
79  
80      // use the smallest dr (finest grid) to build our grid:
81  
82 <    RealType dr = min(eamParam1.dr, eamParam2.dr);
82 >    RealType dr = min(ea1.getDr(), ea2.getDr());
83  
84      int nr = int(rmax/dr + 0.5);
85  
# Line 189 | Line 95 | namespace OpenMD {
95  
96      phivals.push_back(0.0);
97  
98 <    for (int i = 1; i < rvals.size(); i++ ) {
98 >    for (unsigned int i = 1; i < rvals.size(); i++ ) {
99        r = rvals[i];
100  
101 <      // only use z(r) if we're inside this atoms cutoff radius, otherwise, we'll use zero for the charge.
102 <      // This effectively means that our phi grid goes out beyond the cutoff of the pair potential
101 >      // only use z(r) if we're inside this atom's cutoff radius,
102 >      // otherwise, we'll use zero for the charge.  This effectively
103 >      // means that our phi grid goes out beyond the cutoff of the
104 >      // pair potential
105  
106 <      zi = r <= eamParam1.rcut ? z1->getValueAt(r) : 0.0;
107 <      zj = r <= eamParam2.rcut ? z2->getValueAt(r) : 0.0;
106 >      zi = r <= ea1.getRcut() ? z1->getValueAt(r) : 0.0;
107 >      zj = r <= ea2.getRcut() ? z2->getValueAt(r) : 0.0;
108  
109 <      phi = 331.999296 * (zi * zj) / r;
109 >      phi = pre11_ * (zi * zj) / r;
110  
111        phivals.push_back(phi);
112      }
# Line 208 | Line 116 | namespace OpenMD {
116      return cs;
117    }
118  
119 <  void EAM::initialize() {
119 >  void EAM::setCutoffRadius( RealType rCut ) {
120 >    eamRcut_ = rCut;
121 >    haveCutoffRadius_ = true;
122 >  }
123  
124 +  void EAM::initialize() {
125      // set up the mixing method:
126      ForceFieldOptions& fopts = forceField_->getForceFieldOptions();
127      string EAMMixMeth = fopts.getEAMMixingMethod();
# Line 223 | Line 135 | namespace OpenMD {
135        mixMeth_ = eamUnknown;
136        
137      // find all of the EAM atom Types:
138 <    ForceField::AtomTypeContainer* atomTypes = forceField_->getAtomTypes();
139 <    ForceField::AtomTypeContainer::MapTypeIterator i;
140 <    AtomType* at;
138 >    EAMtypes.clear();
139 >    EAMtids.clear();
140 >    EAMdata.clear();
141 >    MixingMap.clear();
142 >    nEAM_ = 0;
143 >    
144 >    EAMtids.resize( forceField_->getNAtomType(), -1);
145  
146 <    for (at = atomTypes->beginType(i); at != NULL;
147 <         at = atomTypes->nextType(i)) {
148 <      
233 <      if (at->isEAM())
234 <        addType(at);
146 >    set<AtomType*>::iterator at;
147 >    for (at = simTypes_.begin(); at != simTypes_.end(); ++at) {
148 >      if ((*at)->isEAM()) nEAM_++;
149      }
150 +    EAMdata.resize(nEAM_);
151 +    MixingMap.resize(nEAM_);
152 +
153 +    for (at = simTypes_.begin(); at != simTypes_.end(); ++at) {
154 +      if ((*at)->isEAM()) addType(*at);
155 +    }
156      
157      // find all of the explicit EAM interactions (setfl):
158      ForceField::NonBondedInteractionTypeContainer* nbiTypes = forceField_->getNonBondedInteractionTypes();
# Line 285 | Line 205 | namespace OpenMD {
205  
206    void EAM::addType(AtomType* atomType){
207  
208 +    EAMAdapter ea = EAMAdapter(atomType);
209      EAMAtomData eamAtomData;
289    
290    eamAtomData.rho = getRho(atomType);
291    eamAtomData.F = getF(atomType);
292    eamAtomData.Z = getZ(atomType);
293    eamAtomData.rcut = getRcut(atomType);
210  
211 +    eamAtomData.rho = ea.getRho();
212 +    eamAtomData.F = ea.getF();
213 +    eamAtomData.Z = ea.getZ();
214 +    eamAtomData.rcut = ea.getRcut();
215 +      
216      // add it to the map:
217 <    AtomTypeProperties atp = atomType->getATP();    
217 >    int atid = atomType->getIdent();
218 >    int eamtid = EAMtypes.size();
219  
220 <    pair<map<int,AtomType*>::iterator,bool> ret;    
221 <    ret = EAMlist.insert( pair<int, AtomType*>(atp.ident, atomType) );
220 >    pair<set<int>::iterator,bool> ret;    
221 >    ret = EAMtypes.insert( atid );
222      if (ret.second == false) {
223        sprintf( painCave.errMsg,
224                 "EAM already had a previous entry with ident %d\n",
225 <               atp.ident);
225 >               atid);
226        painCave.severity = OPENMD_INFO;
227        painCave.isFatal = 0;
228        simError();        
229      }
230  
231 <    EAMMap[atomType] = eamAtomData;
231 >
232 >    EAMtids[atid] = eamtid;
233 >    EAMdata[eamtid] = eamAtomData;
234 >    MixingMap[eamtid].resize(nEAM_);
235      
236      // Now, iterate over all known types and add to the mixing map:
237      
238 <    map<AtomType*, EAMAtomData>::iterator it;
239 <    for( it = EAMMap.begin(); it != EAMMap.end(); ++it) {
238 >    std::set<int>::iterator it;
239 >    for( it = EAMtypes.begin(); it != EAMtypes.end(); ++it) {
240        
241 <      AtomType* atype2 = (*it).first;
241 >      int eamtid2 = EAMtids[ (*it) ];
242 >      AtomType* atype2 = forceField_->getAtomType( (*it) );
243  
244        EAMInteractionData mixer;
245        mixer.phi = getPhi(atomType, atype2);
246 +      mixer.rcut = mixer.phi->getLimits().second;
247        mixer.explicitlySet = false;
248  
249 <      pair<AtomType*, AtomType*> key1, key2;
323 <      key1 = make_pair(atomType, atype2);
324 <      key2 = make_pair(atype2, atomType);
249 >      MixingMap[eamtid2].resize( nEAM_ );
250        
251 <      MixingMap[key1] = mixer;
252 <      if (key2 != key1) {
253 <        MixingMap[key2] = mixer;
251 >      MixingMap[eamtid][eamtid2] = mixer;
252 >      if (eamtid2 != eamtid) {
253 >        MixingMap[eamtid2][eamtid] = mixer;
254        }
255      }      
256      return;
# Line 347 | Line 272 | namespace OpenMD {
272  
273      cs->addPoints(rVals, phiVals);
274      mixer.phi = cs;
275 +    mixer.rcut = mixer.phi->getLimits().second;
276      mixer.explicitlySet = true;
277  
278 <    pair<AtomType*, AtomType*> key1, key2;
279 <    key1 = make_pair(atype1, atype2);
354 <    key2 = make_pair(atype2, atype1);
278 >    int eamtid1 = EAMtids[ atype1->getIdent() ];
279 >    int eamtid2 = EAMtids[ atype2->getIdent() ];
280      
281 <    MixingMap[key1] = mixer;
282 <    if (key2 != key1) {
283 <      MixingMap[key2] = mixer;
281 >    MixingMap[eamtid1][eamtid2] = mixer;
282 >    if (eamtid2 != eamtid1) {
283 >      MixingMap[eamtid2][eamtid1] = mixer;
284      }    
285      return;
286    }
287  
288 <  void EAM::calcDensity(AtomType* at1, AtomType* at2, const RealType rij,
364 <                        RealType &rho_i_at_j, RealType &rho_j_at_i) {
288 >  void EAM::calcDensity(InteractionData &idat) {
289      
290      if (!initialized_) initialize();
291      
292 <    EAMAtomData data1 = EAMMap[at1];
293 <    EAMAtomData data2 = EAMMap[at2];
292 >    EAMAtomData &data1 = EAMdata[EAMtids[idat.atid1]];
293 >    EAMAtomData &data2 = EAMdata[EAMtids[idat.atid2]];
294  
295 <    if (rij < data1.rcut) rho_i_at_j = data1.rho->getValueAt(rij);
296 <    if (rij < data2.rcut) rho_j_at_i = data2.rho->getValueAt(rij);
297 <    return;
295 >    if (haveCutoffRadius_)
296 >      if ( *(idat.rij) > eamRcut_) return;
297 >    
298 >    if ( *(idat.rij) < data1.rcut) {
299 >      *(idat.rho2) += data1.rho->getValueAt( *(idat.rij));
300 >    }
301 >      
302 >    if ( *(idat.rij) < data2.rcut) {
303 >      *(idat.rho1) += data2.rho->getValueAt( *(idat.rij));
304 >    }
305 >    
306 >    return;  
307    }
308 <
309 <  void EAM::calcFunctional(AtomType* at1, RealType rho, RealType &frho,
310 <                           RealType &dfrhodrho) {
378 <
308 >  
309 >  void EAM::calcFunctional(SelfData &sdat) {
310 >    
311      if (!initialized_) initialize();
312  
313 <    EAMAtomData data1 = EAMMap[at1];
314 <        
315 <    pair<RealType, RealType> result = data1.F->getValueAndDerivativeAt(rho);
313 >    EAMAtomData &data1 = EAMdata[ EAMtids[sdat.atid] ];
314 >            
315 >    data1.F->getValueAndDerivativeAt( *(sdat.rho), *(sdat.frho), *(sdat.dfrhodrho) );
316  
317 <    frho = result.first;
318 <    dfrhodrho = result.second;
317 >    (*(sdat.pot))[METALLIC_FAMILY] += *(sdat.frho);
318 >    if (sdat.doParticlePot) {
319 >      *(sdat.particlePot) += *(sdat.frho);
320 >    }
321 >
322      return;
323    }
324  
325  
326 <  void EAM::calcForce(AtomType* at1, AtomType* at2, Vector3d d,
392 <                      RealType rij, RealType r2, RealType sw,
393 <                      RealType &vpair, RealType &pot, Vector3d &f1,
394 <                      RealType rho_i, RealType rho_j,
395 <                      RealType dfrhodrho_i, RealType dfrhodrho_j,
396 <                      RealType &fshift_i, RealType &fshift_j) {
326 >  void EAM::calcForce(InteractionData &idat) {
327  
328      if (!initialized_) initialize();
329  
330 <    pair<RealType, RealType> res;
331 <    
332 <    if (rij < eamRcut_) {
330 >    if (haveCutoffRadius_)
331 >      if ( *(idat.rij) > eamRcut_) return;
332 >  
333  
334 <      EAMAtomData data1 = EAMMap[at1];
335 <      EAMAtomData data2 = EAMMap[at2];
336 <
337 <      // get type-specific cutoff radii
338 <
339 <      RealType rci = data1.rcut;
340 <      RealType rcj = data2.rcut;
334 >    int eamtid1 = EAMtids[idat.atid1];
335 >    int eamtid2 = EAMtids[idat.atid2];
336 >    
337 >    EAMAtomData &data1 = EAMdata[eamtid1];
338 >    EAMAtomData &data2 = EAMdata[eamtid2];
339 >    
340 >    // get type-specific cutoff radii
341 >    
342 >    RealType rci = data1.rcut;
343 >    RealType rcj = data2.rcut;
344 >    
345 >    RealType rha(0.0), drha(0.0), rhb(0.0), drhb(0.0);
346 >    RealType pha(0.0), dpha(0.0), phb(0.0), dphb(0.0);
347 >    RealType phab(0.0), dvpdr(0.0);
348 >    RealType drhoidr, drhojdr, dudr;
349 >    
350 >    if ( *(idat.rij) < rci) {
351 >      data1.rho->getValueAndDerivativeAt( *(idat.rij), rha, drha);
352 >      CubicSpline* phi = MixingMap[eamtid1][eamtid1].phi;
353 >      phi->getValueAndDerivativeAt( *(idat.rij), pha, dpha);
354 >    }
355 >    
356 >    if ( *(idat.rij) < rcj) {
357 >      data2.rho->getValueAndDerivativeAt( *(idat.rij), rhb, drhb );
358 >      CubicSpline* phi = MixingMap[eamtid2][eamtid2].phi;
359 >      phi->getValueAndDerivativeAt( *(idat.rij), phb, dphb);
360 >    }
361 >
362 >    switch(mixMeth_) {
363 >    case eamJohnson:
364        
365 <      RealType rha, drha, rhb, drhb;
366 <      RealType pha, dpha, phb, dphb;
367 <      RealType phab, dvpdr;
368 <      RealType drhoidr, drhojdr, dudr;
365 >      if ( *(idat.rij) < rci) {
366 >        phab = phab + 0.5 * (rhb / rha) * pha;
367 >        dvpdr = dvpdr + 0.5*((rhb/rha)*dpha +
368 >                             pha*((drhb/rha) - (rhb*drha/rha/rha)));
369 >      }
370        
371 <      if (rij < rci) {
372 <        res = data1.rho->getValueAndDerivativeAt(rij);
373 <        rha = res.first;
374 <        drha = res.second;
375 <
376 <        res = MixingMap[make_pair(at1, at1)].phi->getValueAndDerivativeAt(rij);
423 <        pha = res.first;
424 <        dpha = res.second;
371 >      
372 >      
373 >      if ( *(idat.rij) < rcj) {
374 >        phab = phab + 0.5 * (rha / rhb) * phb;
375 >        dvpdr = dvpdr + 0.5 * ((rha/rhb)*dphb +
376 >                               phb*((drha/rhb) - (rha*drhb/rhb/rhb)));
377        }
378 <
379 <      if (rij < rcj) {
380 <        res = data2.rho->getValueAndDerivativeAt(rij);
381 <        rhb = res.first;
382 <        drhb = res.second;
383 <
384 <        res = MixingMap[make_pair(at2, at2)].phi->getValueAndDerivativeAt(rij);
385 <        phb = res.first;
434 <        dphb = res.second;
378 >      
379 >      break;
380 >      
381 >    case eamDaw:
382 >      
383 >      if ( *(idat.rij) <  MixingMap[eamtid1][eamtid2].rcut) {
384 >        MixingMap[eamtid1][eamtid2].phi->getValueAndDerivativeAt( *(idat.rij),
385 >                                                                  phab, dvpdr);
386        }
436
437      phab = 0.0;
438      dvpdr = 0.0;
439
440      switch(mixMeth_) {
441      case eamJohnson:
442      
443        if (rij < rci) {
444          phab = phab + 0.5 * (rhb / rha) * pha;
445          dvpdr = dvpdr + 0.5*((rhb/rha)*dpha +
446                               pha*((drhb/rha) - (rhb*drha/rha/rha)));
447        }
448
449        if (rij < rcj) {
450          phab = phab + 0.5 * (rha / rhb) * phb;
451          dvpdr = dvpdr + 0.5 * ((rha/rhb)*dphb +
452                                 phb*((drha/rhb) - (rha*drhb/rhb/rhb)));
453        }
454
455        break;
456
457      case eamDaw:
458        res = MixingMap[make_pair(at1,at2)].phi->getValueAndDerivativeAt(rij);
459        phab = res.first;
460        dvpdr = res.second;
461
462        break;
463      case eamUnknown:
464      default:
465
466        sprintf(painCave.errMsg,
467                "EAM::calcForce hit a mixing method it doesn't know about!\n"
468                );
469        painCave.severity = OPENMD_ERROR;
470        painCave.isFatal = 1;
471        simError();        
472          
473      }
387        
388 <      drhoidr = drha;
389 <      drhojdr = drhb;
388 >      break;
389 >    case eamUnknown:
390 >    default:
391 >      
392 >      sprintf(painCave.errMsg,
393 >              "EAM::calcForce hit a mixing method it doesn't know about!\n"
394 >              );
395 >      painCave.severity = OPENMD_ERROR;
396 >      painCave.isFatal = 1;
397 >      simError();        
398 >      
399 >    }
400 >    
401 >    drhoidr = drha;
402 >    drhojdr = drhb;
403 >    
404 >    dudr = drhojdr* *(idat.dfrho1) + drhoidr* *(idat.dfrho2) + dvpdr;
405 >    
406 >    *(idat.f1) += *(idat.d) * dudr / *(idat.rij);
407  
478      dudr = drhojdr*dfrhodrho_i + drhoidr*dfrhodrho_j + dvpdr;
479
480      f1 = d * dudr / rij;
408          
409 <      // particle_pot is the difference between the full potential
410 <      // and the full potential without the presence of a particular
409 >    if (idat.doParticlePot) {
410 >      // particlePot is the difference between the full potential and
411 >      // the full potential without the presence of a particular
412        // particle (atom1).
413        //
414 <      // This reduces the density at other particle locations, so
415 <      // we need to recompute the density at atom2 assuming atom1
416 <      // didn't contribute.  This then requires recomputing the
417 <      // density functional for atom2 as well.
418 <      //
419 <      // Most of the particle_pot heavy lifting comes from the
420 <      // pair interaction, and will be handled by vpair.
421 <    
422 <      fshift_i = data1.F->getValueAt( rho_i - rhb );
423 <      fshift_j = data1.F->getValueAt( rho_j - rha );
496 <
497 <      pot += phab;
498 <
499 <      vpair += phab;
414 >      // This reduces the density at other particle locations, so we
415 >      // need to recompute the density at atom2 assuming atom1 didn't
416 >      // contribute.  This then requires recomputing the density
417 >      // functional for atom2 as well.
418 >      
419 >      *(idat.particlePot1) += data2.F->getValueAt( *(idat.rho2) - rha )
420 >        - *(idat.frho2);
421 >      
422 >      *(idat.particlePot2) += data1.F->getValueAt( *(idat.rho1) - rhb)
423 >        - *(idat.frho1);
424      }
501
502    return;
425      
426 <  }
505 <
506 <
507 <  void EAM::calc_eam_prepair_rho(int *atid1, int *atid2, RealType *rij,
508 <                                 RealType* rho_i_at_j, RealType* rho_j_at_i){
509 <
510 <    if (!initialized_) initialize();
426 >    (*(idat.pot))[METALLIC_FAMILY] += phab;
427      
428 <    AtomType* atype1 = EAMlist[*atid1];
429 <    AtomType* atype2 = EAMlist[*atid2];
428 >    *(idat.vpair) += phab;
429 >  
430 >    return;
431      
515    calcDensity(atype1, atype2, *rij, *rho_i_at_j, *rho_j_at_i);
516
517    return;    
432    }
433  
434 <  void EAM::calc_eam_preforce_Frho(int *atid1, RealType *rho, RealType *frho,
435 <                                   RealType *dfrhodrho) {
434 >  RealType EAM::getSuggestedCutoffRadius(pair<AtomType*, AtomType*> atypes) {
435 >    if (!initialized_) initialize();  
436  
437 <    if (!initialized_) initialize();
437 >    RealType cut = 0.0;
438  
439 <    AtomType* atype1 = EAMlist[*atid1];  
440 <
441 <    calcFunctional(atype1, *rho, *frho, *dfrhodrho);
439 >    int atid1 = atypes.first->getIdent();
440 >    int atid2 = atypes.second->getIdent();
441 >    int eamtid1 = EAMtids[atid1];
442 >    int eamtid2 = EAMtids[atid2];
443      
444 <    return;    
445 <  }
446 <  RealType EAM::getEAMcut(int *atid1) {
444 >    if (eamtid1 != -1) {
445 >      EAMAtomData data1 = EAMdata[eamtid1];
446 >      cut = data1.rcut;
447 >    }
448  
449 <    if (!initialized_) initialize();
449 >    if (eamtid2 != -1) {
450 >      EAMAtomData data2 = EAMdata[eamtid2];
451 >      if (data2.rcut > cut)
452 >        cut = data2.rcut;
453 >    }
454      
455 <    AtomType* atype1 = EAMlist[*atid1];  
536 <      
537 <    return getRcut(atype1);
455 >    return cut;
456    }
539
540  void EAM::do_eam_pair(int *atid1, int *atid2, RealType *d, RealType *rij,
541                        RealType *r2, RealType *sw, RealType *vpair,
542                        RealType *pot, RealType *f1, RealType *rho1,
543                        RealType *rho2, RealType *dfrho1, RealType *dfrho2,
544                        RealType *fshift1, RealType *fshift2) {
545
546    if (!initialized_) initialize();
547    
548    AtomType* atype1 = EAMlist[*atid1];
549    AtomType* atype2 = EAMlist[*atid2];
550    
551    Vector3d disp(d[0], d[1], d[2]);
552    Vector3d frc(f1[0], f1[1], f1[2]);
553    
554    calcForce(atype1, atype2, disp, *rij, *r2, *sw, *vpair,  *pot, frc,
555              *rho1, *rho2, *dfrho1, *dfrho2, *fshift1, *fshift2);
556      
557    f1[0] = frc.x();
558    f1[1] = frc.y();
559    f1[2] = frc.z();
560
561    return;    
562  }
563  
564  void EAM::setCutoffEAM(RealType *thisRcut) {
565    eamRcut_ = *thisRcut;
566  }
457   }
458  
569 extern "C" {
570  
571 #define fortranCalcDensity FC_FUNC(calc_eam_prepair_rho, CALC_EAM_PREPAIR_RHO)
572 #define fortranCalcFunctional FC_FUNC(calc_eam_preforce_frho, CALC_EAM_PREFORCE_FRHO)
573 #define fortranCalcForce FC_FUNC(do_eam_pair, DO_EAM_PAIR)
574 #define fortranSetCutoffEAM FC_FUNC(setcutoffeam, SETCUTOFFEAM)
575 #define fortranGetEAMcut FC_FUNC(geteamcut, GETEAMCUT)
576
577  
578  void fortranCalcDensity(int *atid1, int *atid2, RealType *rij,
579                          RealType *rho_i_at_j, RealType *rho_j_at_i) {
580    
581    return OpenMD::EAM::Instance()->calc_eam_prepair_rho(atid1, atid2, rij,
582                                                         rho_i_at_j,  
583                                                         rho_j_at_i);
584  }
585  void fortranCalcFunctional(int *atid1, RealType *rho, RealType *frho,
586                             RealType *dfrhodrho) {  
587    
588    return OpenMD::EAM::Instance()->calc_eam_preforce_Frho(atid1, rho, frho,
589                                                           dfrhodrho);
590    
591  }
592  void fortranSetCutoffEAM(RealType *rcut) {
593    return OpenMD::EAM::Instance()->setCutoffEAM(rcut);
594  }
595  void fortranCalcForce(int *atid1, int *atid2, RealType *d, RealType *rij,
596                        RealType *r2, RealType *sw, RealType *vpair,
597                        RealType *pot, RealType *f1, RealType *rho1,
598                        RealType *rho2, RealType *dfrho1, RealType *dfrho2,
599                        RealType *fshift1, RealType *fshift2){
600    
601    return OpenMD::EAM::Instance()->do_eam_pair(atid1, atid2, d, rij,
602                                                r2, sw, vpair,
603                                                pot, f1, rho1,
604                                                rho2, dfrho1, dfrho2,
605                                                fshift1,  fshift2);
606  }
607  RealType fortranGetEAMcut(int* atid) {
608    return OpenMD::EAM::Instance()->getEAMcut(atid);
609  }
610
611 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines