ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/brains/ForceManager.cpp
(Generate patch)

Comparing trunk/src/brains/ForceManager.cpp (file contents):
Revision 1993 by gezelter, Tue Apr 29 17:32:31 2014 UTC vs.
Revision 2020 by gezelter, Mon Sep 22 19:18:35 2014 UTC

# Line 57 | Line 57
57   #include "primitives/Torsion.hpp"
58   #include "primitives/Inversion.hpp"
59   #include "nonbonded/NonBondedInteraction.hpp"
60 < #include "perturbations/ElectricField.hpp"
60 > #include "perturbations/UniformField.hpp"
61   #include "parallel/ForceMatrixDecomposition.hpp"
62  
63   #include <cstdio>
# Line 405 | Line 405 | namespace OpenMD {
405        interactionMan_->setSimInfo(info_);
406        interactionMan_->initialize();
407  
408 <      // We want to delay the cutoffs until after the interaction
409 <      // manager has set up the atom-atom interactions so that we can
410 <      // query them for suggested cutoff values
408 >      //! We want to delay the cutoffs until after the interaction
409 >      //! manager has set up the atom-atom interactions so that we can
410 >      //! query them for suggested cutoff values
411        setupCutoffs();
412  
413        info_->prepareTopology();      
# Line 423 | Line 423 | namespace OpenMD {
423  
424      ForceFieldOptions& fopts = forceField_->getForceFieldOptions();
425      
426 <    // Force fields can set options on how to scale van der Waals and
427 <    // electrostatic interactions for atoms connected via bonds, bends
428 <    // and torsions in this case the topological distance between
429 <    // atoms is:
430 <    // 0 = topologically unconnected
431 <    // 1 = bonded together
432 <    // 2 = connected via a bend
433 <    // 3 = connected via a torsion
426 >    //! Force fields can set options on how to scale van der Waals and
427 >    //! electrostatic interactions for atoms connected via bonds, bends
428 >    //! and torsions in this case the topological distance between
429 >    //! atoms is:
430 >    //! 0 = topologically unconnected
431 >    //! 1 = bonded together
432 >    //! 2 = connected via a bend
433 >    //! 3 = connected via a torsion
434      
435      vdwScale_.reserve(4);
436      fill(vdwScale_.begin(), vdwScale_.end(), 0.0);
# Line 448 | Line 448 | namespace OpenMD {
448      electrostaticScale_[2] = fopts.getelectrostatic13scale();
449      electrostaticScale_[3] = fopts.getelectrostatic14scale();    
450      
451 <    if (info_->getSimParams()->haveElectricField()) {
452 <      ElectricField* eField = new ElectricField(info_);
451 >    if (info_->getSimParams()->haveUniformField()) {
452 >      UniformField* eField = new UniformField(info_);
453        perturbations_.push_back(eField);
454      }
455  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines