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

Comparing branches/development/src/brains/ForceManager.cpp (file contents):
Revision 1467 by gezelter, Sat Jul 17 15:33:03 2010 UTC vs.
Revision 1535 by gezelter, Fri Dec 31 18:31:56 2010 UTC

# Line 57 | Line 57
57   #include "primitives/Bend.hpp"
58   #include "primitives/Torsion.hpp"
59   #include "primitives/Inversion.hpp"
60 #include "nonbonded/LJ.hpp"
60  
61   namespace OpenMD {
62 <
62 >  
63 >  ForceManager::ForceManager(SimInfo * info) : info_(info),
64 >                                               NBforcesInitialized_(false) {
65 >  }
66 >
67    void ForceManager::calcForces() {
68      
69 +
70      if (!info_->isFortranInitialized()) {
71        info_->update();
72 +      nbiMan_->setSimInfo(info_);
73 +      nbiMan_->initialize();    
74 +      info_->setupFortran();
75      }
76      
70    if (!NBforcesInitialized_) {
71      LJ* lj = new LJ(info_->getForceField());
72      lj->initialize();
73    }
74
77      preCalculation();
78      
79      calcShortRangeInteraction();
# Line 282 | Line 284 | namespace OpenMD {
284      //initialize data before passing to fortran
285      RealType longRangePotential[LR_POT_TYPES];
286      RealType lrPot = 0.0;
285    Vector3d totalDipole;
287      int isError = 0;
288  
289      for (int i=0; i<LR_POT_TYPES;i++){
# Line 309 | Line 310 | namespace OpenMD {
310      for (int i=0; i<LR_POT_TYPES;i++){
311        lrPot += longRangePotential[i]; //Quick hack
312      }
313 <    
313 <    // grab the simulation box dipole moment if specified
314 <    if (info_->getCalcBoxDipole()){
315 <      getAccumulatedBoxDipole(totalDipole.getArrayPointer());
316 <      
317 <      curSnapshot->statData[Stats::BOX_DIPOLE_X] = totalDipole(0);
318 <      curSnapshot->statData[Stats::BOX_DIPOLE_Y] = totalDipole(1);
319 <      curSnapshot->statData[Stats::BOX_DIPOLE_Z] = totalDipole(2);
320 <    }
321 <    
313 >        
314      //store the tau and long range potential    
315      curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL] = lrPot;
316      curSnapshot->statData[Stats::VANDERWAALS_POTENTIAL] = longRangePotential[VDW_POT];

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines