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

SCM Repository

[diderot] Diff of /branches/pure-cfg/test/lic.diderot
ViewVC logotype

Diff of /branches/pure-cfg/test/lic.diderot

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

revision 979, Tue Apr 26 00:56:29 2011 UTC revision 1027, Sun May 1 16:25:10 2011 UTC
# Line 11  Line 11 
11  real h = 0.01;    // step size of integration  real h = 0.01;    // step size of integration
12  int stepNum = 25; // take this many steps both upstream and downstream  int stepNum = 25; // take this many steps both upstream and downstream
13    
14  image(2)[2] Vimg = load("../data/vorttest.nrrd");  //image(2)[2] Vimg = load("../data/vorttest.nrrd");
15  field#1(2)[2] V = Vimg ⊛ ctmr;  //field#1(2)[2] V = Vimg ⊛ ctmr;
16  image(2)[] Rimg = load("../data/vorttest-rand.nrrd");  //image(2)[] Rimg = load("../data/vorttest-rand.nrrd");
17  field#0(2)[] R = Rimg ⊛ tent;  //field#0(2)[] R = Rimg ⊛ tent;
18    
19    // HEY (BUG): the program compiles and run with these two field definitions
20    // but the results are NOT correct!!
21    // Correct result obtained with four-line field definition above
22    field#1(2)[2] V = load("../data/vorttest.nrrd") ⊛ ctmr;
23    field#0(2)[] R = load("../data/vorttest-rand.nrrd") ⊛ tent;
24    
25    
26  strand LIC (int xi, int yi) {  strand LIC (int xi, int yi) {
27      real xx = lerp(0.0, 3.0, -0.5, real(xi), real(imgSizeX)-0.5);      real xx = lerp(0.0, 3.0, -0.5, real(xi), real(imgSizeX)-0.5);

Legend:
Removed from v.979  
changed lines
  Added in v.1027

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