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 998 by chrisfen, Mon Jul 3 13:18:43 2006 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 __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/Bend.hpp"
59 < namespace oopse {
58 > #include "primitives/Torsion.hpp"
59 > #include "primitives/Inversion.hpp"
60  
61 < /*
62 <  struct BendOrderStruct {
63 <    Bend* bend;
64 <    BendDataSet dataSet;
65 <  };
66 <  struct TorsionOrderStruct {
66 <    Torsion* torsion;
67 <    TorsionDataSet dataSet;
68 <  };
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 <  bool  BendSortFunctor(const BendOrderStruct& b1, const BendOrderStruct& b2) {
69 <    return b1.dataSet.deltaV < b2.dataSet.deltaV;
72 <  }
68 >    gb_ = GB::Instance();
69 >    gb_->setForceField(info_->getForceField());
70  
71 <  bool  TorsionSortFunctor(const TorsionOrderStruct& t1, const TorsionOrderStruct& t2) {
72 <    return t1.dataSet.deltaV < t2.dataSet.deltaV;
71 >    eam_ = EAM::Instance();
72 >    eam_->setForceField(info_->getForceField());
73    }
74 <  */
75 <  void ForceManager::calcForces(bool needPotential, bool needStress) {
76 <
74 >
75 >  void ForceManager::calcForces() {
76 >    
77      if (!info_->isFortranInitialized()) {
78        info_->update();
79      }
80 <
80 >    
81      preCalculation();
82      
83      calcShortRangeInteraction();
84  
85 <    calcLongRangeInteraction(needPotential, needStress);
85 >    calcLongRangeInteraction();
86  
87      postCalculation();
91
92 /*
93    std::vector<BendOrderStruct> bendOrderStruct;
94    for(std::map<Bend*, BendDataSet>::iterator i = bendDataSets.begin(); i != bendDataSets.end(); ++i) {
95        BendOrderStruct tmp;
96        tmp.bend= const_cast<Bend*>(i->first);
97        tmp.dataSet = i->second;
98        bendOrderStruct.push_back(tmp);
99    }
100
101    std::vector<TorsionOrderStruct> torsionOrderStruct;
102    for(std::map<Torsion*, TorsionDataSet>::iterator j = torsionDataSets.begin(); j != torsionDataSets.end(); ++j) {
103        TorsionOrderStruct tmp;
104        tmp.torsion = const_cast<Torsion*>(j->first);
105        tmp.dataSet = j->second;
106        torsionOrderStruct.push_back(tmp);
107    }
88      
109    std::sort(bendOrderStruct.begin(), bendOrderStruct.end(), std::ptr_fun(BendSortFunctor));
110    std::sort(torsionOrderStruct.begin(), torsionOrderStruct.end(), std::ptr_fun(TorsionSortFunctor));
111    for (std::vector<BendOrderStruct>::iterator k = bendOrderStruct.begin(); k != bendOrderStruct.end(); ++k) {
112        Bend* bend = k->bend;
113        std::cout << "Bend: atom1=" <<bend->getAtomA()->getGlobalIndex() << ",atom2 = "<< bend->getAtomB()->getGlobalIndex() << ",atom3="<<bend->getAtomC()->getGlobalIndex() << " ";
114        std::cout << "deltaV=" << k->dataSet.deltaV << ",p_theta=" << k->dataSet.prev.angle <<",p_pot=" << k->dataSet.prev.potential<< ",c_theta=" << k->dataSet.curr.angle << ", c_pot = " << k->dataSet.curr.potential <<std::endl;
115    }
116    for (std::vector<TorsionOrderStruct>::iterator l = torsionOrderStruct.begin(); l != torsionOrderStruct.end(); ++l) {
117        Torsion* torsion = l->torsion;
118        std::cout << "Torsion: atom1=" <<torsion->getAtomA()->getGlobalIndex() << ",atom2 = "<< torsion->getAtomB()->getGlobalIndex() << ",atom3="<<torsion->getAtomC()->getGlobalIndex() << ",atom4="<<torsion->getAtomD()->getGlobalIndex()<< " ";
119        std::cout << "deltaV=" << l->dataSet.deltaV << ",p_theta=" << l->dataSet.prev.angle <<",p_pot=" << l->dataSet.prev.potential<< ",c_theta=" << l->dataSet.curr.angle << ", c_pot = " << l->dataSet.curr.potential <<std::endl;
120    }
121   */
89    }
90 <
90 >  
91    void ForceManager::preCalculation() {
92      SimInfo::MoleculeIterator mi;
93      Molecule* mol;
# Line 131 | Line 98 | namespace oopse {
98      
99      // forces are zeroed here, before any are accumulated.
100      // NOTE: do not rezero the forces in Fortran.
101 <    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
101 >    
102 >    for (mol = info_->beginMolecule(mi); mol != NULL;
103 >         mol = info_->nextMolecule(mi)) {
104        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
105          atom->zeroForcesAndTorques();
106        }
107 <        
107 >          
108        //change the positions of atoms which belong to the rigidbodies
109 <      for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
109 >      for (rb = mol->beginRigidBody(rbIter); rb != NULL;
110 >           rb = mol->nextRigidBody(rbIter)) {
111          rb->zeroForcesAndTorques();
112        }        
113 +          
114      }
115      
116 +    // Zero out the stress tensor
117 +    tau *= 0.0;
118 +    
119    }
120 <
120 >  
121    void ForceManager::calcShortRangeInteraction() {
122      Molecule* mol;
123      RigidBody* rb;
124      Bond* bond;
125      Bend* bend;
126      Torsion* torsion;
127 +    Inversion* inversion;
128      SimInfo::MoleculeIterator mi;
129      Molecule::RigidBodyIterator rbIter;
130      Molecule::BondIterator bondIter;;
131      Molecule::BendIterator  bendIter;
132      Molecule::TorsionIterator  torsionIter;
133 +    Molecule::InversionIterator  inversionIter;
134      RealType bondPotential = 0.0;
135      RealType bendPotential = 0.0;
136      RealType torsionPotential = 0.0;
137 +    RealType inversionPotential = 0.0;
138  
139      //calculate short range interactions    
140 <    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
140 >    for (mol = info_->beginMolecule(mi); mol != NULL;
141 >         mol = info_->nextMolecule(mi)) {
142  
143        //change the positions of atoms which belong to the rigidbodies
144 <      for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
145 <          rb->updateAtoms();
144 >      for (rb = mol->beginRigidBody(rbIter); rb != NULL;
145 >           rb = mol->nextRigidBody(rbIter)) {
146 >        rb->updateAtoms();
147        }
148  
149 <      for (bond = mol->beginBond(bondIter); bond != NULL; bond = mol->nextBond(bondIter)) {
149 >      for (bond = mol->beginBond(bondIter); bond != NULL;
150 >           bond = mol->nextBond(bondIter)) {
151          bond->calcForce();
152          bondPotential += bond->getPotential();
153        }
154  
155 <
156 <      for (bend = mol->beginBend(bendIter); bend != NULL; bend = mol->nextBend(bendIter)) {
157 <
178 <          RealType angle;
179 <            bend->calcForce(angle);
180 <          RealType currBendPot = bend->getPotential();          
181 <            bendPotential += bend->getPotential();
182 <          std::map<Bend*, BendDataSet>::iterator i = bendDataSets.find(bend);
183 <          if (i == bendDataSets.end()) {
184 <            BendDataSet dataSet;
185 <            dataSet.prev.angle = dataSet.curr.angle = angle;
186 <            dataSet.prev.potential = dataSet.curr.potential = currBendPot;
187 <            dataSet.deltaV = 0.0;
188 <            bendDataSets.insert(std::map<Bend*, BendDataSet>::value_type(bend, dataSet));
189 <          }else {
190 <            i->second.prev.angle = i->second.curr.angle;
191 <            i->second.prev.potential = i->second.curr.potential;
192 <            i->second.curr.angle = angle;
193 <            i->second.curr.potential = currBendPot;
194 <            i->second.deltaV =  fabs(i->second.curr.potential -  i->second.prev.potential);
195 <          }
196 <      }
197 <
198 <      for (torsion = mol->beginTorsion(torsionIter); torsion != NULL; torsion = mol->nextTorsion(torsionIter)) {
155 >      for (bend = mol->beginBend(bendIter); bend != NULL;
156 >           bend = mol->nextBend(bendIter)) {
157 >        
158          RealType angle;
159 <          torsion->calcForce(angle);
160 <        RealType currTorsionPot = torsion->getPotential();
161 <          torsionPotential += torsion->getPotential();
162 <          std::map<Torsion*, TorsionDataSet>::iterator i = torsionDataSets.find(torsion);
163 <          if (i == torsionDataSets.end()) {
164 <            TorsionDataSet dataSet;
165 <            dataSet.prev.angle = dataSet.curr.angle = angle;
166 <            dataSet.prev.potential = dataSet.curr.potential = currTorsionPot;
167 <            dataSet.deltaV = 0.0;
168 <            torsionDataSets.insert(std::map<Torsion*, TorsionDataSet>::value_type(torsion, dataSet));
169 <          }else {
170 <            i->second.prev.angle = i->second.curr.angle;
171 <            i->second.prev.potential = i->second.curr.potential;
172 <            i->second.curr.angle = angle;
173 <            i->second.curr.potential = currTorsionPot;
174 <            i->second.deltaV =  fabs(i->second.curr.potential -  i->second.prev.potential);
175 <          }      
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()) {
165 >          BendDataSet dataSet;
166 >          dataSet.prev.angle = dataSet.curr.angle = angle;
167 >          dataSet.prev.potential = dataSet.curr.potential = currBendPot;
168 >          dataSet.deltaV = 0.0;
169 >          bendDataSets.insert(std::map<Bend*, BendDataSet>::value_type(bend, dataSet));
170 >        }else {
171 >          i->second.prev.angle = i->second.curr.angle;
172 >          i->second.prev.potential = i->second.curr.potential;
173 >          i->second.curr.angle = angle;
174 >          i->second.curr.potential = currBendPot;
175 >          i->second.deltaV =  fabs(i->second.curr.potential -  
176 >                                   i->second.prev.potential);
177 >        }
178        }
179 +      
180 +      for (torsion = mol->beginTorsion(torsionIter); torsion != NULL;
181 +           torsion = mol->nextTorsion(torsionIter)) {
182 +        RealType angle;
183 +        torsion->calcForce(angle);
184 +        RealType currTorsionPot = torsion->getPotential();
185 +        torsionPotential += torsion->getPotential();
186 +        std::map<Torsion*, TorsionDataSet>::iterator i = torsionDataSets.find(torsion);
187 +        if (i == torsionDataSets.end()) {
188 +          TorsionDataSet dataSet;
189 +          dataSet.prev.angle = dataSet.curr.angle = angle;
190 +          dataSet.prev.potential = dataSet.curr.potential = currTorsionPot;
191 +          dataSet.deltaV = 0.0;
192 +          torsionDataSets.insert(std::map<Torsion*, TorsionDataSet>::value_type(torsion, dataSet));
193 +        }else {
194 +          i->second.prev.angle = i->second.curr.angle;
195 +          i->second.prev.potential = i->second.curr.potential;
196 +          i->second.curr.angle = angle;
197 +          i->second.curr.potential = currTorsionPot;
198 +          i->second.deltaV =  fabs(i->second.curr.potential -  
199 +                                   i->second.prev.potential);
200 +        }      
201 +      }      
202  
203 +      for (inversion = mol->beginInversion(inversionIter);
204 +           inversion != NULL;
205 +           inversion = mol->nextInversion(inversionIter)) {
206 +        RealType angle;
207 +        inversion->calcForce(angle);
208 +        RealType currInversionPot = inversion->getPotential();
209 +        inversionPotential += inversion->getPotential();
210 +        std::map<Inversion*, InversionDataSet>::iterator i = inversionDataSets.find(inversion);
211 +        if (i == inversionDataSets.end()) {
212 +          InversionDataSet dataSet;
213 +          dataSet.prev.angle = dataSet.curr.angle = angle;
214 +          dataSet.prev.potential = dataSet.curr.potential = currInversionPot;
215 +          dataSet.deltaV = 0.0;
216 +          inversionDataSets.insert(std::map<Inversion*, InversionDataSet>::value_type(inversion, dataSet));
217 +        }else {
218 +          i->second.prev.angle = i->second.curr.angle;
219 +          i->second.prev.potential = i->second.curr.potential;
220 +          i->second.curr.angle = angle;
221 +          i->second.curr.potential = currInversionPot;
222 +          i->second.deltaV =  fabs(i->second.curr.potential -  
223 +                                   i->second.prev.potential);
224 +        }      
225 +      }      
226      }
227      
228 <    RealType  shortRangePotential = bondPotential + bendPotential + torsionPotential;    
228 >    RealType  shortRangePotential = bondPotential + bendPotential +
229 >      torsionPotential +  inversionPotential;    
230      Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
231      curSnapshot->statData[Stats::SHORT_RANGE_POTENTIAL] = shortRangePotential;
232      curSnapshot->statData[Stats::BOND_POTENTIAL] = bondPotential;
233      curSnapshot->statData[Stats::BEND_POTENTIAL] = bendPotential;
234      curSnapshot->statData[Stats::DIHEDRAL_POTENTIAL] = torsionPotential;
235 +    curSnapshot->statData[Stats::INVERSION_POTENTIAL] = inversionPotential;
236      
237    }
238 <
239 <  void ForceManager::calcLongRangeInteraction(bool needPotential, bool needStress) {
238 >  
239 >  void ForceManager::calcLongRangeInteraction() {
240      Snapshot* curSnapshot;
241      DataStorage* config;
242      RealType* frc;
# Line 236 | Line 245 | namespace oopse {
245      RealType* A;
246      RealType* electroFrame;
247      RealType* rc;
248 +    RealType* particlePot;
249      
250      //get current snapshot from SimInfo
251      curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
252 <
252 >    
253      //get array pointers
254      config = &(curSnapshot->atomData);
255      frc = config->getArrayPointer(DataStorage::dslForce);
# Line 247 | Line 257 | namespace oopse {
257      trq = config->getArrayPointer(DataStorage::dslTorque);
258      A   = config->getArrayPointer(DataStorage::dslAmat);
259      electroFrame = config->getArrayPointer(DataStorage::dslElectroFrame);
260 +    particlePot = config->getArrayPointer(DataStorage::dslParticlePot);
261  
262      //calculate the center of mass of cutoff group
263      SimInfo::MoleculeIterator mi;
# Line 255 | Line 266 | namespace oopse {
266      CutoffGroup* cg;
267      Vector3d com;
268      std::vector<Vector3d> rcGroup;
269 <
269 >    
270      if(info_->getNCutoffGroups() > 0){
271 <
272 <      for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
273 <        for(cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
271 >      
272 >      for (mol = info_->beginMolecule(mi); mol != NULL;
273 >           mol = info_->nextMolecule(mi)) {
274 >        for(cg = mol->beginCutoffGroup(ci); cg != NULL;
275 >            cg = mol->nextCutoffGroup(ci)) {
276            cg->getCOM(com);
277            rcGroup.push_back(com);
278          }
# Line 267 | Line 280 | namespace oopse {
280        
281        rc = rcGroup[0].getArrayPointer();
282      } else {
283 <      // center of mass of the group is the same as position of the atom  if cutoff group does not exist
283 >      // center of mass of the group is the same as position of the atom  
284 >      // if cutoff group does not exist
285        rc = pos;
286      }
287 <  
287 >    
288      //initialize data before passing to fortran
289      RealType longRangePotential[LR_POT_TYPES];
290      RealType lrPot = 0.0;
291      Vector3d totalDipole;
278    Mat3x3d tau;
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++){
295        longRangePotential[i]=0.0; //Initialize array
296      }
297 <
298 <    doForceLoop( pos,
299 <                 rc,
300 <                 A,
301 <                 electroFrame,
302 <                 frc,
303 <                 trq,
304 <                 tau.getArrayPointer(),
305 <                 longRangePotential,
306 <                 &passedCalcPot,
307 <                 &passedCalcStress,
308 <                 &isError );
298 <
297 >    
298 >    doForceLoop(pos,
299 >                rc,
300 >                A,
301 >                electroFrame,
302 >                frc,
303 >                trq,
304 >                tau.getArrayPointer(),
305 >                longRangePotential,
306 >                particlePot,
307 >                &isError );
308 >    
309      if( isError ){
310        sprintf( painCave.errMsg,
311                 "Error returned from the fortran force calculation.\n" );
# Line 305 | Line 315 | namespace oopse {
315      for (int i=0; i<LR_POT_TYPES;i++){
316        lrPot += longRangePotential[i]; //Quick hack
317      }
318 <
318 >    
319      // grab the simulation box dipole moment if specified
320      if (info_->getCalcBoxDipole()){
321        getAccumulatedBoxDipole(totalDipole.getArrayPointer());
322 <
322 >      
323        curSnapshot->statData[Stats::BOX_DIPOLE_X] = totalDipole(0);
324        curSnapshot->statData[Stats::BOX_DIPOLE_Y] = totalDipole(1);
325        curSnapshot->statData[Stats::BOX_DIPOLE_Z] = totalDipole(2);
326      }
327 <
327 >    
328      //store the tau and long range potential    
329      curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL] = lrPot;
330      curSnapshot->statData[Stats::VANDERWAALS_POTENTIAL] = longRangePotential[VDW_POT];
331      curSnapshot->statData[Stats::ELECTROSTATIC_POTENTIAL] = longRangePotential[ELECTROSTATIC_POT];
322
323    curSnapshot->statData.setTau(tau);
332    }
333  
334 <
334 >  
335    void ForceManager::postCalculation() {
336      SimInfo::MoleculeIterator mi;
337      Molecule* mol;
338      Molecule::RigidBodyIterator rbIter;
339      RigidBody* rb;
340 +    Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
341      
342      // collect the atomic forces onto rigid bodies
343 <    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
344 <      for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
345 <        rb->calcForcesAndTorques();
343 >    
344 >    for (mol = info_->beginMolecule(mi); mol != NULL;
345 >         mol = info_->nextMolecule(mi)) {
346 >      for (rb = mol->beginRigidBody(rbIter); rb != NULL;
347 >           rb = mol->nextRigidBody(rbIter)) {
348 >        Mat3x3d rbTau = rb->calcForcesAndTorquesAndVirial();
349 >        tau += rbTau;
350        }
351 <    }    
352 <
351 >    }
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);
357 > #endif
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 998 by chrisfen, Mon Jul 3 13:18:43 2006 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