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

Comparing branches/development/src/nonbonded/SwitchingFunction.cpp (file contents):
Revision 1536 by gezelter, Wed Jan 5 14:49:05 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 <cmath>
44   #include <iostream>
45 + #include <cstdio>
46  
47   #include "nonbonded/SwitchingFunction.hpp"
48   #include "utils/simError.h"
# Line 143 | Line 145 | namespace OpenMD {
145      return;
146    }
147  
148 <  bool SwitchingFunction::getSwitch(const RealType &r2, RealType &sw, RealType &dswdr,
149 <                                    RealType &r) {
148 >  bool SwitchingFunction::getSwitch(const RealType &r2, RealType &sw,
149 >                                    RealType &dswdr, RealType &r) {
150  
151      sw = 1.0;
152      dswdr = 0.0;

Diff Legend

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