| 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. | 
| 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 |  | /** | 
| 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 | > | namespace OpenMD { | 
| 61 |  |  | 
| 62 | < | void ForceManager::calcForces(bool needPotential, bool needStress) { | 
| 62 | > | void ForceManager::calcForces() { | 
| 63 |  |  | 
| 64 |  | if (!info_->isFortranInitialized()) { | 
| 65 |  | info_->update(); | 
| 69 |  |  | 
| 70 |  | calcShortRangeInteraction(); | 
| 71 |  |  | 
| 72 | < | calcLongRangeInteraction(needPotential, needStress); | 
| 72 | > | calcLongRangeInteraction(); | 
| 73 |  |  | 
| 74 | < | postCalculation(needStress); | 
| 74 | > | postCalculation(); | 
| 75 |  |  | 
| 76 |  | } | 
| 77 |  |  | 
| 145 |  | RealType angle; | 
| 146 |  | bend->calcForce(angle); | 
| 147 |  | RealType currBendPot = bend->getPotential(); | 
| 148 | + |  | 
| 149 |  | bendPotential += bend->getPotential(); | 
| 150 |  | std::map<Bend*, BendDataSet>::iterator i = bendDataSets.find(bend); | 
| 151 |  | if (i == bendDataSets.end()) { | 
| 223 |  |  | 
| 224 |  | } | 
| 225 |  |  | 
| 226 | < | void ForceManager::calcLongRangeInteraction(bool needPotential, | 
| 226 | < | bool needStress) { | 
| 226 | > | void ForceManager::calcLongRangeInteraction() { | 
| 227 |  | Snapshot* curSnapshot; | 
| 228 |  | DataStorage* config; | 
| 229 |  | RealType* frc; | 
| 276 |  | RealType longRangePotential[LR_POT_TYPES]; | 
| 277 |  | RealType lrPot = 0.0; | 
| 278 |  | Vector3d totalDipole; | 
| 279 | – | short int passedCalcPot = needPotential; | 
| 280 | – | short int passedCalcStress = needStress; | 
| 279 |  | int isError = 0; | 
| 280 |  |  | 
| 281 |  | for (int i=0; i<LR_POT_TYPES;i++){ | 
| 291 |  | tau.getArrayPointer(), | 
| 292 |  | longRangePotential, | 
| 293 |  | particlePot, | 
| 296 | – | &passedCalcPot, | 
| 297 | – | &passedCalcStress, | 
| 294 |  | &isError ); | 
| 295 |  |  | 
| 296 |  | if( isError ){ | 
| 319 |  | } | 
| 320 |  |  | 
| 321 |  |  | 
| 322 | < | void ForceManager::postCalculation(bool needStress) { | 
| 322 | > | void ForceManager::postCalculation() { | 
| 323 |  | SimInfo::MoleculeIterator mi; | 
| 324 |  | Molecule* mol; | 
| 325 |  | Molecule::RigidBodyIterator rbIter; | 
| 332 |  | mol = info_->nextMolecule(mi)) { | 
| 333 |  | for (rb = mol->beginRigidBody(rbIter); rb != NULL; | 
| 334 |  | rb = mol->nextRigidBody(rbIter)) { | 
| 335 | < | if (needStress) { | 
| 336 | < | Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial(); | 
| 341 | < | tau += rbTau; | 
| 342 | < | } else{ | 
| 343 | < | rb->calcForcesAndTorques(); | 
| 344 | < | } | 
| 335 | > | Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial(); | 
| 336 | > | tau += rbTau; | 
| 337 |  | } | 
| 338 |  | } | 
| 339 | < |  | 
| 348 | < | if (needStress) { | 
| 339 | > |  | 
| 340 |  | #ifdef IS_MPI | 
| 341 | < | Mat3x3d tmpTau(tau); | 
| 342 | < | MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(), | 
| 343 | < | 9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD); | 
| 341 | > | Mat3x3d tmpTau(tau); | 
| 342 | > | MPI_Allreduce(tmpTau.getArrayPointer(), tau.getArrayPointer(), | 
| 343 | > | 9, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD); | 
| 344 |  | #endif | 
| 345 | < | curSnapshot->statData.setTau(tau); | 
| 355 | < | } | 
| 345 | > | curSnapshot->statData.setTau(tau); | 
| 346 |  | } | 
| 347 |  |  | 
| 348 | < | } //end namespace oopse | 
| 348 | > | } //end namespace OpenMD |