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

Comparing:
trunk/src/brains/ForceManager.cpp (property svn:keywords), Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
branches/development/src/brains/ForceManager.cpp (property svn:keywords), Revision 1467 by gezelter, Sat Jul 17 15:33:03 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines