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 1245 by chuckv, Tue May 27 16:39:06 2008 UTC vs.
branches/development/src/brains/ForceManager.cpp (file contents), Revision 1467 by gezelter, Sat Jul 17 15:33:03 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 > #include "nonbonded/LJ.hpp"
61  
62 <  void ForceManager::calcForces(bool needPotential, bool needStress) {
62 > namespace OpenMD {
63 >
64 >  void ForceManager::calcForces() {
65      
66      if (!info_->isFortranInitialized()) {
67        info_->update();
68      }
69      
70 +    if (!NBforcesInitialized_) {
71 +      LJ* lj = new LJ(info_->getForceField());
72 +      lj->initialize();
73 +    }
74 +
75      preCalculation();
76      
77      calcShortRangeInteraction();
78  
79 <    calcLongRangeInteraction(needPotential, needStress);
79 >    calcLongRangeInteraction();
80  
81 <    postCalculation(needStress);
81 >    postCalculation();
82      
83    }
84    
# Line 109 | Line 118 | namespace oopse {
118      Bond* bond;
119      Bend* bend;
120      Torsion* torsion;
121 +    Inversion* inversion;
122      SimInfo::MoleculeIterator mi;
123      Molecule::RigidBodyIterator rbIter;
124      Molecule::BondIterator bondIter;;
125      Molecule::BendIterator  bendIter;
126      Molecule::TorsionIterator  torsionIter;
127 +    Molecule::InversionIterator  inversionIter;
128      RealType bondPotential = 0.0;
129      RealType bendPotential = 0.0;
130      RealType torsionPotential = 0.0;
131 +    RealType inversionPotential = 0.0;
132  
133      //calculate short range interactions    
134      for (mol = info_->beginMolecule(mi); mol != NULL;
# Line 140 | Line 152 | namespace oopse {
152          RealType angle;
153          bend->calcForce(angle);
154          RealType currBendPot = bend->getPotential();          
155 +        
156          bendPotential += bend->getPotential();
157          std::map<Bend*, BendDataSet>::iterator i = bendDataSets.find(bend);
158          if (i == bendDataSets.end()) {
# Line 180 | Line 193 | namespace oopse {
193                                     i->second.prev.potential);
194          }      
195        }      
196 +
197 +      for (inversion = mol->beginInversion(inversionIter);
198 +           inversion != NULL;
199 +           inversion = mol->nextInversion(inversionIter)) {
200 +        RealType angle;
201 +        inversion->calcForce(angle);
202 +        RealType currInversionPot = inversion->getPotential();
203 +        inversionPotential += inversion->getPotential();
204 +        std::map<Inversion*, InversionDataSet>::iterator i = inversionDataSets.find(inversion);
205 +        if (i == inversionDataSets.end()) {
206 +          InversionDataSet dataSet;
207 +          dataSet.prev.angle = dataSet.curr.angle = angle;
208 +          dataSet.prev.potential = dataSet.curr.potential = currInversionPot;
209 +          dataSet.deltaV = 0.0;
210 +          inversionDataSets.insert(std::map<Inversion*, InversionDataSet>::value_type(inversion, dataSet));
211 +        }else {
212 +          i->second.prev.angle = i->second.curr.angle;
213 +          i->second.prev.potential = i->second.curr.potential;
214 +          i->second.curr.angle = angle;
215 +          i->second.curr.potential = currInversionPot;
216 +          i->second.deltaV =  fabs(i->second.curr.potential -  
217 +                                   i->second.prev.potential);
218 +        }      
219 +      }      
220      }
221      
222      RealType  shortRangePotential = bondPotential + bendPotential +
223 <      torsionPotential;    
223 >      torsionPotential +  inversionPotential;    
224      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
225      curSnapshot->statData[Stats::SHORT_RANGE_POTENTIAL] = shortRangePotential;
226      curSnapshot->statData[Stats::BOND_POTENTIAL] = bondPotential;
227      curSnapshot->statData[Stats::BEND_POTENTIAL] = bendPotential;
228      curSnapshot->statData[Stats::DIHEDRAL_POTENTIAL] = torsionPotential;
229 +    curSnapshot->statData[Stats::INVERSION_POTENTIAL] = inversionPotential;
230      
231    }
232    
233 <  void ForceManager::calcLongRangeInteraction(bool needPotential,
196 <                                              bool needStress) {
233 >  void ForceManager::calcLongRangeInteraction() {
234      Snapshot* curSnapshot;
235      DataStorage* config;
236      RealType* frc;
# Line 246 | Line 283 | namespace oopse {
283      RealType longRangePotential[LR_POT_TYPES];
284      RealType lrPot = 0.0;
285      Vector3d totalDipole;
249    short int passedCalcPot = needPotential;
250    short int passedCalcStress = needStress;
286      int isError = 0;
287  
288      for (int i=0; i<LR_POT_TYPES;i++){
# Line 263 | Line 298 | namespace oopse {
298                  tau.getArrayPointer(),
299                  longRangePotential,
300                  particlePot,
266                &passedCalcPot,
267                &passedCalcStress,
301                  &isError );
302      
303      if( isError ){
# Line 293 | Line 326 | namespace oopse {
326    }
327  
328    
329 <  void ForceManager::postCalculation(bool needStress) {
329 >  void ForceManager::postCalculation() {
330      SimInfo::MoleculeIterator mi;
331      Molecule* mol;
332      Molecule::RigidBodyIterator rbIter;
# Line 306 | Line 339 | namespace oopse {
339           mol = info_->nextMolecule(mi)) {
340        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
341             rb = mol->nextRigidBody(rbIter)) {
342 <        if (needStress) {          
343 <          Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial();
311 <          tau += rbTau;
312 <        } else{
313 <          rb->calcForcesAndTorques();
314 <        }
342 >        Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial();
343 >        tau += rbTau;
344        }
345      }
346 <
318 <    if (needStress) {
346 >    
347   #ifdef IS_MPI
348 <      Mat3x3d tmpTau(tau);
349 <      MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(),
350 <                    9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
348 >    Mat3x3d tmpTau(tau);
349 >    MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(),
350 >                  9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
351   #endif
352 <      curSnapshot->statData.setTau(tau);
325 <    }
352 >    curSnapshot->statData.setTau(tau);
353    }
354  
355 < } //end namespace oopse
355 > } //end namespace OpenMD

Comparing:
trunk/src/brains/ForceManager.cpp (property svn:keywords), Revision 1245 by chuckv, Tue May 27 16:39:06 2008 UTC vs.
branches/development/src/brains/ForceManager.cpp (property svn:keywords), Revision 1467 by gezelter, Sat Jul 17 15:33:03 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines