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

Comparing branches/development/src/nonbonded/Electrostatic.cpp (file contents):
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1718 by gezelter, Thu May 24 01:29:59 2012 UTC

# Line 47 | Line 47
47   #include "nonbonded/Electrostatic.hpp"
48   #include "utils/simError.h"
49   #include "types/NonBondedInteractionType.hpp"
50 < #include "types/DirectionalAtomType.hpp"
50 > #include "types/FixedChargeAdapter.hpp"
51 > #include "types/MultipoleAdapter.hpp"
52   #include "io/Globals.hpp"
53 + #include "nonbonded/SlaterIntegrals.hpp"
54 + #include "utils/PhysicalConstants.hpp"
55  
56 +
57   namespace OpenMD {
58    
59    Electrostatic::Electrostatic(): name_("Electrostatic"), initialized_(false),
# Line 280 | Line 284 | namespace OpenMD {
284      electrostaticAtomData.is_SplitDipole = false;
285      electrostaticAtomData.is_Quadrupole = false;
286  
287 <    if (atomType->isCharge()) {
284 <      GenericData* data = atomType->getPropertyByName("Charge");
287 >    FixedChargeAdapter fca = FixedChargeAdapter(atomType);
288  
289 <      if (data == NULL) {
287 <        sprintf( painCave.errMsg, "Electrostatic::addType could not find "
288 <                 "Charge\n"
289 <                 "\tparameters for atomType %s.\n",
290 <                 atomType->getName().c_str());
291 <        painCave.severity = OPENMD_ERROR;
292 <        painCave.isFatal = 1;
293 <        simError();                  
294 <      }
295 <      
296 <      DoubleGenericData* doubleData = dynamic_cast<DoubleGenericData*>(data);
297 <      if (doubleData == NULL) {
298 <        sprintf( painCave.errMsg,
299 <                 "Electrostatic::addType could not convert GenericData to "
300 <                 "Charge for\n"
301 <                 "\tatom type %s\n", atomType->getName().c_str());
302 <        painCave.severity = OPENMD_ERROR;
303 <        painCave.isFatal = 1;
304 <        simError();          
305 <      }
289 >    if (fca.isFixedCharge()) {
290        electrostaticAtomData.is_Charge = true;
291 <      electrostaticAtomData.charge = doubleData->getData();          
291 >      electrostaticAtomData.charge = fca.getCharge();
292      }
293  
294 <    if (atomType->isDirectional()) {
295 <      DirectionalAtomType* daType = dynamic_cast<DirectionalAtomType*>(atomType);
296 <      
313 <      if (daType->isDipole()) {
314 <        GenericData* data = daType->getPropertyByName("Dipole");
315 <        
316 <        if (data == NULL) {
317 <          sprintf( painCave.errMsg,
318 <                   "Electrostatic::addType could not find Dipole\n"
319 <                   "\tparameters for atomType %s.\n",
320 <                   daType->getName().c_str());
321 <          painCave.severity = OPENMD_ERROR;
322 <          painCave.isFatal = 1;
323 <          simError();                  
324 <        }
325 <      
326 <        DoubleGenericData* doubleData = dynamic_cast<DoubleGenericData*>(data);
327 <        if (doubleData == NULL) {
328 <          sprintf( painCave.errMsg,
329 <                   "Electrostatic::addType could not convert GenericData to "
330 <                   "Dipole Moment\n"
331 <                   "\tfor atom type %s\n", daType->getName().c_str());
332 <          painCave.severity = OPENMD_ERROR;
333 <          painCave.isFatal = 1;
334 <          simError();          
335 <        }
294 >    MultipoleAdapter ma = MultipoleAdapter(atomType);
295 >    if (ma.isMultipole()) {
296 >      if (ma.isDipole()) {
297          electrostaticAtomData.is_Dipole = true;
298 <        electrostaticAtomData.dipole_moment = doubleData->getData();
298 >        electrostaticAtomData.dipole_moment = ma.getDipoleMoment();
299        }
300 <
340 <      if (daType->isSplitDipole()) {
341 <        GenericData* data = daType->getPropertyByName("SplitDipoleDistance");
342 <        
343 <        if (data == NULL) {
344 <          sprintf(painCave.errMsg,
345 <                  "Electrostatic::addType could not find SplitDipoleDistance\n"
346 <                  "\tparameter for atomType %s.\n",
347 <                  daType->getName().c_str());
348 <          painCave.severity = OPENMD_ERROR;
349 <          painCave.isFatal = 1;
350 <          simError();                  
351 <        }
352 <      
353 <        DoubleGenericData* doubleData = dynamic_cast<DoubleGenericData*>(data);
354 <        if (doubleData == NULL) {
355 <          sprintf( painCave.errMsg,
356 <                   "Electrostatic::addType could not convert GenericData to "
357 <                   "SplitDipoleDistance for\n"
358 <                   "\tatom type %s\n", daType->getName().c_str());
359 <          painCave.severity = OPENMD_ERROR;
360 <          painCave.isFatal = 1;
361 <          simError();          
362 <        }
300 >      if (ma.isSplitDipole()) {
301          electrostaticAtomData.is_SplitDipole = true;
302 <        electrostaticAtomData.split_dipole_distance = doubleData->getData();
302 >        electrostaticAtomData.split_dipole_distance = ma.getSplitDipoleDistance();
303        }
304 <
367 <      if (daType->isQuadrupole()) {
368 <        GenericData* data = daType->getPropertyByName("QuadrupoleMoments");
369 <        
370 <        if (data == NULL) {
371 <          sprintf( painCave.errMsg,
372 <                   "Electrostatic::addType could not find QuadrupoleMoments\n"
373 <                   "\tparameter for atomType %s.\n",
374 <                   daType->getName().c_str());
375 <          painCave.severity = OPENMD_ERROR;
376 <          painCave.isFatal = 1;
377 <          simError();                  
378 <        }
379 <        
304 >      if (ma.isQuadrupole()) {
305          // Quadrupoles in OpenMD are set as the diagonal elements
306          // of the diagonalized traceless quadrupole moment tensor.
307          // The column vectors of the unitary matrix that diagonalizes
308          // the quadrupole moment tensor become the eFrame (or the
309          // electrostatic version of the body-fixed frame.
310 <
311 <        Vector3dGenericData* v3dData = dynamic_cast<Vector3dGenericData*>(data);
387 <        if (v3dData == NULL) {
388 <          sprintf( painCave.errMsg,
389 <                   "Electrostatic::addType could not convert GenericData to "
390 <                   "Quadrupole Moments for\n"
391 <                   "\tatom type %s\n", daType->getName().c_str());
392 <          painCave.severity = OPENMD_ERROR;
393 <          painCave.isFatal = 1;
394 <          simError();          
395 <        }
396 <        electrostaticAtomData.is_Quadrupole = true;
397 <        electrostaticAtomData.quadrupole_moments = v3dData->getData();
310 >        electrostaticAtomData.is_Quadrupole = true;
311 >        electrostaticAtomData.quadrupole_moments = ma.getQuadrupoleMoments();
312        }
313      }
314      
315 <    AtomTypeProperties atp = atomType->getATP();    
315 >    FluctuatingChargeAdapter fqa = FluctuatingChargeAdapter(atomType);
316  
317 +    if (fqa.isFluctuatingCharge()) {
318 +      electrostaticAtomData.is_FluctuatingCharge = true;
319 +      electrostaticAtomData.electronegativity = fca.getElectronegativity();
320 +      electrostaticAtomData.hardness = fca.getHardness();
321 +      electrostaticAtomData.slaterN = fca.getSlaterN();
322 +      electrostaticAtomData.slaterZeta = fca.getSlaterZeta();
323 +    }
324 +
325      pair<map<int,AtomType*>::iterator,bool> ret;    
326 <    ret = ElectrostaticList.insert( pair<int,AtomType*>(atp.ident, atomType) );
326 >    ret = ElectrostaticList.insert( pair<int,AtomType*>(atomType->getIdent(),
327 >                                                        atomType) );
328      if (ret.second == false) {
329        sprintf( painCave.errMsg,
330                 "Electrostatic already had a previous entry with ident %d\n",
331 <               atp.ident);
331 >               atomType->getIdent() );
332        painCave.severity = OPENMD_INFO;
333        painCave.isFatal = 0;
334        simError();        
335      }
336      
337 <    ElectrostaticMap[atomType] = electrostaticAtomData;    
337 >    ElectrostaticMap[atomType] = electrostaticAtomData;  
338 >
339 >    // Now, iterate over all known types and add to the mixing map:
340 >    
341 >    map<AtomType*, ElectrostaticAtomData>::iterator it;
342 >    for( it = ElectrostaticMap.begin(); it != ElectrostaticMap.end(); ++it) {
343 >      AtomType* atype2 = (*it).first;
344 >      
345 >      if ((*it).is_FluctuatingCharge && electrostaticAtomData.is_FluctuatingCharge) {
346 >        
347 >        RealType a = electrostaticAtomData.slaterZeta;
348 >        RealType b = (*it).slaterZeta;
349 >        int m = electrostaticAtomData.slaterN;
350 >        int n = (*it).slaterN;
351 >
352 >        // Create the spline of the coulombic integral for s-type
353 >        // Slater orbitals.  Add a 2 angstrom safety window to deal
354 >        // with cutoffGroups that have charged atoms longer than the
355 >        // cutoffRadius away from each other.
356 >
357 >        RealType dr = (cutoffRadius_ + 2.0) / RealType(np_ - 1);
358 >        vector<RealType> rvals;
359 >        vector<RealType> J1vals;
360 >        vector<RealType> J2vals;
361 >        for (int i = 0; i < np_; i++) {
362 >          rval = RealType(i) * dr;
363 >          rvals.push_back(rval);
364 >          J1vals.push_back( sSTOCoulInt( a, b, m, n, rval * PhysicalConstants::angstromsToBohr ) );
365 >          J2vals.push_back( sSTOCoulInt( b, a, n, m, rval * PhysicalConstants::angstromsToBohr ) );
366 >        }
367 >
368 >        CubicSpline J1 = new CubicSpline();
369 >        J1->addPoints(rvals, J1vals);
370 >        CubicSpline J2 = new CubicSpline();
371 >        J2->addPoints(rvals, J2vals);
372 >        
373 >        pair<AtomType*, AtomType*> key1, key2;
374 >        key1 = make_pair(atomType, atype2);
375 >        key2 = make_pair(atype2, atomType);
376 >        
377 >        Jij[key1] = J1;
378 >        Jij[key2] = J2;
379 >      }
380 >    }
381 >
382      return;
383    }
384    
# Line 461 | Line 428 | namespace OpenMD {
428      RealType c1, c2, c3, c4;
429      RealType erfcVal(1.0), derfcVal(0.0);
430      RealType BigR;
431 +    RealType two(2.0), three(3.0);
432  
433      Vector3d Q_i, Q_j;
434      Vector3d ux_i, uy_i, uz_i;
# Line 621 | Line 589 | namespace OpenMD {
589            if (idat.excluded) {
590              indirect_vpair += preVal * rfVal;
591              indirect_Pot += *(idat.sw) * preVal * rfVal;
592 <            indirect_dVdr += *(idat.sw)  * preVal * 2.0 * rfVal  * riji * rhat;
592 >            indirect_dVdr += *(idat.sw)  * preVal * two * rfVal  * riji * rhat;
593            }
594            
595          } else {
# Line 649 | Line 617 | namespace OpenMD {
617            vpair += vterm;
618            epot +=  *(idat.sw)  * vterm;
619  
620 <          dVdr +=  -preSw * (ri3 * (uz_j - 3.0 * ct_j * rhat) - preRF2_*uz_j);
620 >          dVdr +=  -preSw * (ri3 * (uz_j - three * ct_j * rhat) - preRF2_*uz_j);
621            duduz_j += -preSw * rhat * (ri2 - preRF2_ *  *(idat.rij) );  
622  
623            // Even if we excluded this pair from direct interactions,
# Line 738 | Line 706 | namespace OpenMD {
706          c2ri = c2 * riji;
707          c3ri = c3 * riji;
708          c4rij = c4 *  *(idat.rij) ;
709 <        rhatdot2 = 2.0 * rhat * c3;
709 >        rhatdot2 = two * rhat * c3;
710          rhatc4 = rhat * c4rij;
711  
712          // calculate the potential
# Line 751 | Line 719 | namespace OpenMD {
719                  
720          // calculate derivatives for the forces and torques
721  
722 <        dVdr += -preSw * ( qxx_j* (cx2*rhatc4 - (2.0*cx_j*ux_j + rhat)*c3ri) +
723 <                           qyy_j* (cy2*rhatc4 - (2.0*cy_j*uy_j + rhat)*c3ri) +
724 <                           qzz_j* (cz2*rhatc4 - (2.0*cz_j*uz_j + rhat)*c3ri));
722 >        dVdr += -preSw * ( qxx_j* (cx2*rhatc4 - (two*cx_j*ux_j + rhat)*c3ri) +
723 >                           qyy_j* (cy2*rhatc4 - (two*cy_j*uy_j + rhat)*c3ri) +
724 >                           qzz_j* (cz2*rhatc4 - (two*cz_j*uz_j + rhat)*c3ri));
725                            
726          dudux_j += preSw * qxx_j * cx_j * rhatdot2;
727          duduy_j += preSw * qyy_j * cy_j * rhatdot2;
# Line 777 | Line 745 | namespace OpenMD {
745            vpair += vterm;
746            epot +=  *(idat.sw)  * vterm;
747            
748 <          dVdr += preSw * (ri3 * (uz_i - 3.0 * ct_i * rhat) - preRF2_ * uz_i);
748 >          dVdr += preSw * (ri3 * (uz_i - three * ct_i * rhat) - preRF2_ * uz_i);
749            
750            duduz_i += preSw * rhat * (ri2 - preRF2_ *  *(idat.rij) );
751  
# Line 855 | Line 823 | namespace OpenMD {
823              
824            a1 = 5.0 * ct_i * ct_j - ct_ij;
825              
826 <          dVdr += preSw * 3.0 * ri4 * (a1 * rhat - ct_i * uz_j - ct_j * uz_i);
826 >          dVdr += preSw * three * ri4 * (a1 * rhat - ct_i * uz_j - ct_j * uz_i);
827  
828 <          duduz_i += preSw * (ri3 * (uz_j - 3.0 * ct_j * rhat) - preRF2_*uz_j);
829 <          duduz_j += preSw * (ri3 * (uz_i - 3.0 * ct_i * rhat) - preRF2_*uz_i);
828 >          duduz_i += preSw * (ri3 * (uz_j - three * ct_j * rhat) - preRF2_*uz_j);
829 >          duduz_j += preSw * (ri3 * (uz_i - three * ct_i * rhat) - preRF2_*uz_i);
830  
831            if (idat.excluded) {
832              indirect_vpair +=  - pref * preRF2_ * ct_ij;
# Line 963 | Line 931 | namespace OpenMD {
931          c2ri = c2 * riji;
932          c3ri = c3 * riji;
933          c4rij = c4 *  *(idat.rij) ;
934 <        rhatdot2 = 2.0 * rhat * c3;
934 >        rhatdot2 = two * rhat * c3;
935          rhatc4 = rhat * c4rij;
936  
937          // calculate the potential
# Line 977 | Line 945 | namespace OpenMD {
945  
946          // calculate the derivatives for the forces and torques
947  
948 <        dVdr += -preSw * (qxx_i* (cx2*rhatc4 - (2.0*cx_i*ux_i + rhat)*c3ri) +
949 <                          qyy_i* (cy2*rhatc4 - (2.0*cy_i*uy_i + rhat)*c3ri) +
950 <                          qzz_i* (cz2*rhatc4 - (2.0*cz_i*uz_i + rhat)*c3ri));
948 >        dVdr += -preSw * (qxx_i* (cx2*rhatc4 - (two*cx_i*ux_i + rhat)*c3ri) +
949 >                          qyy_i* (cy2*rhatc4 - (two*cy_i*uy_i + rhat)*c3ri) +
950 >                          qzz_i* (cz2*rhatc4 - (two*cz_i*uz_i + rhat)*c3ri));
951  
952          dudux_i += preSw * qxx_i * cx_i *  rhatdot2;
953          duduy_i += preSw * qyy_i * cy_i *  rhatdot2;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines