49 |
|
|
50 |
|
#include "integrators/VelocityVerletIntegrator.hpp" |
51 |
|
#include "integrators/DLM.hpp" |
52 |
+ |
#include "utils/StringUtils.hpp" |
53 |
|
|
54 |
|
namespace oopse { |
55 |
|
VelocityVerletIntegrator::VelocityVerletIntegrator(SimInfo *info) : Integrator(info), rotAlgo(NULL) { |
87 |
|
} |
88 |
|
|
89 |
|
dumpWriter = createDumpWriter(); |
90 |
+ |
|
91 |
|
statWriter = createStatWriter(); |
92 |
|
|
93 |
< |
dumpWriter->writeDump(); |
94 |
< |
|
93 |
> |
dumpWriter->writeDumpAndEor(); |
94 |
> |
|
95 |
|
//save statistics, before writeStat, we must save statistics |
96 |
|
thermo.saveStat(); |
97 |
|
saveConservedQuantity(); |
151 |
|
} |
152 |
|
|
153 |
|
if (currentSnapshot_->getTime() >= currSample) { |
154 |
< |
dumpWriter->writeDump(); |
154 |
> |
dumpWriter->writeDumpAndEor(); |
155 |
|
currSample += sampleTime; |
156 |
|
} |
157 |
|
|
171 |
|
|
172 |
|
|
173 |
|
void VelocityVerletIntegrator::finalize() { |
174 |
+ |
dumpWriter->writeEor(); |
175 |
|
|
173 |
– |
dumpWriter->writeDump(); |
174 |
– |
|
176 |
|
delete dumpWriter; |
177 |
|
delete statWriter; |
178 |
|
|
195 |
|
} |
196 |
|
|
197 |
|
DumpWriter* VelocityVerletIntegrator::createDumpWriter() { |
198 |
< |
return new DumpWriter(info_, info_->getDumpFileName()); |
198 |
> |
return new DumpWriter(info_); |
199 |
|
} |
200 |
|
|
201 |
|
StatWriter* VelocityVerletIntegrator::createStatWriter() { |