# | 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()); |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |