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 1587 by gezelter, Fri Jul 8 20:25:32 2011 UTC vs.
Revision 1597 by gezelter, Tue Jul 26 15:49:24 2011 UTC

# Line 86 | Line 86 | namespace OpenMD {
86     *      simulation for suggested cutoff values (e.g. 2.5 * sigma).
87     *      Use the maximum suggested value that was found.
88     *
89 <   * cutoffMethod : (one of HARD, SWITCHED, SHIFTED_FORCE, SHIFTED_POTENTIAL)
89 >   * cutoffMethod : (one of HARD, SWITCHED, SHIFTED_FORCE,
90 >   *                        or SHIFTED_POTENTIAL)
91     *      If cutoffMethod was explicitly set, use that choice.
92     *      If cutoffMethod was not explicitly set, use SHIFTED_FORCE
93     *
# Line 294 | Line 295 | namespace OpenMD {
295    void ForceManager::initialize() {
296  
297      if (!info_->isTopologyDone()) {
298 +
299        info_->update();
300        interactionMan_->setSimInfo(info_);
301        interactionMan_->initialize();
# Line 301 | Line 303 | namespace OpenMD {
303        // We want to delay the cutoffs until after the interaction
304        // manager has set up the atom-atom interactions so that we can
305        // query them for suggested cutoff values
304
306        setupCutoffs();
307  
308        info_->prepareTopology();      
# Line 309 | Line 310 | namespace OpenMD {
310  
311      ForceFieldOptions& fopts = forceField_->getForceFieldOptions();
312      
313 <    // Force fields can set options on how to scale van der Waals and electrostatic
314 <    // interactions for atoms connected via bonds, bends and torsions
315 <    // in this case the topological distance between atoms is:
313 >    // Force fields can set options on how to scale van der Waals and
314 >    // electrostatic interactions for atoms connected via bonds, bends
315 >    // and torsions in this case the topological distance between
316 >    // atoms is:
317      // 0 = topologically unconnected
318      // 1 = bonded together
319      // 2 = connected via a bend
# Line 363 | Line 365 | namespace OpenMD {
365      
366      for (mol = info_->beginMolecule(mi); mol != NULL;
367           mol = info_->nextMolecule(mi)) {
368 <      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
368 >      for(atom = mol->beginAtom(ai); atom != NULL;
369 >          atom = mol->nextAtom(ai)) {
370          atom->zeroForcesAndTorques();
371 +        cerr << "apos = " << atom->getPos() << "\n";
372        }
373 <          
373 >      
374        //change the positions of atoms which belong to the rigidbodies
375        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
376             rb = mol->nextRigidBody(rbIter)) {
377          rb->zeroForcesAndTorques();
378        }        
379 <
379 >      
380        if(info_->getNGlobalCutoffGroups() != info_->getNGlobalAtoms()){
381          for(cg = mol->beginCutoffGroup(ci); cg != NULL;
382              cg = mol->nextCutoffGroup(ci)) {
383            //calculate the center of mass of cutoff group
384            cg->updateCOM();
385 +          cerr << "cgpos = " << cg->getPos() << "\n";
386          }
387        }      
388      }
389 <  
389 >    
390      // Zero out the stress tensor
391      tau *= 0.0;
392      
# Line 435 | Line 440 | namespace OpenMD {
440            dataSet.prev.angle = dataSet.curr.angle = angle;
441            dataSet.prev.potential = dataSet.curr.potential = currBendPot;
442            dataSet.deltaV = 0.0;
443 <          bendDataSets.insert(map<Bend*, BendDataSet>::value_type(bend, dataSet));
443 >          bendDataSets.insert(map<Bend*, BendDataSet>::value_type(bend,
444 >                                                                  dataSet));
445          }else {
446            i->second.prev.angle = i->second.curr.angle;
447            i->second.prev.potential = i->second.curr.potential;
# Line 522 | Line 528 | namespace OpenMD {
528             mol = info_->nextMolecule(mi)) {
529          for(cg = mol->beginCutoffGroup(ci); cg != NULL;
530              cg = mol->nextCutoffGroup(ci)) {
531 +          cerr << "branch1\n";
532 +          cerr << "globind = " << cg->getGlobalIndex() << "\n";
533            cg->updateCOM();
534          }
535        }      
536      } else {
537        // center of mass of the group is the same as position of the atom  
538        // if cutoff group does not exist
539 +      cerr << "branch2\n";
540        cgConfig->position = config->position;
541      }
542  
# Line 614 | Line 623 | namespace OpenMD {
623              for (vector<int>::iterator jb = atomListColumn.begin();
624                   jb != atomListColumn.end(); ++jb) {              
625                atom2 = (*jb);
626 <            
626 >
627                if (!fDecomp_->skipAtomPair(atom1, atom2)) {
628                  vpair = 0.0;
629                  workPot = 0.0;
# Line 629 | Line 638 | namespace OpenMD {
638                  if (atomListRow.size() == 1 && atomListColumn.size() == 1) {
639                    idat.d = &d_grp;
640                    idat.r2 = &rgrpsq;
641 +                  cerr << "dgrp = " << d_grp << "\n";
642                  } else {
643                    d = fDecomp_->getInteratomicVector(atom1, atom2);
644                    curSnapshot->wrapVector( d );
645                    r2 = d.lengthSquare();
646 +                  cerr << "datm = " << d<< "\n";
647                    idat.d = &d;
648                    idat.r2 = &r2;
649                  }
650                  
651 +                cerr << "idat.d = " << *(idat.d) << "\n";
652                  r = sqrt( *(idat.r2) );
653                  idat.rij = &r;
654                
# Line 645 | Line 657 | namespace OpenMD {
657                  } else {
658                    interactionMan_->doPair(idat);
659                    fDecomp_->unpackInteractionData(idat, atom1, atom2);
660 +
661 +                  cerr << "d = " << *(idat.d) << "\tv=" << vpair << "\tf=" << f1 << "\n";
662                    vij += vpair;
663                    fij += f1;
664                    tau -= outProduct( *(idat.d), f1);
# Line 708 | Line 722 | namespace OpenMD {
722        }
723  
724        if (iLoop == PREPAIR_LOOP) {
725 <        if (info_->requiresPrepair()) {            
725 >        if (info_->requiresPrepair()) {
726 >
727            fDecomp_->collectIntermediateData();
728  
729            for (int atom1 = 0; atom1 < info_->getNAtoms(); atom1++) {
730              fDecomp_->fillSelfData(sdat, atom1);
731              interactionMan_->doPreForce(sdat);
732            }
733 <          
734 <          
735 <          fDecomp_->distributeIntermediateData();        
733 >
734 >          fDecomp_->distributeIntermediateData();
735 >
736          }
737        }
738  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines