ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/integrators/VelocityVerletIntegrator.cpp
(Generate patch)

Comparing trunk/src/integrators/VelocityVerletIntegrator.cpp (file contents):
Revision 1341 by skuang, Fri May 8 19:47:05 2009 UTC vs.
Revision 1368 by skuang, Mon Oct 19 13:39:04 2009 UTC

# Line 94 | Line 94 | namespace oopse {
94  
95      dumpWriter->writeDumpAndEor();
96  
97 –    if (simParams->getUseSolidThermInt()) {
98 –      restWriter = createRestWriter();
99 –      restWriter->writeZAngFile();
100 –    }
101 –    
97      //save statistics, before writeStat,  we must save statistics
98      thermo.saveStat();
99      saveConservedQuantity();
100      if (simParams->getUseRNEMD())
101 <      rnemd_->getStatus();
101 >      rnemd_->getStarted();
102  
103      statWriter->writeStat(currentSnapshot_->statData);
104      
# Line 114 | Line 109 | namespace oopse {
109        currReset = resetTime + currentSnapshot_->getTime();
110      }
111      if (simParams->getUseRNEMD()){
112 <      currRNEMD = RNEMD_swapTime + currentSnapshot_->getTime();
112 >      currRNEMD = RNEMD_exchangeTime + currentSnapshot_->getTime();
113      }
114      needPotential = false;
115      needStress = false;      
# Line 165 | Line 160 | namespace oopse {
160        }
161      }
162      if (useRNEMD) {
163 +      rnemd_->collectData();
164        if (currentSnapshot_->getTime() >= currRNEMD) {
165 <        rnemd_->doSwap();
166 <        currRNEMD += RNEMD_swapTime;
165 >        rnemd_->doRNEMD();
166 >        currRNEMD += RNEMD_exchangeTime;
167        }
168      }
169      
170      if (currentSnapshot_->getTime() >= currSample) {
171        dumpWriter->writeDumpAndEor();
172        
177 –      if (simParams->getUseSolidThermInt())
178 –        restWriter->writeZAngFile();
179 –      
173        currSample += sampleTime;
174      }
175      
# Line 185 | Line 178 | namespace oopse {
178        thermo.saveStat();
179        saveConservedQuantity();
180  
181 <      if (simParams->getUseRNEMD())
181 >      if (simParams->getUseRNEMD()) {
182          rnemd_->getStatus();
183 +      }
184  
185        statWriter->writeStat(currentSnapshot_->statData);
186        
# Line 205 | Line 199 | namespace oopse {
199    void VelocityVerletIntegrator::finalize() {
200      dumpWriter->writeEor();
201    
208 –    if (simParams->getUseSolidThermInt()) {
209 –      restWriter->writeZAngFile();
210 –      delete restWriter;
211 –      restWriter = NULL;
212 –    }
213 –  
202      delete dumpWriter;
203      delete statWriter;
204    
# Line 240 | Line 228 | namespace oopse {
228  
229      std::string statFileFormatString = simParams->getStatFileFormat();
230      StatsBitSet mask = parseStatFileFormat(statFileFormatString);
231 <    
232 <    // if solidThermInt is true, add extra information to the statfile
233 <    if (simParams->getUseSolidThermInt()){
231 >  
232 >    // if we're doing a thermodynamic integration, we'll want the raw
233 >    // potential as well as the full potential:
234 >
235 >
236 >    if (simParams->getUseThermodynamicIntegration())
237        mask.set(Stats::VRAW);
238 +
239 +    // if we've got restraints turned on, we'll also want a report of the
240 +    // total harmonic restraints
241 +    if (simParams->getUseRestraints()){
242        mask.set(Stats::VHARM);
243      }
244  
# Line 273 | Line 268 | namespace oopse {
268      }
269  
270      if (simParams->getUseRNEMD()) {
271 <      mask.set(Stats::RNEMD_SWAP_TOTAL);
271 >      mask.set(Stats::RNEMD_EXCHANGE_TOTAL);
272      }
273 <      
273 >    
274  
275 <     return new StatWriter(info_->getStatFileName(), mask);
275 >    return new StatWriter(info_->getStatFileName(), mask);
276    }
277  
283 –  RestWriter* VelocityVerletIntegrator::createRestWriter(){
284 –    return new RestWriter(info_);
285 –  }
278  
287 –
279   } //end namespace oopse

Diff Legend

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