diff options
Diffstat (limited to 'modules/benchmark/fbench.c')
| -rw-r--r-- | modules/benchmark/fbench.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/modules/benchmark/fbench.c b/modules/benchmark/fbench.c index b5afc1bc..cf1ff934 100644 --- a/modules/benchmark/fbench.c +++ b/modules/benchmark/fbench.c @@ -277,9 +277,7 @@ static int itercount; /* The iteration counter for the main loop optimise out the loop over the ray tracing code. */ -#ifndef ITERATIONS -#define ITERATIONS 1000 -#endif +#define ITERATIONS 300 static int niter = ITERATIONS; /* Iteration counter */ #if 0 @@ -690,8 +688,6 @@ void fbench() spectral_line[7] = 4340.477; /* G' */ spectral_line[8] = 3968.494; /* H */ - niter = 3000; - /* Load test case into working array */ clear_aperture = 4.0; @@ -701,15 +697,21 @@ void fbench() s[i + 1][j + 1] = testcase[i][j]; for (itercount = 0; itercount < niter; itercount++) { - for (paraxial = 0; paraxial <= 1; paraxial++) { + /* Do main trace in D light */ - /* Do main trace in D light */ + paraxial = FALSE; - trace_line(4, clear_aperture / 2.0); - od_sa[paraxial][0] = object_distance; - od_sa[paraxial][1] = axis_slope_angle; - } - paraxial = FALSE; + trace_line(4, clear_aperture / 2.0); + od_sa[0][0] = object_distance; + od_sa[0][1] = axis_slope_angle; + + paraxial = TRUE; + + trace_line(4, clear_aperture / 2.0); + od_sa[1][0] = object_distance; + od_sa[1][1] = axis_slope_angle; + + paraxial = FALSE; /* Trace marginal ray in C */ |