ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/integrators/VelocityVerletIntegrator.cpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/integrators/VelocityVerletIntegrator.cpp (file contents):
Revision 1960 by tim, Wed Jan 26 15:26:47 2005 UTC vs.
Revision 2060 by tim, Thu Feb 24 20:55:07 2005 UTC

# Line 87 | Line 87 | void VelocityVerletIntegrator::initialize(){
87      }
88      
89      dumpWriter = createDumpWriter();
90 <    eorWriter = createEorWriter();
90 >
91      statWriter = createStatWriter();
92  
93 <    dumpWriter->writeDump();
94 <    eorWriter->writeDump();
93 >    dumpWriter->writeDumpAndEor();
94      
95      //save statistics, before writeStat,  we must save statistics
96      thermo.saveStat();
# Line 152 | Line 151 | void VelocityVerletIntegrator::postStep() {
151          }
152  
153          if (currentSnapshot_->getTime() >= currSample) {
154 <            dumpWriter->writeDump();
156 <            eorWriter->writeDump();
154 >            dumpWriter->writeDumpAndEor();
155              currSample += sampleTime;
156          }
157  
# Line 173 | Line 171 | void VelocityVerletIntegrator::finalize() {
171  
172  
173   void VelocityVerletIntegrator::finalize() {
174 +     dumpWriter->writeEor();
175  
177 –    dumpWriter->writeDump();
178 –    eorWriter->writeDump();
179 –
176      delete dumpWriter;
181 –    delete eorWriter;
177      delete statWriter;
178  
179      dumpWriter = NULL;
185 –    eorWriter = NULL;
180      statWriter = NULL;
181      
182   }
# Line 201 | Line 195 | DumpWriter* VelocityVerletIntegrator::createDumpWriter
195   }
196  
197   DumpWriter* VelocityVerletIntegrator::createDumpWriter() {
198 <    return new DumpWriter(info_, info_->getDumpFileName());
198 >    return new DumpWriter(info_);
199   }
200  
207 – DumpWriter* VelocityVerletIntegrator::createEorWriter() {
208 –    return new DumpWriter(info_, getPrefix(info_->getDumpFileName()) + ".eor");
209 – }
210 –
201   StatWriter* VelocityVerletIntegrator::createStatWriter() {
202      return new StatWriter(info_->getStatFileName());
203   }

Diff Legend

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