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 1577 by gezelter, Wed Jun 8 20:26:56 2011 UTC vs.
Revision 1712 by gezelter, Sat May 19 13:30:21 2012 UTC

# Line 36 | Line 36
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).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   /**
# Line 59 | Line 60
60   #include "nonbonded/NonBondedInteraction.hpp"
61   #include "parallel/ForceMatrixDecomposition.hpp"
62  
63 + #include <cstdio>
64 + #include <iostream>
65 + #include <iomanip>
66 +
67   using namespace std;
68   namespace OpenMD {
69    
70    ForceManager::ForceManager(SimInfo * info) : info_(info) {
71      forceField_ = info_->getForceField();
67 –    fDecomp_ = new ForceMatrixDecomposition(info_);
72      interactionMan_ = new InteractionManager();
73 +    fDecomp_ = new ForceMatrixDecomposition(info_, interactionMan_);
74    }
75  
76    /**
77     * setupCutoffs
78     *
79 <   * Sets the values of cutoffRadius, cutoffMethod, and cutoffPolicy
79 >   * Sets the values of cutoffRadius, switchingRadius, cutoffMethod,
80 >   * and cutoffPolicy
81     *
82     * cutoffRadius : realType
83     *  If the cutoffRadius was explicitly set, use that value.
# Line 81 | Line 87 | namespace OpenMD {
87     *      simulation for suggested cutoff values (e.g. 2.5 * sigma).
88     *      Use the maximum suggested value that was found.
89     *
90 <   * cutoffMethod : (one of HARD, SWITCHED, SHIFTED_FORCE, SHIFTED_POTENTIAL)
90 >   * cutoffMethod : (one of HARD, SWITCHED, SHIFTED_FORCE,
91 >   *                        or SHIFTED_POTENTIAL)
92     *      If cutoffMethod was explicitly set, use that choice.
93     *      If cutoffMethod was not explicitly set, use SHIFTED_FORCE
94     *
95     * cutoffPolicy : (one of MIX, MAX, TRADITIONAL)
96     *      If cutoffPolicy was explicitly set, use that choice.
97     *      If cutoffPolicy was not explicitly set, use TRADITIONAL
98 +   *
99 +   * switchingRadius : realType
100 +   *  If the cutoffMethod was set to SWITCHED:
101 +   *      If the switchingRadius was explicitly set, use that value
102 +   *          (but do a sanity check first).
103 +   *      If the switchingRadius was not explicitly set: use 0.85 *
104 +   *      cutoffRadius_
105 +   *  If the cutoffMethod was not set to SWITCHED:
106 +   *      Set switchingRadius equal to cutoffRadius for safety.
107     */
108    void ForceManager::setupCutoffs() {
109      
110      Globals* simParams_ = info_->getSimParams();
111      ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions();
112 +    int mdFileVersion;
113      
114 +    if (simParams_->haveMDfileVersion())
115 +      mdFileVersion = simParams_->getMDfileVersion();
116 +    else
117 +      mdFileVersion = 0;
118 +  
119      if (simParams_->haveCutoffRadius()) {
120        rCut_ = simParams_->getCutoffRadius();
121      } else {      
# Line 122 | Line 144 | namespace OpenMD {
144          painCave.isFatal = 0;
145          painCave.severity = OPENMD_INFO;
146          simError();
147 <      }            
147 >      }
148      }
149  
150 +    fDecomp_->setUserCutoff(rCut_);
151 +    interactionMan_->setCutoffRadius(rCut_);
152 +
153      map<string, CutoffMethod> stringToCutoffMethod;
154      stringToCutoffMethod["HARD"] = HARD;
155      stringToCutoffMethod["SWITCHED"] = SWITCHED;
# Line 148 | Line 173 | namespace OpenMD {
173          cutoffMethod_ = i->second;
174        }
175      } else {
176 <      sprintf(painCave.errMsg,
177 <              "ForceManager::setupCutoffs: No value was set for the cutoffMethod.\n"
178 <              "\tOpenMD will use SHIFTED_FORCE.\n");
179 <      painCave.isFatal = 0;
180 <      painCave.severity = OPENMD_INFO;
181 <      simError();
182 <      cutoffMethod_ = SHIFTED_FORCE;        
176 >      if (mdFileVersion > 1) {
177 >        sprintf(painCave.errMsg,
178 >                "ForceManager::setupCutoffs: No value was set for the cutoffMethod.\n"
179 >                "\tOpenMD will use SHIFTED_FORCE.\n");
180 >        painCave.isFatal = 0;
181 >        painCave.severity = OPENMD_INFO;
182 >        simError();
183 >        cutoffMethod_ = SHIFTED_FORCE;        
184 >      } else {
185 >        // handle the case where the old file version was in play
186 >        // (there should be no cutoffMethod, so we have to deduce it
187 >        // from other data).        
188 >
189 >        sprintf(painCave.errMsg,
190 >                "ForceManager::setupCutoffs : DEPRECATED FILE FORMAT!\n"
191 >                "\tOpenMD found a file which does not set a cutoffMethod.\n"
192 >                "\tOpenMD will attempt to deduce a cutoffMethod using the\n"
193 >                "\tbehavior of the older (version 1) code.  To remove this\n"
194 >                "\twarning, add an explicit cutoffMethod and change the top\n"
195 >                "\tof the file so that it begins with <OpenMD version=2>\n");
196 >        painCave.isFatal = 0;
197 >        painCave.severity = OPENMD_WARNING;
198 >        simError();            
199 >                
200 >        // The old file version tethered the shifting behavior to the
201 >        // electrostaticSummationMethod keyword.
202 >        
203 >        if (simParams_->haveElectrostaticSummationMethod()) {
204 >          string myMethod = simParams_->getElectrostaticSummationMethod();
205 >          toUpper(myMethod);
206 >        
207 >          if (myMethod == "SHIFTED_POTENTIAL") {
208 >            cutoffMethod_ = SHIFTED_POTENTIAL;
209 >          } else if (myMethod == "SHIFTED_FORCE") {
210 >            cutoffMethod_ = SHIFTED_FORCE;
211 >          }
212 >        
213 >          if (simParams_->haveSwitchingRadius())
214 >            rSwitch_ = simParams_->getSwitchingRadius();
215 >
216 >          if (myMethod == "SHIFTED_POTENTIAL" || myMethod == "SHIFTED_FORCE") {
217 >            if (simParams_->haveSwitchingRadius()){
218 >              sprintf(painCave.errMsg,
219 >                      "ForceManager::setupCutoffs : DEPRECATED ERROR MESSAGE\n"
220 >                      "\tA value was set for the switchingRadius\n"
221 >                      "\teven though the electrostaticSummationMethod was\n"
222 >                      "\tset to %s\n", myMethod.c_str());
223 >              painCave.severity = OPENMD_WARNING;
224 >              painCave.isFatal = 1;
225 >              simError();            
226 >            }
227 >          }
228 >          if (abs(rCut_ - rSwitch_) < 0.0001) {
229 >            if (cutoffMethod_ == SHIFTED_FORCE) {              
230 >              sprintf(painCave.errMsg,
231 >                      "ForceManager::setupCutoffs : DEPRECATED BEHAVIOR\n"
232 >                      "\tcutoffRadius and switchingRadius are set to the\n"
233 >                      "\tsame value.  OpenMD will use shifted force\n"
234 >                      "\tpotentials instead of switching functions.\n");
235 >              painCave.isFatal = 0;
236 >              painCave.severity = OPENMD_WARNING;
237 >              simError();            
238 >            } else {
239 >              cutoffMethod_ = SHIFTED_POTENTIAL;
240 >              sprintf(painCave.errMsg,
241 >                      "ForceManager::setupCutoffs : DEPRECATED BEHAVIOR\n"
242 >                      "\tcutoffRadius and switchingRadius are set to the\n"
243 >                      "\tsame value.  OpenMD will use shifted potentials\n"
244 >                      "\tinstead of switching functions.\n");
245 >              painCave.isFatal = 0;
246 >              painCave.severity = OPENMD_WARNING;
247 >              simError();            
248 >            }
249 >          }
250 >        }
251 >      }
252      }
253  
254      map<string, CutoffPolicy> stringToCutoffPolicy;
# Line 162 | Line 256 | namespace OpenMD {
256      stringToCutoffPolicy["MAX"] = MAX;
257      stringToCutoffPolicy["TRADITIONAL"] = TRADITIONAL;    
258  
259 <    std::string cutPolicy;
259 >    string cutPolicy;
260      if (forceFieldOptions_.haveCutoffPolicy()){
261        cutPolicy = forceFieldOptions_.getCutoffPolicy();
262      }else if (simParams_->haveCutoffPolicy()) {
# Line 195 | Line 289 | namespace OpenMD {
289        simError();
290        cutoffPolicy_ = TRADITIONAL;        
291      }
198 –  }
292  
293 <  /**
294 <   * setupSwitching
202 <   *
203 <   * Sets the values of switchingRadius and
204 <   *  If the switchingRadius was explicitly set, use that value (but check it)
205 <   *  If the switchingRadius was not explicitly set: use 0.85 * cutoffRadius_
206 <   */
207 <  void ForceManager::setupSwitching() {
208 <    Globals* simParams_ = info_->getSimParams();
209 <
293 >    fDecomp_->setCutoffPolicy(cutoffPolicy_);
294 >        
295      // create the switching function object:
296 +
297      switcher_ = new SwitchingFunction();
298 <    
299 <    if (simParams_->haveSwitchingRadius()) {
300 <      rSwitch_ = simParams_->getSwitchingRadius();
301 <      if (rSwitch_ > rCut_) {        
298 >  
299 >    if (cutoffMethod_ == SWITCHED) {
300 >      if (simParams_->haveSwitchingRadius()) {
301 >        rSwitch_ = simParams_->getSwitchingRadius();
302 >        if (rSwitch_ > rCut_) {        
303 >          sprintf(painCave.errMsg,
304 >                  "ForceManager::setupCutoffs: switchingRadius (%f) is larger "
305 >                  "than the cutoffRadius(%f)\n", rSwitch_, rCut_);
306 >          painCave.isFatal = 1;
307 >          painCave.severity = OPENMD_ERROR;
308 >          simError();
309 >        }
310 >      } else {      
311 >        rSwitch_ = 0.85 * rCut_;
312          sprintf(painCave.errMsg,
313 <                "ForceManager::setupSwitching: switchingRadius (%f) is larger "
314 <                "than the cutoffRadius(%f)\n", rSwitch_, rCut_);
315 <        painCave.isFatal = 1;
316 <        painCave.severity = OPENMD_ERROR;
313 >                "ForceManager::setupCutoffs: No value was set for the switchingRadius.\n"
314 >                "\tOpenMD will use a default value of 85 percent of the cutoffRadius.\n"
315 >                "\tswitchingRadius = %f. for this simulation\n", rSwitch_);
316 >        painCave.isFatal = 0;
317 >        painCave.severity = OPENMD_WARNING;
318          simError();
319        }
320 <    } else {      
321 <      rSwitch_ = 0.85 * rCut_;
322 <      sprintf(painCave.errMsg,
323 <              "ForceManager::setupSwitching: No value was set for the switchingRadius.\n"
324 <              "\tOpenMD will use a default value of 85 percent of the cutoffRadius.\n"
325 <              "\tswitchingRadius = %f. for this simulation\n", rSwitch_);
326 <      painCave.isFatal = 0;
327 <      painCave.severity = OPENMD_WARNING;
328 <      simError();
329 <    }          
320 >    } else {
321 >      if (mdFileVersion > 1) {
322 >        // throw an error if we define a switching radius and don't need one.
323 >        // older file versions should not do this.
324 >        if (simParams_->haveSwitchingRadius()) {
325 >          map<string, CutoffMethod>::const_iterator it;
326 >          string theMeth;
327 >          for (it = stringToCutoffMethod.begin();
328 >               it != stringToCutoffMethod.end(); ++it) {
329 >            if (it->second == cutoffMethod_) {
330 >              theMeth = it->first;
331 >              break;
332 >            }
333 >          }
334 >          sprintf(painCave.errMsg,
335 >                  "ForceManager::setupCutoffs: the cutoffMethod (%s)\n"
336 >                  "\tis not set to SWITCHED, so switchingRadius value\n"
337 >                  "\twill be ignored for this simulation\n", theMeth.c_str());
338 >          painCave.isFatal = 0;
339 >          painCave.severity = OPENMD_WARNING;
340 >          simError();
341 >        }
342 >      }
343 >      rSwitch_ = rCut_;
344 >    }
345      
346      // Default to cubic switching function.
347      sft_ = cubic;
# Line 256 | Line 368 | namespace OpenMD {
368      }
369      switcher_->setSwitchType(sft_);
370      switcher_->setSwitch(rSwitch_, rCut_);
371 +    interactionMan_->setSwitchingRadius(rSwitch_);
372    }
373 +
374 +
375 +
376    
377    void ForceManager::initialize() {
378  
379      if (!info_->isTopologyDone()) {
380 +
381        info_->update();
382        interactionMan_->setSimInfo(info_);
383        interactionMan_->initialize();
# Line 268 | Line 385 | namespace OpenMD {
385        // We want to delay the cutoffs until after the interaction
386        // manager has set up the atom-atom interactions so that we can
387        // query them for suggested cutoff values
271 –
388        setupCutoffs();
273 –      setupSwitching();
389  
390        info_->prepareTopology();      
391 +
392 +      doParticlePot_ = info_->getSimParams()->getOutputParticlePotential();
393 +  
394      }
395  
396      ForceFieldOptions& fopts = forceField_->getForceFieldOptions();
397      
398 <    // Force fields can set options on how to scale van der Waals and electrostatic
399 <    // interactions for atoms connected via bonds, bends and torsions
400 <    // in this case the topological distance between atoms is:
398 >    // Force fields can set options on how to scale van der Waals and
399 >    // electrostatic interactions for atoms connected via bonds, bends
400 >    // and torsions in this case the topological distance between
401 >    // atoms is:
402      // 0 = topologically unconnected
403      // 1 = bonded together
404      // 2 = connected via a bend
# Line 331 | Line 450 | namespace OpenMD {
450      
451      for (mol = info_->beginMolecule(mi); mol != NULL;
452           mol = info_->nextMolecule(mi)) {
453 <      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
453 >      for(atom = mol->beginAtom(ai); atom != NULL;
454 >          atom = mol->nextAtom(ai)) {
455          atom->zeroForcesAndTorques();
456        }
457 <          
457 >      
458        //change the positions of atoms which belong to the rigidbodies
459        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
460             rb = mol->nextRigidBody(rbIter)) {
461          rb->zeroForcesAndTorques();
462        }        
463 <
463 >      
464        if(info_->getNGlobalCutoffGroups() != info_->getNGlobalAtoms()){
465          for(cg = mol->beginCutoffGroup(ci); cg != NULL;
466              cg = mol->nextCutoffGroup(ci)) {
# Line 349 | Line 469 | namespace OpenMD {
469          }
470        }      
471      }
472 <  
472 >    
473      // Zero out the stress tensor
474      tau *= 0.0;
475      
# Line 385 | Line 505 | namespace OpenMD {
505  
506        for (bond = mol->beginBond(bondIter); bond != NULL;
507             bond = mol->nextBond(bondIter)) {
508 <        bond->calcForce();
508 >        bond->calcForce(doParticlePot_);
509          bondPotential += bond->getPotential();
510        }
511  
# Line 393 | Line 513 | namespace OpenMD {
513             bend = mol->nextBend(bendIter)) {
514          
515          RealType angle;
516 <        bend->calcForce(angle);
516 >        bend->calcForce(angle, doParticlePot_);
517          RealType currBendPot = bend->getPotential();          
518          
519          bendPotential += bend->getPotential();
# Line 403 | Line 523 | namespace OpenMD {
523            dataSet.prev.angle = dataSet.curr.angle = angle;
524            dataSet.prev.potential = dataSet.curr.potential = currBendPot;
525            dataSet.deltaV = 0.0;
526 <          bendDataSets.insert(map<Bend*, BendDataSet>::value_type(bend, dataSet));
526 >          bendDataSets.insert(map<Bend*, BendDataSet>::value_type(bend,
527 >                                                                  dataSet));
528          }else {
529            i->second.prev.angle = i->second.curr.angle;
530            i->second.prev.potential = i->second.curr.potential;
# Line 417 | Line 538 | namespace OpenMD {
538        for (torsion = mol->beginTorsion(torsionIter); torsion != NULL;
539             torsion = mol->nextTorsion(torsionIter)) {
540          RealType angle;
541 <        torsion->calcForce(angle);
541 >        torsion->calcForce(angle, doParticlePot_);
542          RealType currTorsionPot = torsion->getPotential();
543          torsionPotential += torsion->getPotential();
544          map<Torsion*, TorsionDataSet>::iterator i = torsionDataSets.find(torsion);
# Line 441 | Line 562 | namespace OpenMD {
562             inversion != NULL;
563             inversion = mol->nextInversion(inversionIter)) {
564          RealType angle;
565 <        inversion->calcForce(angle);
565 >        inversion->calcForce(angle, doParticlePot_);
566          RealType currInversionPot = inversion->getPotential();
567          inversionPotential += inversion->getPotential();
568          map<Inversion*, InversionDataSet>::iterator i = inversionDataSets.find(inversion);
# Line 474 | Line 595 | namespace OpenMD {
595    
596    void ForceManager::longRangeInteractions() {
597  
477 –    // some of this initial stuff will go away:
598      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
599      DataStorage* config = &(curSnapshot->atomData);
600      DataStorage* cgConfig = &(curSnapshot->cgData);
481 –    RealType* frc = config->getArrayPointer(DataStorage::dslForce);
482 –    RealType* pos = config->getArrayPointer(DataStorage::dslPosition);
483 –    RealType* trq = config->getArrayPointer(DataStorage::dslTorque);
484 –    RealType* A = config->getArrayPointer(DataStorage::dslAmat);
485 –    RealType* electroFrame = config->getArrayPointer(DataStorage::dslElectroFrame);
486 –    RealType* particlePot = config->getArrayPointer(DataStorage::dslParticlePot);
487 –    RealType* rc;    
601  
602 <    if(info_->getNGlobalCutoffGroups() != info_->getNGlobalAtoms()){
603 <      rc = cgConfig->getArrayPointer(DataStorage::dslPosition);
602 >    //calculate the center of mass of cutoff group
603 >
604 >    SimInfo::MoleculeIterator mi;
605 >    Molecule* mol;
606 >    Molecule::CutoffGroupIterator ci;
607 >    CutoffGroup* cg;
608 >
609 >    if(info_->getNCutoffGroups() > 0){      
610 >      for (mol = info_->beginMolecule(mi); mol != NULL;
611 >           mol = info_->nextMolecule(mi)) {
612 >        for(cg = mol->beginCutoffGroup(ci); cg != NULL;
613 >            cg = mol->nextCutoffGroup(ci)) {
614 >          cg->updateCOM();
615 >        }
616 >      }      
617      } else {
618        // center of mass of the group is the same as position of the atom  
619        // if cutoff group does not exist
620 <      rc = pos;
620 >      cgConfig->position = config->position;
621      }
622 <    
497 <    // new stuff starts here:
622 >
623      fDecomp_->zeroWorkArrays();
624      fDecomp_->distributeData();
625 <
626 <    int cg1, cg2, atom1, atom2;
627 <    Vector3d d_grp, dag;
628 <    RealType rgrpsq, rgrp;
625 >    
626 >    int cg1, cg2, atom1, atom2, topoDist;
627 >    Vector3d d_grp, dag, d;
628 >    RealType rgrpsq, rgrp, r2, r;
629 >    RealType electroMult, vdwMult;
630      RealType vij;
631 <    Vector3d fij, fg;
631 >    Vector3d fij, fg, f1;
632      tuple3<RealType, RealType, RealType> cuts;
633      RealType rCutSq;
634      bool in_switching_region;
# Line 511 | Line 637 | namespace OpenMD {
637      InteractionData idat;
638      SelfData sdat;
639      RealType mf;
514 –    potVec pot(0.0);
515 –    potVec longRangePotential(0.0);
640      RealType lrPot;
641 +    RealType vpair;
642 +    potVec longRangePotential(0.0);
643 +    potVec workPot(0.0);
644  
645      int loopStart, loopEnd;
646  
647 +    idat.vdwMult = &vdwMult;
648 +    idat.electroMult = &electroMult;
649 +    idat.pot = &workPot;
650 +    sdat.pot = fDecomp_->getEmbeddingPotential();
651 +    idat.vpair = &vpair;
652 +    idat.f1 = &f1;
653 +    idat.sw = &sw;
654 +    idat.shiftedPot = (cutoffMethod_ == SHIFTED_POTENTIAL) ? true : false;
655 +    idat.shiftedForce = (cutoffMethod_ == SHIFTED_FORCE) ? true : false;
656 +    idat.doParticlePot = doParticlePot_;
657 +    sdat.doParticlePot = doParticlePot_;
658 +    
659      loopEnd = PAIR_LOOP;
660      if (info_->requiresPrepair() ) {
661        loopStart = PREPAIR_LOOP;
662      } else {
663        loopStart = PAIR_LOOP;
664      }
665 <
666 <    for (int iLoop = loopStart; iLoop < loopEnd; iLoop++) {
667 <      
665 >  
666 >    for (int iLoop = loopStart; iLoop <= loopEnd; iLoop++) {
667 >    
668        if (iLoop == loopStart) {
669          bool update_nlist = fDecomp_->checkNeighborList();
670          if (update_nlist)
671            neighborList = fDecomp_->buildNeighborList();
672 <      }
672 >      }            
673  
674        for (vector<pair<int, int> >::iterator it = neighborList.begin();
675               it != neighborList.end(); ++it) {
676 <        
676 >                
677          cg1 = (*it).first;
678          cg2 = (*it).second;
679          
680          cuts = fDecomp_->getGroupCutoffs(cg1, cg2);
681  
682          d_grp  = fDecomp_->getIntergroupVector(cg1, cg2);
683 +
684          curSnapshot->wrapVector(d_grp);        
685          rgrpsq = d_grp.lengthSquare();
546 –
686          rCutSq = cuts.second;
687  
688          if (rgrpsq < rCutSq) {
689 <          *(idat.rcut) = cuts.first;
689 >          idat.rcut = &cuts.first;
690            if (iLoop == PAIR_LOOP) {
691 <            vij *= 0.0;
691 >            vij = 0.0;
692              fij = V3Zero;
693            }
694            
695 <          in_switching_region = switcher_->getSwitch(rgrpsq, *(idat.sw), dswdr,
695 >          in_switching_region = switcher_->getSwitch(rgrpsq, sw, dswdr,
696                                                       rgrp);
697 <              
697 >          
698            atomListRow = fDecomp_->getAtomsInGroupRow(cg1);
699            atomListColumn = fDecomp_->getAtomsInGroupColumn(cg2);
700  
# Line 566 | Line 705 | namespace OpenMD {
705              for (vector<int>::iterator jb = atomListColumn.begin();
706                   jb != atomListColumn.end(); ++jb) {              
707                atom2 = (*jb);
708 <              
708 >
709                if (!fDecomp_->skipAtomPair(atom1, atom2)) {
710 +                vpair = 0.0;
711 +                workPot = 0.0;
712 +                f1 = V3Zero;
713 +
714 +                fDecomp_->fillInteractionData(idat, atom1, atom2);
715                  
716 <                pot *= 0.0;
716 >                topoDist = fDecomp_->getTopologicalDistance(atom1, atom2);
717 >                vdwMult = vdwScale_[topoDist];
718 >                electroMult = electrostaticScale_[topoDist];
719  
574 –                idat = fDecomp_->fillInteractionData(atom1, atom2);
575 –                *(idat.pot) = pot;
576 –
720                  if (atomListRow.size() == 1 && atomListColumn.size() == 1) {
721 <                  *(idat.d) = d_grp;
722 <                  *(idat.r2) = rgrpsq;
721 >                  idat.d = &d_grp;
722 >                  idat.r2 = &rgrpsq;
723                  } else {
724 <                  *(idat.d) = fDecomp_->getInteratomicVector(atom1, atom2);
725 <                  curSnapshot->wrapVector( *(idat.d) );
726 <                  *(idat.r2) = idat.d->lengthSquare();
724 >                  d = fDecomp_->getInteratomicVector(atom1, atom2);
725 >                  curSnapshot->wrapVector( d );
726 >                  r2 = d.lengthSquare();
727 >                  idat.d = &d;
728 >                  idat.r2 = &r2;
729                  }
585 –                
586 –                *(idat.rij) = sqrt( *(idat.r2) );
730                
731 +                r = sqrt( *(idat.r2) );
732 +                idat.rij = &r;
733 +              
734                  if (iLoop == PREPAIR_LOOP) {
735                    interactionMan_->doPrePair(idat);
736                  } else {
737                    interactionMan_->doPair(idat);
738                    fDecomp_->unpackInteractionData(idat, atom1, atom2);
739 <                  vij += *(idat.vpair);
740 <                  fij += *(idat.f1);
741 <                  tau -= outProduct( *(idat.d), *(idat.f1));
739 >                  vij += vpair;
740 >                  fij += f1;
741 >                  tau -= outProduct( *(idat.d), f1);
742                  }
743                }
744              }
# Line 602 | Line 748 | namespace OpenMD {
748              if (in_switching_region) {
749                swderiv = vij * dswdr / rgrp;
750                fg = swderiv * d_grp;
605 –
751                fij += fg;
752  
753                if (atomListRow.size() == 1 && atomListColumn.size() == 1) {
# Line 617 | Line 762 | namespace OpenMD {
762                  // presence in switching region
763                  fg = swderiv * d_grp * mf;
764                  fDecomp_->addForceToAtomRow(atom1, fg);
620 –
765                  if (atomListRow.size() > 1) {
766                    if (info_->usesAtomicVirial()) {
767                      // find the distance between the atom
# Line 646 | Line 790 | namespace OpenMD {
790                  }
791                }
792              }
793 <            //if (!SIM_uses_AtomicVirial) {
793 >            //if (!info_->usesAtomicVirial()) {
794              //  tau -= outProduct(d_grp, fij);
795              //}
796            }
# Line 654 | Line 798 | namespace OpenMD {
798        }
799  
800        if (iLoop == PREPAIR_LOOP) {
801 <        if (info_->requiresPrepair()) {            
801 >        if (info_->requiresPrepair()) {
802 >
803            fDecomp_->collectIntermediateData();
804  
805            for (int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
806 <            sdat = fDecomp_->fillSelfData(atom1);
806 >            fDecomp_->fillSelfData(sdat, atom1);
807              interactionMan_->doPreForce(sdat);
808            }
809  
810 <          fDecomp_->distributeIntermediateData();        
810 >          fDecomp_->distributeIntermediateData();
811 >
812          }
813        }
668 –
814      }
815      
816      fDecomp_->collectData();
672 –    
673 –    if ( info_->requiresSkipCorrection() ) {
674 –      
675 –      for (int atom1 = 0; atom1 < fDecomp_->getNAtomsInRow(); atom1++) {
676 –
677 –        vector<int> skipList = fDecomp_->getSkipsForRowAtom( atom1 );
817          
679 –        for (vector<int>::iterator jb = skipList.begin();
680 –             jb != skipList.end(); ++jb) {        
681 –    
682 –          atom2 = (*jb);
683 –          idat = fDecomp_->fillSkipData(atom1, atom2);
684 –          interactionMan_->doSkipCorrection(idat);
685 –
686 –        }
687 –      }
688 –    }
689 –    
818      if (info_->requiresSelfCorrection()) {
819  
820        for (int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {          
821 <        sdat = fDecomp_->fillSelfData(atom1);
821 >        fDecomp_->fillSelfData(sdat, atom1);
822          interactionMan_->doSelfCorrection(sdat);
823        }
824  
825      }
826  
827 <    longRangePotential = fDecomp_->getLongRangePotential();
827 >    longRangePotential = *(fDecomp_->getEmbeddingPotential()) +
828 >      *(fDecomp_->getPairwisePotential());
829 >
830      lrPot = longRangePotential.sum();
831  
832      //store the tau and long range potential    
# Line 729 | Line 859 | namespace OpenMD {
859      MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(),
860                    9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
861   #endif
862 <    curSnapshot->statData.setTau(tau);
862 >    curSnapshot->setTau(tau);
863    }
864  
865   } //end namespace OpenMD

Diff Legend

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