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 1575 by gezelter, Fri Jun 3 21:39:49 2011 UTC vs.
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# Line 36 | Line 36
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).                        
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 329 | Line 330 | namespace OpenMD {
330      *(sdat.frho) = u;
331      *(sdat.dfrhodrho) = 0.5 * *(sdat.frho) / *(sdat.rho);
332  
333 <    sdat.pot[METALLIC_FAMILY] += u;
333 >    (*(sdat.pot))[METALLIC_FAMILY] += u;
334      *(sdat.particlePot) += u;
335      
336      return;
# Line 379 | Line 380 | namespace OpenMD {
380        *(idat.particlePot1) -= data2.c * data2.epsilon *
381          sqrt( *(idat.rho2) - rhtmp) + *(idat.frho2);
382  
383 <      *(idat.particlePot1) -= data1.c * data1.epsilon *
383 >      *(idat.particlePot2) -= data1.c * data1.epsilon *
384          sqrt( *(idat.rho1) - rhtmp) + *(idat.frho1);
385        
386 <      idat.pot[METALLIC_FAMILY] += pot_temp;
386 >      (*(idat.pot))[METALLIC_FAMILY] += pot_temp;
387      }
388        
389      return;    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines