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 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC vs.
Revision 1973 by gezelter, Thu Mar 6 19:34:22 2014 UTC

# Line 231 | Line 231 | namespace OpenMD {
231                  "\t\t%s\n"
232                  "\twill result in %d integrable objects being\n"
233                  "\trestrained.\n", objectSelection.c_str(), selectionCount);
234 +        painCave.severity = OPENMD_INFO;
235          painCave.isFatal = 0;
236          simError();                    
237  
# Line 391 | Line 392 | namespace OpenMD {
392  
393        std::vector<Vector3d> struc;
394        std::vector<Vector3d> forces;
395 +
396        
397        for(sd = (*rm)->beginIntegrableObject(ioi); sd != NULL;
398            sd = (*rm)->nextIntegrableObject(ioi)) {
# Line 451 | Line 453 | namespace OpenMD {
453        
454        // phew.  At this point, we should have the pointer to the
455        // correct Object restraint in the variable oRest.
454 –
456        oRest->setScaleFactor(scalingFactor);
457        
458        Vector3d pos = (*ro)->getPos();

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines