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 1480 by gezelter, Mon Jul 26 19:50:53 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 >    eam_ = EAM::Instance();
69 >    eam_->setForceField(info_->getForceField());
70 >  }
71 >
72 >  void ForceManager::calcForces() {
73      
74      if (!info_->isFortranInitialized()) {
75        info_->update();
# Line 67 | Line 79 | namespace oopse {
79      
80      calcShortRangeInteraction();
81  
82 <    calcLongRangeInteraction(needPotential, needStress);
82 >    calcLongRangeInteraction();
83  
84 <    postCalculation(needStress);
84 >    postCalculation();
85      
86    }
87    
# Line 83 | Line 95 | namespace oopse {
95      
96      // forces are zeroed here, before any are accumulated.
97      // NOTE: do not rezero the forces in Fortran.
98 <
98 >    
99      for (mol = info_->beginMolecule(mi); mol != NULL;
100           mol = info_->nextMolecule(mi)) {
101        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
102          atom->zeroForcesAndTorques();
103        }
104 <      
104 >          
105        //change the positions of atoms which belong to the rigidbodies
106        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
107             rb = mol->nextRigidBody(rbIter)) {
108          rb->zeroForcesAndTorques();
109        }        
110 +          
111      }
112      
113      // Zero out the stress tensor
# Line 108 | Line 121 | namespace oopse {
121      Bond* bond;
122      Bend* bend;
123      Torsion* torsion;
124 +    Inversion* inversion;
125      SimInfo::MoleculeIterator mi;
126      Molecule::RigidBodyIterator rbIter;
127      Molecule::BondIterator bondIter;;
128      Molecule::BendIterator  bendIter;
129      Molecule::TorsionIterator  torsionIter;
130 +    Molecule::InversionIterator  inversionIter;
131      RealType bondPotential = 0.0;
132      RealType bendPotential = 0.0;
133      RealType torsionPotential = 0.0;
134 +    RealType inversionPotential = 0.0;
135  
136      //calculate short range interactions    
137      for (mol = info_->beginMolecule(mi); mol != NULL;
# Line 139 | Line 155 | namespace oopse {
155          RealType angle;
156          bend->calcForce(angle);
157          RealType currBendPot = bend->getPotential();          
158 +        
159          bendPotential += bend->getPotential();
160          std::map<Bend*, BendDataSet>::iterator i = bendDataSets.find(bend);
161          if (i == bendDataSets.end()) {
# Line 175 | Line 192 | namespace oopse {
192            i->second.prev.potential = i->second.curr.potential;
193            i->second.curr.angle = angle;
194            i->second.curr.potential = currTorsionPot;
195 +          i->second.deltaV =  fabs(i->second.curr.potential -  
196 +                                   i->second.prev.potential);
197 +        }      
198 +      }      
199 +
200 +      for (inversion = mol->beginInversion(inversionIter);
201 +           inversion != NULL;
202 +           inversion = mol->nextInversion(inversionIter)) {
203 +        RealType angle;
204 +        inversion->calcForce(angle);
205 +        RealType currInversionPot = inversion->getPotential();
206 +        inversionPotential += inversion->getPotential();
207 +        std::map<Inversion*, InversionDataSet>::iterator i = inversionDataSets.find(inversion);
208 +        if (i == inversionDataSets.end()) {
209 +          InversionDataSet dataSet;
210 +          dataSet.prev.angle = dataSet.curr.angle = angle;
211 +          dataSet.prev.potential = dataSet.curr.potential = currInversionPot;
212 +          dataSet.deltaV = 0.0;
213 +          inversionDataSets.insert(std::map<Inversion*, InversionDataSet>::value_type(inversion, dataSet));
214 +        }else {
215 +          i->second.prev.angle = i->second.curr.angle;
216 +          i->second.prev.potential = i->second.curr.potential;
217 +          i->second.curr.angle = angle;
218 +          i->second.curr.potential = currInversionPot;
219            i->second.deltaV =  fabs(i->second.curr.potential -  
220                                     i->second.prev.potential);
221          }      
# Line 182 | Line 223 | namespace oopse {
223      }
224      
225      RealType  shortRangePotential = bondPotential + bendPotential +
226 <      torsionPotential;    
226 >      torsionPotential +  inversionPotential;    
227      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
228      curSnapshot->statData[Stats::SHORT_RANGE_POTENTIAL] = shortRangePotential;
229      curSnapshot->statData[Stats::BOND_POTENTIAL] = bondPotential;
230      curSnapshot->statData[Stats::BEND_POTENTIAL] = bendPotential;
231      curSnapshot->statData[Stats::DIHEDRAL_POTENTIAL] = torsionPotential;
232 +    curSnapshot->statData[Stats::INVERSION_POTENTIAL] = inversionPotential;
233      
234    }
235    
236 <  void ForceManager::calcLongRangeInteraction(bool needPotential,
195 <                                              bool needStress) {
236 >  void ForceManager::calcLongRangeInteraction() {
237      Snapshot* curSnapshot;
238      DataStorage* config;
239      RealType* frc;
# Line 201 | Line 242 | namespace oopse {
242      RealType* A;
243      RealType* electroFrame;
244      RealType* rc;
245 +    RealType* particlePot;
246      
247      //get current snapshot from SimInfo
248      curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
# Line 212 | Line 254 | namespace oopse {
254      trq = config->getArrayPointer(DataStorage::dslTorque);
255      A   = config->getArrayPointer(DataStorage::dslAmat);
256      electroFrame = config->getArrayPointer(DataStorage::dslElectroFrame);
257 +    particlePot = config->getArrayPointer(DataStorage::dslParticlePot);
258  
259      //calculate the center of mass of cutoff group
260      SimInfo::MoleculeIterator mi;
# Line 243 | Line 286 | namespace oopse {
286      RealType longRangePotential[LR_POT_TYPES];
287      RealType lrPot = 0.0;
288      Vector3d totalDipole;
246    short int passedCalcPot = needPotential;
247    short int passedCalcStress = needStress;
289      int isError = 0;
290  
291      for (int i=0; i<LR_POT_TYPES;i++){
# Line 259 | Line 300 | namespace oopse {
300                  trq,
301                  tau.getArrayPointer(),
302                  longRangePotential,
303 <                &passedCalcPot,
263 <                &passedCalcStress,
303 >                particlePot,
304                  &isError );
305      
306      if( isError ){
# Line 289 | Line 329 | namespace oopse {
329    }
330  
331    
332 <  void ForceManager::postCalculation(bool needStress) {
332 >  void ForceManager::postCalculation() {
333      SimInfo::MoleculeIterator mi;
334      Molecule* mol;
335      Molecule::RigidBodyIterator rbIter;
# Line 302 | Line 342 | namespace oopse {
342           mol = info_->nextMolecule(mi)) {
343        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
344             rb = mol->nextRigidBody(rbIter)) {
345 <        if (needStress) {          
346 <          Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial();
307 <          tau += rbTau;
308 <        } else{
309 <          rb->calcForcesAndTorques();
310 <        }
345 >        Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial();
346 >        tau += rbTau;
347        }
348      }
349 <
314 <    if (needStress) {
349 >    
350   #ifdef IS_MPI
351 <      Mat3x3d tmpTau(tau);
352 <      MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(),
353 <                    9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
351 >    Mat3x3d tmpTau(tau);
352 >    MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(),
353 >                  9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
354   #endif
355 <      curSnapshot->statData.setTau(tau);
321 <    }
355 >    curSnapshot->statData.setTau(tau);
356    }
357  
358 < } //end namespace oopse
358 > } //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 1480 by gezelter, Mon Jul 26 19:50:53 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines