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

Comparing:
trunk/src/brains/ForceManager.cpp (file contents), Revision 1215 by xsun, Wed Jan 23 21:22:37 2008 UTC vs.
branches/development/src/brains/ForceManager.cpp (file contents), Revision 1489 by gezelter, Tue Aug 10 18:34:59 2010 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
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).                        
40   */
41  
42   /**
# Line 50 | Line 50
50   #include "brains/ForceManager.hpp"
51   #include "primitives/Molecule.hpp"
52   #include "UseTheForce/doForces_interface.h"
53 < #define __C
53 > #define __OPENMD_C
54   #include "UseTheForce/DarkSide/fInteractionMap.h"
55   #include "utils/simError.h"
56   #include "primitives/Bond.hpp"
57   #include "primitives/Bend.hpp"
58 < namespace oopse {
58 > #include "primitives/Torsion.hpp"
59 > #include "primitives/Inversion.hpp"
60  
61 <  void ForceManager::calcForces(bool needPotential, bool needStress) {
61 > namespace OpenMD {
62 >  
63 >  ForceManager::ForceManager(SimInfo * info) : info_(info),
64 >                                               NBforcesInitialized_(false) {
65 >    lj_ = LJ::Instance();
66 >    lj_->setForceField(info_->getForceField());
67 >
68 >    gb_ = GB::Instance();
69 >    gb_->setForceField(info_->getForceField());
70 >
71 >    sticky_ = Sticky::Instance();
72 >    sticky_->setForceField(info_->getForceField());
73 >
74 >    eam_ = EAM::Instance();
75 >    eam_->setForceField(info_->getForceField());
76 >
77 >    sc_ = SC::Instance();
78 >    sc_->setForceField(info_->getForceField());
79 >  }
80 >
81 >  void ForceManager::calcForces() {
82      
83      if (!info_->isFortranInitialized()) {
84        info_->update();
# Line 67 | Line 88 | namespace oopse {
88      
89      calcShortRangeInteraction();
90  
91 <    calcLongRangeInteraction(needPotential, needStress);
91 >    calcLongRangeInteraction();
92  
93 <    postCalculation(needStress);
93 >    postCalculation();
94      
95    }
96    
# Line 83 | Line 104 | namespace oopse {
104      
105      // forces are zeroed here, before any are accumulated.
106      // NOTE: do not rezero the forces in Fortran.
107 <
107 >    
108      for (mol = info_->beginMolecule(mi); mol != NULL;
109           mol = info_->nextMolecule(mi)) {
110        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
111          atom->zeroForcesAndTorques();
112        }
113 <      
113 >          
114        //change the positions of atoms which belong to the rigidbodies
115        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
116             rb = mol->nextRigidBody(rbIter)) {
117          rb->zeroForcesAndTorques();
118        }        
119 +          
120      }
121      
122      // Zero out the stress tensor
# Line 108 | Line 130 | namespace oopse {
130      Bond* bond;
131      Bend* bend;
132      Torsion* torsion;
133 +    Inversion* inversion;
134      SimInfo::MoleculeIterator mi;
135      Molecule::RigidBodyIterator rbIter;
136      Molecule::BondIterator bondIter;;
137      Molecule::BendIterator  bendIter;
138      Molecule::TorsionIterator  torsionIter;
139 +    Molecule::InversionIterator  inversionIter;
140      RealType bondPotential = 0.0;
141      RealType bendPotential = 0.0;
142      RealType torsionPotential = 0.0;
143 +    RealType inversionPotential = 0.0;
144  
145      //calculate short range interactions    
146      for (mol = info_->beginMolecule(mi); mol != NULL;
# Line 139 | Line 164 | namespace oopse {
164          RealType angle;
165          bend->calcForce(angle);
166          RealType currBendPot = bend->getPotential();          
167 +        
168          bendPotential += bend->getPotential();
169          std::map<Bend*, BendDataSet>::iterator i = bendDataSets.find(bend);
170          if (i == bendDataSets.end()) {
# Line 179 | Line 205 | namespace oopse {
205                                     i->second.prev.potential);
206          }      
207        }      
208 +
209 +      for (inversion = mol->beginInversion(inversionIter);
210 +           inversion != NULL;
211 +           inversion = mol->nextInversion(inversionIter)) {
212 +        RealType angle;
213 +        inversion->calcForce(angle);
214 +        RealType currInversionPot = inversion->getPotential();
215 +        inversionPotential += inversion->getPotential();
216 +        std::map<Inversion*, InversionDataSet>::iterator i = inversionDataSets.find(inversion);
217 +        if (i == inversionDataSets.end()) {
218 +          InversionDataSet dataSet;
219 +          dataSet.prev.angle = dataSet.curr.angle = angle;
220 +          dataSet.prev.potential = dataSet.curr.potential = currInversionPot;
221 +          dataSet.deltaV = 0.0;
222 +          inversionDataSets.insert(std::map<Inversion*, InversionDataSet>::value_type(inversion, dataSet));
223 +        }else {
224 +          i->second.prev.angle = i->second.curr.angle;
225 +          i->second.prev.potential = i->second.curr.potential;
226 +          i->second.curr.angle = angle;
227 +          i->second.curr.potential = currInversionPot;
228 +          i->second.deltaV =  fabs(i->second.curr.potential -  
229 +                                   i->second.prev.potential);
230 +        }      
231 +      }      
232      }
233      
234      RealType  shortRangePotential = bondPotential + bendPotential +
235 <      torsionPotential;    
235 >      torsionPotential +  inversionPotential;    
236      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
237      curSnapshot->statData[Stats::SHORT_RANGE_POTENTIAL] = shortRangePotential;
238      curSnapshot->statData[Stats::BOND_POTENTIAL] = bondPotential;
239      curSnapshot->statData[Stats::BEND_POTENTIAL] = bendPotential;
240      curSnapshot->statData[Stats::DIHEDRAL_POTENTIAL] = torsionPotential;
241 +    curSnapshot->statData[Stats::INVERSION_POTENTIAL] = inversionPotential;
242      
243    }
244    
245 <  void ForceManager::calcLongRangeInteraction(bool needPotential,
195 <                                              bool needStress) {
245 >  void ForceManager::calcLongRangeInteraction() {
246      Snapshot* curSnapshot;
247      DataStorage* config;
248      RealType* frc;
# Line 201 | Line 251 | namespace oopse {
251      RealType* A;
252      RealType* electroFrame;
253      RealType* rc;
254 +    RealType* particlePot;
255      
256      //get current snapshot from SimInfo
257      curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
# Line 212 | Line 263 | namespace oopse {
263      trq = config->getArrayPointer(DataStorage::dslTorque);
264      A   = config->getArrayPointer(DataStorage::dslAmat);
265      electroFrame = config->getArrayPointer(DataStorage::dslElectroFrame);
266 +    particlePot = config->getArrayPointer(DataStorage::dslParticlePot);
267  
268      //calculate the center of mass of cutoff group
269      SimInfo::MoleculeIterator mi;
# Line 243 | Line 295 | namespace oopse {
295      RealType longRangePotential[LR_POT_TYPES];
296      RealType lrPot = 0.0;
297      Vector3d totalDipole;
246    short int passedCalcPot = needPotential;
247    short int passedCalcStress = needStress;
298      int isError = 0;
299  
300      for (int i=0; i<LR_POT_TYPES;i++){
# Line 259 | Line 309 | namespace oopse {
309                  trq,
310                  tau.getArrayPointer(),
311                  longRangePotential,
312 <                &passedCalcPot,
263 <                &passedCalcStress,
312 >                particlePot,
313                  &isError );
314      
315      if( isError ){
# Line 289 | Line 338 | namespace oopse {
338    }
339  
340    
341 <  void ForceManager::postCalculation(bool needStress) {
341 >  void ForceManager::postCalculation() {
342      SimInfo::MoleculeIterator mi;
343      Molecule* mol;
344      Molecule::RigidBodyIterator rbIter;
# Line 302 | Line 351 | namespace oopse {
351           mol = info_->nextMolecule(mi)) {
352        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
353             rb = mol->nextRigidBody(rbIter)) {
354 <        if (needStress) {          
355 <          Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial();
307 <          tau += rbTau;
308 <        } else{
309 <          rb->calcForcesAndTorques();
310 <        }
354 >        Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial();
355 >        tau += rbTau;
356        }
357      }
358 <
314 <    if (needStress) {
358 >    
359   #ifdef IS_MPI
360 <      Mat3x3d tmpTau(tau);
361 <      MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(),
362 <                    9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
360 >    Mat3x3d tmpTau(tau);
361 >    MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(),
362 >                  9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
363   #endif
364 <      curSnapshot->statData.setTau(tau);
321 <    }
364 >    curSnapshot->statData.setTau(tau);
365    }
366  
367 < } //end namespace oopse
367 > } //end namespace OpenMD

Comparing:
trunk/src/brains/ForceManager.cpp (property svn:keywords), Revision 1215 by xsun, Wed Jan 23 21:22:37 2008 UTC vs.
branches/development/src/brains/ForceManager.cpp (property svn:keywords), Revision 1489 by gezelter, Tue Aug 10 18:34:59 2010 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines