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

Comparing trunk/src/nonbonded/SwitchingFunction.cpp (file contents):
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC vs.
Revision 1895 by gezelter, Mon Jul 1 21:09:37 2013 UTC

# Line 159 | Line 159 | namespace OpenMD {
159        } else {
160          in_switching_region = true;
161          r = sqrt(r2);
162 <        pair<RealType, RealType> result = switchSpline_->getValueAndDerivativeAt(r);
163 <        sw = result.first;
164 <        dswdr = result.second;
162 >        switchSpline_->getValueAndDerivativeAt(r, sw, dswdr);
163        }
164      }
165      return in_switching_region;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines