ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/applications/staticProps/P2OrderParameter.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/applications/staticProps/P2OrderParameter.cpp (file contents):
Revision 2242 by tim, Fri May 27 21:11:24 2005 UTC vs.
Revision 2759 by tim, Wed May 17 21:51:42 2006 UTC

# Line 131 | Line 131 | void P2OrderParameter::process() {
131        }
132        
133        orderTensor /= sdPairs_.size();
134 <      orderTensor -= 1.0/3.0 * Mat3x3d::identity();  
134 >      orderTensor -= (RealType)(1.0/3.0) * Mat3x3d::identity();  
135        
136        Vector3d eigenvalues;
137        Mat3x3d eigenvectors;    
138        Mat3x3d::diagonalize(orderTensor, eigenvalues, eigenvectors);
139        
140        int which;
141 <      double maxEval = 0.0;
141 >      RealType maxEval = 0.0;
142        for(int k = 0; k< 3; k++){
143          if(fabs(eigenvalues[k]) > maxEval){
144            which = k;
145            maxEval = fabs(eigenvalues[k]);
146          }
147        }
148 <      double p2 = 1.5 * maxEval;
148 >      RealType p2 = 1.5 * maxEval;
149        
150        //the eigen vector is already normalized in SquareMatrix3::diagonalize
151        Vector3d director = eigenvectors.getColumn(which);
# Line 153 | Line 153 | void P2OrderParameter::process() {
153            director.negate();
154        }  
155  
156 <      double angle = 0.0;
156 >      RealType angle = 0.0;
157        for (std::vector<std::pair<StuntDouble*, StuntDouble*> >::iterator j = sdPairs_.begin(); j != sdPairs_.end(); ++j) {
158            Vector3d vec = j->first->getPos() - j->second->getPos();
159            currentSnapshot_->wrapVector(vec);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines