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 1292 by chuckv, Fri Sep 12 20:51:22 2008 UTC vs.
branches/development/src/brains/ForceManager.cpp (file contents), Revision 1483 by gezelter, Tue Jul 27 21:17:31 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 __OOPSE_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   #include "primitives/Torsion.hpp"
59   #include "primitives/Inversion.hpp"
60 namespace oopse {
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 >    eam_ = EAM::Instance();
72 >    eam_->setForceField(info_->getForceField());
73 >  }
74 >
75 >  void ForceManager::calcForces() {
76      
77      if (!info_->isFortranInitialized()) {
78        info_->update();
# Line 69 | Line 82 | namespace oopse {
82      
83      calcShortRangeInteraction();
84  
85 <    calcLongRangeInteraction(needPotential, needStress);
85 >    calcLongRangeInteraction();
86  
87 <    postCalculation(needStress);
87 >    postCalculation();
88      
89    }
90    
# Line 145 | Line 158 | namespace oopse {
158          RealType angle;
159          bend->calcForce(angle);
160          RealType currBendPot = bend->getPotential();          
161 +        
162          bendPotential += bend->getPotential();
163          std::map<Bend*, BendDataSet>::iterator i = bendDataSets.find(bend);
164          if (i == bendDataSets.end()) {
# Line 222 | Line 236 | namespace oopse {
236      
237    }
238    
239 <  void ForceManager::calcLongRangeInteraction(bool needPotential,
226 <                                              bool needStress) {
239 >  void ForceManager::calcLongRangeInteraction() {
240      Snapshot* curSnapshot;
241      DataStorage* config;
242      RealType* frc;
# Line 276 | Line 289 | namespace oopse {
289      RealType longRangePotential[LR_POT_TYPES];
290      RealType lrPot = 0.0;
291      Vector3d totalDipole;
279    short int passedCalcPot = needPotential;
280    short int passedCalcStress = needStress;
292      int isError = 0;
293  
294      for (int i=0; i<LR_POT_TYPES;i++){
# Line 293 | Line 304 | namespace oopse {
304                  tau.getArrayPointer(),
305                  longRangePotential,
306                  particlePot,
296                &passedCalcPot,
297                &passedCalcStress,
307                  &isError );
308      
309      if( isError ){
# Line 323 | Line 332 | namespace oopse {
332    }
333  
334    
335 <  void ForceManager::postCalculation(bool needStress) {
335 >  void ForceManager::postCalculation() {
336      SimInfo::MoleculeIterator mi;
337      Molecule* mol;
338      Molecule::RigidBodyIterator rbIter;
# Line 336 | Line 345 | namespace oopse {
345           mol = info_->nextMolecule(mi)) {
346        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
347             rb = mol->nextRigidBody(rbIter)) {
348 <        if (needStress) {          
349 <          Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial();
341 <          tau += rbTau;
342 <        } else{
343 <          rb->calcForcesAndTorques();
344 <        }
348 >        Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial();
349 >        tau += rbTau;
350        }
351      }
352 <
348 <    if (needStress) {
352 >    
353   #ifdef IS_MPI
354 <      Mat3x3d tmpTau(tau);
355 <      MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(),
356 <                    9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
354 >    Mat3x3d tmpTau(tau);
355 >    MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(),
356 >                  9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
357   #endif
358 <      curSnapshot->statData.setTau(tau);
355 <    }
358 >    curSnapshot->statData.setTau(tau);
359    }
360  
361 < } //end namespace oopse
361 > } //end namespace OpenMD

Comparing:
trunk/src/brains/ForceManager.cpp (property svn:keywords), Revision 1292 by chuckv, Fri Sep 12 20:51:22 2008 UTC vs.
branches/development/src/brains/ForceManager.cpp (property svn:keywords), Revision 1483 by gezelter, Tue Jul 27 21:17:31 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines