Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/vis12/test/particles-iso.diderot
ViewVC logotype

Diff of /branches/vis12/test/particles-iso.diderot

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

trunk/test/particles-iso.diderot revision 480, Fri Nov 19 17:07:01 2010 UTC branches/vis12/test/particles-iso.diderot revision 1685, Sun Jan 22 15:23:36 2012 UTC
# Line 120  Line 120 
120    
121          (energyOrig, force) = totalEnergy(pos);          (energyOrig, force) = totalEnergy(pos);
122          // project force onto tangent plane          // project force onto tangent plane
123          force -= outer(∇F@pos, ∇F@pos)*force          vec3 norm = ∇F@pos/|∇F@pos|;
124            force -= outer(norm, norm)*force
125          // ensures that step*force is a reasonable distance          // ensures that step*force is a reasonable distance
126          step = min(step, travelMax/|force|);          step = min(step, travelMax/|force|);
         if (step*|force| > travelMax) {  
            step = travelMax/|force|;  
         }  
127          do {          do {
128             (bool ok, posNew) = constrain(pos + step*force);             (bool ok, posNew) = constrain(pos + step*force);
129             if (!ok) {             if (!ok) {

Legend:
Removed from v.480  
changed lines
  Added in v.1685

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0