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 1584 by gezelter, Fri Jun 17 20:16:35 2011 UTC vs.
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 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 75 | Line 76 | namespace OpenMD {
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 85 | 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 155 | 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 >          std::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 202 | Line 289 | namespace OpenMD {
289        simError();
290        cutoffPolicy_ = TRADITIONAL;        
291      }
205 –    fDecomp_->setCutoffPolicy(cutoffPolicy_);
206 –  }
292  
293 <  /**
294 <   * setupSwitching
210 <   *
211 <   * Sets the values of switchingRadius and
212 <   *  If the switchingRadius was explicitly set, use that value (but check it)
213 <   *  If the switchingRadius was not explicitly set: use 0.85 * cutoffRadius_
214 <   */
215 <  void ForceManager::setupSwitching() {
216 <    Globals* simParams_ = info_->getSimParams();
217 <
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 266 | Line 370 | namespace OpenMD {
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 277 | 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
280 –
388        setupCutoffs();
282 –      setupSwitching();
389  
390        info_->prepareTopology();      
391      }
392  
393      ForceFieldOptions& fopts = forceField_->getForceFieldOptions();
394      
395 <    // Force fields can set options on how to scale van der Waals and electrostatic
396 <    // interactions for atoms connected via bonds, bends and torsions
397 <    // in this case the topological distance between atoms is:
395 >    // Force fields can set options on how to scale van der Waals and
396 >    // electrostatic interactions for atoms connected via bonds, bends
397 >    // and torsions in this case the topological distance between
398 >    // atoms is:
399      // 0 = topologically unconnected
400      // 1 = bonded together
401      // 2 = connected via a bend
# Line 340 | Line 447 | namespace OpenMD {
447      
448      for (mol = info_->beginMolecule(mi); mol != NULL;
449           mol = info_->nextMolecule(mi)) {
450 <      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
450 >      for(atom = mol->beginAtom(ai); atom != NULL;
451 >          atom = mol->nextAtom(ai)) {
452          atom->zeroForcesAndTorques();
453        }
454 <          
454 >      
455        //change the positions of atoms which belong to the rigidbodies
456        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
457             rb = mol->nextRigidBody(rbIter)) {
458          rb->zeroForcesAndTorques();
459        }        
460 <
460 >      
461        if(info_->getNGlobalCutoffGroups() != info_->getNGlobalAtoms()){
462          for(cg = mol->beginCutoffGroup(ci); cg != NULL;
463              cg = mol->nextCutoffGroup(ci)) {
# Line 358 | Line 466 | namespace OpenMD {
466          }
467        }      
468      }
469 <  
469 >    
470      // Zero out the stress tensor
471      tau *= 0.0;
472      
# Line 412 | Line 520 | namespace OpenMD {
520            dataSet.prev.angle = dataSet.curr.angle = angle;
521            dataSet.prev.potential = dataSet.curr.potential = currBendPot;
522            dataSet.deltaV = 0.0;
523 <          bendDataSets.insert(map<Bend*, BendDataSet>::value_type(bend, dataSet));
523 >          bendDataSets.insert(map<Bend*, BendDataSet>::value_type(bend,
524 >                                                                  dataSet));
525          }else {
526            i->second.prev.angle = i->second.curr.angle;
527            i->second.prev.potential = i->second.curr.potential;
# Line 555 | Line 664 | namespace OpenMD {
664          bool update_nlist = fDecomp_->checkNeighborList();
665          if (update_nlist)
666            neighborList = fDecomp_->buildNeighborList();
667 <      }      
668 <        
667 >      }            
668 >
669        for (vector<pair<int, int> >::iterator it = neighborList.begin();
670               it != neighborList.end(); ++it) {
671                  
# Line 566 | Line 675 | namespace OpenMD {
675          cuts = fDecomp_->getGroupCutoffs(cg1, cg2);
676  
677          d_grp  = fDecomp_->getIntergroupVector(cg1, cg2);
678 +
679          curSnapshot->wrapVector(d_grp);        
680          rgrpsq = d_grp.lengthSquare();
571 –
681          rCutSq = cuts.second;
682  
683          if (rgrpsq < rCutSq) {
684            idat.rcut = &cuts.first;
685            if (iLoop == PAIR_LOOP) {
686 <            vij *= 0.0;
686 >            vij = 0.0;
687              fij = V3Zero;
688            }
689            
690            in_switching_region = switcher_->getSwitch(rgrpsq, sw, dswdr,
691                                                       rgrp);
692 <              
692 >          
693            atomListRow = fDecomp_->getAtomsInGroupRow(cg1);
694            atomListColumn = fDecomp_->getAtomsInGroupColumn(cg2);
695  
# Line 591 | Line 700 | namespace OpenMD {
700              for (vector<int>::iterator jb = atomListColumn.begin();
701                   jb != atomListColumn.end(); ++jb) {              
702                atom2 = (*jb);
703 <            
703 >
704                if (!fDecomp_->skipAtomPair(atom1, atom2)) {
705                  vpair = 0.0;
706                  workPot = 0.0;
# Line 613 | Line 722 | namespace OpenMD {
722                    idat.d = &d;
723                    idat.r2 = &r2;
724                  }
725 <                
725 >              
726                  r = sqrt( *(idat.r2) );
727                  idat.rij = &r;
728                
# Line 634 | Line 743 | namespace OpenMD {
743              if (in_switching_region) {
744                swderiv = vij * dswdr / rgrp;
745                fg = swderiv * d_grp;
637 –
746                fij += fg;
747  
748                if (atomListRow.size() == 1 && atomListColumn.size() == 1) {
# Line 649 | Line 757 | namespace OpenMD {
757                  // presence in switching region
758                  fg = swderiv * d_grp * mf;
759                  fDecomp_->addForceToAtomRow(atom1, fg);
652 –
760                  if (atomListRow.size() > 1) {
761                    if (info_->usesAtomicVirial()) {
762                      // find the distance between the atom
# Line 678 | Line 785 | namespace OpenMD {
785                  }
786                }
787              }
788 <            //if (!SIM_uses_AtomicVirial) {
788 >            //if (!info_->usesAtomicVirial()) {
789              //  tau -= outProduct(d_grp, fij);
790              //}
791            }
# Line 686 | Line 793 | namespace OpenMD {
793        }
794  
795        if (iLoop == PREPAIR_LOOP) {
796 <        if (info_->requiresPrepair()) {            
796 >        if (info_->requiresPrepair()) {
797 >
798            fDecomp_->collectIntermediateData();
799  
800            for (int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
801              fDecomp_->fillSelfData(sdat, atom1);
802              interactionMan_->doPreForce(sdat);
803            }
696 –          
697 –          
698 –          fDecomp_->distributeIntermediateData();        
699 –        }
700 –      }
804  
805 <    }
703 <    
704 <    fDecomp_->collectData();
705 <    
706 <    if ( info_->requiresSkipCorrection() ) {
707 <      
708 <      for (int atom1 = 0; atom1 < fDecomp_->getNAtomsInRow(); atom1++) {
805 >          fDecomp_->distributeIntermediateData();
806  
710 –        vector<int> skipList = fDecomp_->getSkipsForAtom( atom1 );
711 –        
712 –        for (vector<int>::iterator jb = skipList.begin();
713 –             jb != skipList.end(); ++jb) {        
714 –    
715 –          atom2 = (*jb);
716 –          fDecomp_->fillSkipData(idat, atom1, atom2);
717 –          interactionMan_->doSkipCorrection(idat);
718 –          fDecomp_->unpackSkipData(idat, atom1, atom2);
719 –
807          }
808        }
809      }
810      
811 +    fDecomp_->collectData();
812 +        
813      if (info_->requiresSelfCorrection()) {
814  
815        for (int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {          

Diff Legend

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