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 1275 by cli2, Fri Jul 4 20:54:29 2008 UTC vs.
branches/development/src/brains/ForceManager.cpp (file contents), Revision 1485 by gezelter, Wed Jul 28 19:52:00 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   #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 >    sticky_ = Sticky::Instance();
72 >    sticky_->setForceField(info_->getForceField());
73 >
74 >    eam_ = EAM::Instance();
75 >    eam_->setForceField(info_->getForceField());
76 >  }
77 >
78 >  void ForceManager::calcForces() {
79      
80      if (!info_->isFortranInitialized()) {
81        info_->update();
# Line 69 | Line 85 | namespace oopse {
85      
86      calcShortRangeInteraction();
87  
88 <    calcLongRangeInteraction(needPotential, needStress);
88 >    calcLongRangeInteraction();
89  
90 <    postCalculation(needStress);
90 >    postCalculation();
91      
92    }
93    
# Line 145 | Line 161 | namespace oopse {
161          RealType angle;
162          bend->calcForce(angle);
163          RealType currBendPot = bend->getPotential();          
164 +        
165          bendPotential += bend->getPotential();
166          std::map<Bend*, BendDataSet>::iterator i = bendDataSets.find(bend);
167          if (i == bendDataSets.end()) {
# Line 222 | Line 239 | namespace oopse {
239      
240    }
241    
242 <  void ForceManager::calcLongRangeInteraction(bool needPotential,
226 <                                              bool needStress) {
242 >  void ForceManager::calcLongRangeInteraction() {
243      Snapshot* curSnapshot;
244      DataStorage* config;
245      RealType* frc;
# Line 276 | Line 292 | namespace oopse {
292      RealType longRangePotential[LR_POT_TYPES];
293      RealType lrPot = 0.0;
294      Vector3d totalDipole;
279    short int passedCalcPot = needPotential;
280    short int passedCalcStress = needStress;
295      int isError = 0;
296  
297      for (int i=0; i<LR_POT_TYPES;i++){
# Line 293 | Line 307 | namespace oopse {
307                  tau.getArrayPointer(),
308                  longRangePotential,
309                  particlePot,
296                &passedCalcPot,
297                &passedCalcStress,
310                  &isError );
311      
312      if( isError ){
# Line 323 | Line 335 | namespace oopse {
335    }
336  
337    
338 <  void ForceManager::postCalculation(bool needStress) {
338 >  void ForceManager::postCalculation() {
339      SimInfo::MoleculeIterator mi;
340      Molecule* mol;
341      Molecule::RigidBodyIterator rbIter;
# Line 336 | Line 348 | namespace oopse {
348           mol = info_->nextMolecule(mi)) {
349        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
350             rb = mol->nextRigidBody(rbIter)) {
351 <        if (needStress) {          
352 <          Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial();
341 <          tau += rbTau;
342 <        } else{
343 <          rb->calcForcesAndTorques();
344 <        }
351 >        Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial();
352 >        tau += rbTau;
353        }
354      }
355 <
348 <    if (needStress) {
355 >    
356   #ifdef IS_MPI
357 <      Mat3x3d tmpTau(tau);
358 <      MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(),
359 <                    9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
357 >    Mat3x3d tmpTau(tau);
358 >    MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(),
359 >                  9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
360   #endif
361 <      curSnapshot->statData.setTau(tau);
355 <    }
361 >    curSnapshot->statData.setTau(tau);
362    }
363  
364 < } //end namespace oopse
364 > } //end namespace OpenMD

Comparing:
trunk/src/brains/ForceManager.cpp (property svn:keywords), Revision 1275 by cli2, Fri Jul 4 20:54:29 2008 UTC vs.
branches/development/src/brains/ForceManager.cpp (property svn:keywords), Revision 1485 by gezelter, Wed Jul 28 19:52:00 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines