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 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 __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 >    eam_ = EAM::Instance();
69 >    eam_->setForceField(info_->getForceField());
70 >  }
71 >
72 >  void ForceManager::calcForces() {
73      
74      if (!info_->isFortranInitialized()) {
75        info_->update();
# Line 69 | Line 79 | namespace oopse {
79      
80      calcShortRangeInteraction();
81  
82 <    calcLongRangeInteraction(needPotential, needStress);
82 >    calcLongRangeInteraction();
83  
84 <    postCalculation(needStress);
84 >    postCalculation();
85      
86    }
87    
# Line 145 | 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 222 | Line 233 | namespace oopse {
233      
234    }
235    
236 <  void ForceManager::calcLongRangeInteraction(bool needPotential,
226 <                                              bool needStress) {
236 >  void ForceManager::calcLongRangeInteraction() {
237      Snapshot* curSnapshot;
238      DataStorage* config;
239      RealType* frc;
# Line 276 | Line 286 | namespace oopse {
286      RealType longRangePotential[LR_POT_TYPES];
287      RealType lrPot = 0.0;
288      Vector3d totalDipole;
279    short int passedCalcPot = needPotential;
280    short int passedCalcStress = needStress;
289      int isError = 0;
290  
291      for (int i=0; i<LR_POT_TYPES;i++){
# Line 293 | Line 301 | namespace oopse {
301                  tau.getArrayPointer(),
302                  longRangePotential,
303                  particlePot,
296                &passedCalcPot,
297                &passedCalcStress,
304                  &isError );
305      
306      if( isError ){
# Line 323 | 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 336 | 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();
341 <          tau += rbTau;
342 <        } else{
343 <          rb->calcForcesAndTorques();
344 <        }
345 >        Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial();
346 >        tau += rbTau;
347        }
348      }
349 <
348 <    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);
355 <    }
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 1292 by chuckv, Fri Sep 12 20:51:22 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