ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/Integrator.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/Integrator.cpp (file contents):
Revision 725 by tim, Tue Aug 26 20:29:26 2003 UTC vs.
Revision 726 by tim, Tue Aug 26 20:37:30 2003 UTC

# Line 191 | Line 191 | template<typename T> void Integrator<T>::integrate(voi
191    currSample  = sampleTime + info->getTime();
192    currThermal = thermalTime+ info->getTime();
193    currStatus  = statusTime + info->getTime();
194 – >>>>>>> 1.18
194  
195    dumpOut->writeDump(info->getTime());
196    statOut->writeStat(info->getTime());

Diff Legend

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