--- branches/development/src/flucq/FluctuatingChargeNVT.cpp	2012/06/22 20:01:37	1761
+++ trunk/src/flucq/FluctuatingChargeNVT.cpp	2015/03/07 21:41:51	2071
@@ -35,7 +35,7 @@
  *                                                                      
  * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).             
  * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
- * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
+ * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
  * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
  * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
  */
@@ -49,9 +49,8 @@ namespace OpenMD {
 namespace OpenMD {
 
   FluctuatingChargeNVT::FluctuatingChargeNVT(SimInfo* info) : 
-    FluctuatingChargePropagator(info), chiTolerance_ (1e-6), 
-    maxIterNum_(4), thermo(info),
-    currentSnapshot_(info->getSnapshotManager()->getCurrentSnapshot()) {    
+    FluctuatingChargePropagator(info), maxIterNum_(4), chiTolerance_ (1e-6), 
+    snap(info->getSnapshotManager()->getCurrentSnapshot()), thermo(info) {  
   }
 
   void FluctuatingChargeNVT::initialize() {
@@ -68,8 +67,7 @@ namespace OpenMD {
       }
       
       if (!info_->getSimParams()->getUseIntialExtendedSystemState()) {
-        currentSnapshot_->setChiElectronic(0.0);
-        currentSnapshot_->setIntegralOfChiElectronicDt(0.0);
+        snap->setElectronicThermostat(make_pair(0.0, 0.0));
       }
       
       if (!fqParams_->haveTargetTemp()) {
@@ -109,8 +107,9 @@ namespace OpenMD {
     Atom* atom;
     RealType cvel, cpos, cfrc, cmass;
 
-    RealType chi = currentSnapshot_->getChiElectronic();
-    RealType integralOfChidt = currentSnapshot_->getIntegralOfChiElectronicDt();
+    pair<RealType, RealType> thermostat = snap->getElectronicThermostat();
+    RealType chi = thermostat.first;
+    RealType integralOfChidt = thermostat.second;
     RealType instTemp = thermo.getElectronicTemperature();
 
     for (mol = info_->beginMolecule(i); mol != NULL; 
@@ -137,9 +136,7 @@ namespace OpenMD {
       (tauThermostat_ * tauThermostat_);
 
     integralOfChidt += chi * dt2_;
-    currentSnapshot_->setChiElectronic(chi);
-    currentSnapshot_->setIntegralOfChiElectronicDt(integralOfChidt);
-       
+    snap->setElectronicThermostat(make_pair(chi, integralOfChidt));
   }
 
   void FluctuatingChargeNVT::updateSizes() {
@@ -153,10 +150,11 @@ namespace OpenMD {
     Molecule* mol;
     Atom* atom;
     RealType instTemp;
-    RealType chi = currentSnapshot_->getChiElectronic();
+    pair<RealType, RealType> thermostat = snap->getElectronicThermostat();
+    RealType chi = thermostat.first;
     RealType oldChi = chi;
     RealType prevChi;
-    RealType integralOfChidt = currentSnapshot_->getIntegralOfChiElectronicDt();
+    RealType integralOfChidt = thermostat.second;
     int index;
     RealType cfrc, cvel, cmass;
 
@@ -187,7 +185,6 @@ namespace OpenMD {
              atom = mol->nextFluctuatingCharge(j)) {
 
           cfrc = atom->getFlucQFrc();
-          cvel =atom->getFlucQVel();
           cmass = atom->getChargeMass();
           
           // velocity half step
@@ -200,20 +197,19 @@ namespace OpenMD {
         break;
     }
     integralOfChidt += dt2_ * chi;
-    currentSnapshot_->setChiElectronic(chi);
-    currentSnapshot_->setIntegralOfChiElectronicDt(integralOfChidt);
+    snap->setElectronicThermostat(make_pair(chi, integralOfChidt));
   }
   
   void FluctuatingChargeNVT::resetPropagator() {
     if (!hasFlucQ_) return;
-    currentSnapshot_->setChiElectronic(0.0);
-    currentSnapshot_->setIntegralOfChiElectronicDt(0.0);
+    snap->setElectronicThermostat(make_pair(0.0, 0.0));
   }
   
   RealType FluctuatingChargeNVT::calcConservedQuantity() {
     if (!hasFlucQ_) return 0.0;
-    RealType chi = currentSnapshot_->getChiElectronic();
-    RealType integralOfChidt = currentSnapshot_->getIntegralOfChiElectronicDt();
+    pair<RealType, RealType> thermostat = snap->getElectronicThermostat();
+    RealType chi = thermostat.first;
+    RealType integralOfChidt = thermostat.second;
     RealType fkBT = info_->getNFluctuatingCharges() * 
       PhysicalConstants::kB *targetTemp_;