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

Comparing branches/development/src/integrators/LangevinHullForceManager.cpp (file contents):
Revision 1760 by gezelter, Thu Jun 21 19:26:46 2012 UTC vs.
Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC

# Line 35 | Line 35
35   *                                                                      
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 < * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39   * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40   * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
# Line 138 | Line 138 | namespace OpenMD {
138      // Build a vector of integrable objects to determine if the are
139      // surface atoms
140      Molecule* mol;
141 <    StuntDouble* integrableObject;
141 >    StuntDouble* sd;
142      SimInfo::MoleculeIterator i;
143      Molecule::IntegrableObjectIterator  j;
144  
145      for (mol = info_->beginMolecule(i); mol != NULL;
146           mol = info_->nextMolecule(i)) {          
147 <      for (integrableObject = mol->beginIntegrableObject(j);
148 <           integrableObject != NULL;
149 <           integrableObject = mol->nextIntegrableObject(j)) {  
150 <        localSites_.push_back(integrableObject);
147 >      for (sd = mol->beginIntegrableObject(j);
148 >           sd != NULL;
149 >           sd = mol->nextIntegrableObject(j)) {
150 >        localSites_.push_back(sd);
151        }
152      }  
153    }  
154    
155    void LangevinHullForceManager::postCalculation(){
156    SimInfo::MoleculeIterator i;
157    Molecule::IntegrableObjectIterator  j;
158    Molecule* mol;
159    StuntDouble* integrableObject;
156    
157      // Compute surface Mesh
158      surfaceMesh_->computeHull(localSites_);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines