ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/restraints/RestraintForceManager.cpp
(Generate patch)

Comparing trunk/src/restraints/RestraintForceManager.cpp (file contents):
Revision 1366 by gezelter, Fri Oct 16 20:42:29 2009 UTC vs.
Revision 1969 by gezelter, Wed Feb 26 14:14:50 2014 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, 234107 (2008).          
39 + * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43 + #ifdef IS_MPI
44 + #include <mpi.h>
45 + #endif
46 +
47 + #include "config.h"
48   #include <cmath>
49 +
50   #include "restraints/RestraintForceManager.hpp"
51   #include "restraints/MolecularRestraint.hpp"
52   #include "restraints/ObjectRestraint.hpp"
53   #include "io/RestReader.hpp"
54   #include "utils/simError.h"
55 < #include "utils/OOPSEConstant.hpp"
55 > #include "utils/PhysicalConstants.hpp"
56   #include "utils/StringUtils.hpp"
57   #include "selection/SelectionEvaluator.hpp"
58   #include "selection/SelectionManager.hpp"
52 #ifdef IS_MPI
53 #include <mpi.h>
54 #endif
59  
60 + namespace OpenMD {
61  
57 namespace oopse {
58
62    RestraintForceManager::RestraintForceManager(SimInfo* info): ForceManager(info) {
63  
64      // order of affairs:
# Line 89 | Line 92 | namespace oopse {
92      int nRestraintStamps = simParam->getNRestraintStamps();
93      std::vector<RestraintStamp*> stamp = simParam->getRestraintStamps();
94  
95 +    std::vector<int> stuntDoubleIndex;
96 +
97      for (int i = 0; i < nRestraintStamps; i++){
98  
99        std::string myType = toUpperCopy(stamp[i]->getType());
# Line 96 | Line 101 | namespace oopse {
101        if (myType.compare("MOLECULAR")==0){
102  
103          int molIndex;
99        std::vector<Vector3d> ref;
104          Vector3d refCom;
105  
106          if (!stamp[i]->haveMolIndex()) {
# Line 132 | Line 136 | namespace oopse {
136            // this proc doesn't have the molecule.  Do a quick check to
137            // make sure another processor is supposed to have it.
138          
139 <          int myrank = MPI::COMM_WORLD.Get_rank();
139 >          int myrank;
140 >          MPI_Comm_rank( MPI_COMM_WORLD, &myrank);
141 >
142            if (info_->getMolToProc(molIndex) == myrank) {
143 +        
144              // If we were supposed to have it but got a null, then freak out.
145   #endif
146  
# Line 149 | Line 156 | namespace oopse {
156   #endif
157          }
158          
159 +
160 + #ifdef IS_MPI
161 +        // only handle this molecular restraint if this processor owns the
162 +        // molecule
163 +        int myrank;
164 +        MPI_Comm_rank( MPI_COMM_WORLD, &myrank);
165 +        if (info_->getMolToProc(molIndex) == myrank) {
166 +
167 + #endif
168 +
169          MolecularRestraint* rest = new MolecularRestraint();
170  
171          std::string restPre("mol_");
# Line 184 | Line 201 | namespace oopse {
201          restraints_.push_back(rest);
202          mol->addProperty(new RestraintData("Restraint", rest));
203          restrainedMols_.push_back(mol);
204 <        
204 > #ifdef IS_MPI
205 >        }
206 > #endif        
207        } else if (myType.compare("OBJECT") == 0) {
208          
209          std::string objectSelection;
# Line 220 | Line 239 | namespace oopse {
239  
240          for (sd = seleMan.beginSelected(selei); sd != NULL;
241               sd = seleMan.nextSelected(selei)) {
242 <          
242 >          stuntDoubleIndex.push_back(sd->getGlobalIntegrableObjectIndex());
243 >
244            ObjectRestraint* rest = new ObjectRestraint();
245            
246            if (stamp[i]->haveDisplacementSpringConstant()) {
# Line 260 | Line 280 | namespace oopse {
280      // are times when it won't use restraints at all, so only open the
281      // restraint file if we are actually using restraints:
282  
283 <    if (simParam->getUseRestraints()) {
283 >    if (simParam->getUseRestraints()) {
284        std::string refFile = simParam->getRestraint_file();
285 <      RestReader* rr = new RestReader(info, refFile);
266 <
285 >      RestReader* rr = new RestReader(info, refFile, stuntDoubleIndex);
286        rr->readReferenceStructure();
287      }
288  
289      restOutput_ = getPrefix(info_->getFinalConfigFileName()) + ".rest";
290      restOut = new RestWriter(info_, restOutput_.c_str(), restraints_);
272    
291      if(!restOut){
292        sprintf(painCave.errMsg, "Restraint error: Failed to create RestWriter\n");
293        painCave.isFatal = 1;
# Line 292 | Line 310 | namespace oopse {
310      currRestTime_ = currSnapshot_->getTime();
311    }
312  
313 <  void RestraintForceManager::calcForces(bool needPotential, bool needStress){
313 >  void RestraintForceManager::calcForces(){
314  
315 <    ForceManager::calcForces(needPotential, needStress);    
315 >    ForceManager::calcForces();    
316      RealType restPot_local, restPot;
317  
318      restPot_local = doRestraints(1.0);
319  
320   #ifdef IS_MPI    
321 <    MPI::COMM_WORLD.Allreduce(&restPot_local, &restPot, 1,
322 <                              MPI::REALTYPE, MPI::SUM);
321 >    MPI_Allreduce(&restPot_local, &restPot, 1,
322 >                  MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
323   #else
324      restPot = restPot_local;
325   #endif
326      currSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
327 <    currSnapshot_->statData[Stats::LONG_RANGE_POTENTIAL] += restPot;
328 <    currSnapshot_->statData[Stats::VHARM] = restPot;
327 >    RealType pot = currSnapshot_->getLongRangePotential();
328 >    pot += restPot;
329 >    currSnapshot_->setLongRangePotential(pot);
330 >    currSnapshot_->setRestraintPotential(restPot);
331  
332      //write out forces and current positions of restrained molecules    
333      if (currSnapshot_->getTime() >= currRestTime_){
# Line 322 | Line 342 | namespace oopse {
342      Molecule::IntegrableObjectIterator ioi;
343      MolecularRestraint* mRest;
344      StuntDouble* sd;
325    RealType pTot;
345  
346      std::vector<StuntDouble*>::const_iterator ro;
347      ObjectRestraint* oRest;
# Line 347 | Line 366 | namespace oopse {
366            if (mRest == NULL) {
367              sprintf( painCave.errMsg,
368                       "Can not cast RestraintData to MolecularRestraint\n");
369 <            painCave.severity = OOPSE_ERROR;
369 >            painCave.severity = OPENMD_ERROR;
370              painCave.isFatal = 1;
371              simError();                      
372            }
373          } else {
374            sprintf( painCave.errMsg,
375                     "Can not cast GenericData to RestraintData\n");
376 <          painCave.severity = OOPSE_ERROR;
376 >          painCave.severity = OPENMD_ERROR;
377            painCave.isFatal = 1;
378            simError();      
379          }
380        } else {
381          sprintf( painCave.errMsg, "Can not find Restraint for RestrainedObject\n");
382 <        painCave.severity = OOPSE_ERROR;
382 >        painCave.severity = OPENMD_ERROR;
383          painCave.isFatal = 1;
384          simError();          
385        }
# Line 374 | Line 393 | namespace oopse {
393        std::vector<Vector3d> forces;
394        
395        for(sd = (*rm)->beginIntegrableObject(ioi); sd != NULL;
396 <          sd = (*rm)->nextIntegrableObject(ioi)) {        
396 >          sd = (*rm)->nextIntegrableObject(ioi)) {
397          struc.push_back(sd->getPos());
398        }
399  
# Line 412 | Line 431 | namespace oopse {
431            if (oRest == NULL) {
432              sprintf( painCave.errMsg,
433                       "Can not cast RestraintData to ObjectRestraint\n");
434 <            painCave.severity = OOPSE_ERROR;
434 >            painCave.severity = OPENMD_ERROR;
435              painCave.isFatal = 1;
436              simError();                      
437            }
438          } else {
439            sprintf( painCave.errMsg,
440                     "Can not cast GenericData to RestraintData\n");
441 <          painCave.severity = OOPSE_ERROR;
441 >          painCave.severity = OPENMD_ERROR;
442            painCave.isFatal = 1;
443            simError();      
444          }
445        } else {
446          sprintf( painCave.errMsg, "Can not find Restraint for RestrainedObject\n");
447 <        painCave.severity = OOPSE_ERROR;
447 >        painCave.severity = OPENMD_ERROR;
448          painCave.isFatal = 1;
449          simError();          
450        }

Comparing trunk/src/restraints/RestraintForceManager.cpp (property svn:keywords):
Revision 1366 by gezelter, Fri Oct 16 20:42:29 2009 UTC vs.
Revision 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines