| 6 |
|
* Initialization and calculation routines |
| 7 |
|
*/ |
| 8 |
|
|
| 9 |
+ |
#include "copyright.h" |
| 10 |
+ |
|
| 11 |
|
#include "rcontrib.h" |
| 10 |
– |
#include "source.h" |
| 12 |
|
#include "otypes.h" |
| 13 |
< |
#include "platform.h" |
| 13 |
> |
#include "source.h" |
| 14 |
|
|
| 15 |
|
char *shm_boundary = NULL; /* boundary of shared memory */ |
| 16 |
|
|
| 21 |
|
int ndims = 0; /* number of sampling dimensions */ |
| 22 |
|
int samplendx = 0; /* index for this sample */ |
| 23 |
|
|
| 24 |
< |
static void trace_contrib(RAY *r); /* our trace callback */ |
| 24 |
< |
void (*trace)() = trace_contrib; |
| 24 |
> |
void (*trace)() = NULL; /* trace call (NULL before rcinit) */ |
| 25 |
|
|
| 26 |
|
int do_irrad = 0; /* compute irradiance? */ |
| 27 |
|
|
| 28 |
< |
int rand_samp = 0; /* pure Monte Carlo sampling? */ |
| 28 |
> |
int rand_samp = 1; /* pure Monte Carlo sampling? */ |
| 29 |
|
|
| 30 |
< |
double dstrsrc = 0.0; /* square source distribution */ |
| 31 |
< |
double shadthresh = .03; /* shadow threshold */ |
| 30 |
> |
double dstrsrc = 0.9; /* square source distribution */ |
| 31 |
> |
double shadthresh = 0.; /* shadow threshold */ |
| 32 |
|
double shadcert = .75; /* shadow certainty */ |
| 33 |
|
int directrelay = 3; /* number of source relays */ |
| 34 |
|
int vspretest = 512; /* virtual source pretest density */ |
| 40 |
|
double seccg = 0.; /* global scattering eccentricity */ |
| 41 |
|
double ssampdist = 0.; /* scatter sampling distance */ |
| 42 |
|
|
| 43 |
< |
double specthresh = .15; /* specular sampling threshold */ |
| 43 |
> |
double specthresh = .02; /* specular sampling threshold */ |
| 44 |
|
double specjitter = 1.; /* specular sampling jitter */ |
| 45 |
|
|
| 46 |
|
int backvis = 1; /* back face visibility */ |
| 47 |
|
|
| 48 |
< |
int maxdepth = 8; /* maximum recursion depth */ |
| 49 |
< |
double minweight = 5e-4; /* minimum ray weight */ |
| 48 |
> |
int maxdepth = -10; /* maximum recursion depth */ |
| 49 |
> |
double minweight = 2e-3; /* minimum ray weight */ |
| 50 |
|
|
| 51 |
|
char *ambfile = NULL; /* ambient file name */ |
| 52 |
|
COLOR ambval = BLKCOLOR; /* ambient value */ |
| 53 |
|
int ambvwt = 0; /* initial weight for ambient value */ |
| 54 |
< |
double ambacc = 0; /* ambient accuracy */ |
| 54 |
> |
double ambacc = 0.; /* ambient accuracy */ |
| 55 |
|
int ambres = 256; /* ambient resolution */ |
| 56 |
|
int ambdiv = 350; /* ambient divisions */ |
| 57 |
|
int ambssamp = 0; /* ambient super-samples */ |
| 63 |
|
RNUMBER raysleft; /* number of rays left to trace */ |
| 64 |
|
long waitflush; /* how long until next flush */ |
| 65 |
|
|
| 66 |
< |
int lastray = 0; /* last ray number sent */ |
| 67 |
< |
int lastdone = 0; /* last ray output */ |
| 66 |
> |
RNUMBER lastray = 0; /* last ray number sent */ |
| 67 |
> |
RNUMBER lastdone = 0; /* last ray output */ |
| 68 |
|
|
| 69 |
< |
/* Close output stream and free record */ |
| 70 |
< |
static void |
| 71 |
< |
closestream(void *p) |
| 72 |
< |
{ |
| 73 |
< |
STREAMOUT *sop = (STREAMOUT *)p; |
| 74 |
< |
int status = 0; |
| 75 |
< |
if (sop->outpipe) |
| 76 |
< |
status = pclose(sop->ofp); |
| 77 |
< |
else if (sop->ofp != stdout) |
| 78 |
< |
status = fclose(sop->ofp); |
| 79 |
< |
if (status) |
| 80 |
< |
error(SYSTEM, "error closing output stream"); |
| 81 |
< |
free(p); |
| 82 |
< |
} |
| 69 |
> |
static void trace_contrib(RAY *r); /* our trace callback */ |
| 70 |
|
|
| 84 |
– |
LUTAB ofiletab = LU_SINIT(free,closestream); /* output file table */ |
| 85 |
– |
|
| 86 |
– |
#define OF_MODIFIER 01 |
| 87 |
– |
#define OF_BIN 02 |
| 88 |
– |
|
| 71 |
|
static void mcfree(void *p) { epfree((*(MODCONT *)p).binv); free(p); } |
| 72 |
|
|
| 73 |
|
LUTAB modconttab = LU_SINIT(NULL,mcfree); /* modifier lookup table */ |
| 74 |
|
|
| 93 |
– |
static OBJECT traset[MAXTSET+1]={0}; /* trace include set */ |
| 94 |
– |
|
| 75 |
|
/************************** INITIALIZATION ROUTINES ***********************/ |
| 76 |
|
|
| 97 |
– |
void |
| 98 |
– |
tranotify( /* record new modifier */ |
| 99 |
– |
OBJECT obj |
| 100 |
– |
) |
| 101 |
– |
{ |
| 102 |
– |
static int hitlimit = 0; |
| 103 |
– |
OBJREC *o = objptr(obj); |
| 104 |
– |
int i; |
| 105 |
– |
|
| 106 |
– |
if (obj == OVOID) { /* starting over */ |
| 107 |
– |
traset[0] = 0; |
| 108 |
– |
hitlimit = 0; |
| 109 |
– |
return; |
| 110 |
– |
} |
| 111 |
– |
if (hitlimit || !ismodifier(o->otype)) |
| 112 |
– |
return; |
| 113 |
– |
for (i = nmods; i-- > 0; ) |
| 114 |
– |
if (!strcmp(o->oname, modname[i])) { |
| 115 |
– |
if (traset[0] >= MAXTSET) { |
| 116 |
– |
error(WARNING, "too many same-named modifiers"); |
| 117 |
– |
hitlimit++; |
| 118 |
– |
return; /* should this be fatal? */ |
| 119 |
– |
} |
| 120 |
– |
insertelem(traset, obj); |
| 121 |
– |
break; |
| 122 |
– |
} |
| 123 |
– |
} |
| 124 |
– |
|
| 125 |
– |
|
| 77 |
|
char * |
| 78 |
|
formstr( /* return format identifier */ |
| 79 |
|
int f |
| 91 |
|
|
| 92 |
|
/* Add modifier to our list to track */ |
| 93 |
|
MODCONT * |
| 94 |
< |
addmodifier(char *modn, char *outf, char *binv, int bincnt) |
| 94 |
> |
addmodifier(char *modn, char *outf, char *prms, char *binv, int bincnt) |
| 95 |
|
{ |
| 96 |
|
LUENT *lep = lu_find(&modconttab,modn); |
| 97 |
|
MODCONT *mp; |
| 102 |
|
sprintf(errmsg, "duplicate modifier '%s'", modn); |
| 103 |
|
error(USER, errmsg); |
| 104 |
|
} |
| 105 |
< |
if (nmods >= MAXMODLIST) |
| 106 |
< |
error(INTERNAL, "too many modifiers"); |
| 105 |
> |
if (nmods >= MAXMODLIST) { |
| 106 |
> |
sprintf(errmsg, "too many modifiers (%d limit)", MAXMODLIST); |
| 107 |
> |
error(INTERNAL, errmsg); |
| 108 |
> |
} |
| 109 |
> |
if (!strcmp(modn, VOIDID)) { |
| 110 |
> |
sprintf(errmsg, "cannot track '%s' modifier", VOIDID); |
| 111 |
> |
error(USER, errmsg); |
| 112 |
> |
} |
| 113 |
|
modname[nmods++] = modn; /* XXX assumes static string */ |
| 114 |
|
lep->key = modn; /* XXX assumes static string */ |
| 115 |
|
if (binv == NULL) |
| 134 |
|
error(SYSTEM, "out of memory in addmodifier"); |
| 135 |
|
mp->outspec = outf; /* XXX assumes static string */ |
| 136 |
|
mp->modname = modn; /* XXX assumes static string */ |
| 137 |
+ |
mp->params = prms; /* XXX assumes static string */ |
| 138 |
|
mp->binv = ebinv; |
| 139 |
+ |
mp->bin0 = 0; |
| 140 |
|
mp->nbins = bincnt; |
| 141 |
|
memset(mp->cbin, 0, sizeof(DCOLOR)*bincnt); |
| 142 |
< |
/* allocate output streams */ |
| 143 |
< |
for (i = bincnt; i-- > 0; ) |
| 144 |
< |
getostream(mp->outspec, mp->modname, i, 1); |
| 142 |
> |
/* figure out starting bin */ |
| 143 |
> |
while (!getostream(mp->outspec, mp->modname, mp->bin0, 1)) |
| 144 |
> |
mp->bin0++; |
| 145 |
> |
/* allocate other output streams */ |
| 146 |
> |
for (i = 0; ++i < mp->nbins; ) |
| 147 |
> |
getostream(mp->outspec, mp->modname, mp->bin0+i, 1); |
| 148 |
|
lep->data = (char *)mp; |
| 149 |
|
return(mp); |
| 150 |
|
} |
| 151 |
|
|
| 152 |
|
|
| 153 |
< |
/* add modifiers from a file list */ |
| 153 |
> |
/* Add modifiers from a file list */ |
| 154 |
|
void |
| 155 |
< |
addmodfile(char *fname, char *outf, char *binv, int bincnt) |
| 155 |
> |
addmodfile(char *fname, char *outf, char *prms, char *binv, int bincnt) |
| 156 |
|
{ |
| 157 |
|
char *mname[MAXMODLIST]; |
| 158 |
|
int i; |
| 159 |
|
/* find the file & store strings */ |
| 160 |
< |
if (wordfile(mname, getpath(fname, getrlibpath(), R_OK)) < 0) { |
| 160 |
> |
i = wordfile(mname, MAXMODLIST, getpath(fname, getrlibpath(), R_OK)); |
| 161 |
> |
if (i < 0) { |
| 162 |
|
sprintf(errmsg, "cannot find modifier file '%s'", fname); |
| 163 |
|
error(SYSTEM, errmsg); |
| 164 |
|
} |
| 165 |
+ |
if (i >= MAXMODLIST-1) { |
| 166 |
+ |
sprintf(errmsg, "too many modifiers (%d limit) in file '%s'", |
| 167 |
+ |
MAXMODLIST-1, fname); |
| 168 |
+ |
error(INTERNAL, errmsg); |
| 169 |
+ |
} |
| 170 |
|
for (i = 0; mname[i]; i++) /* add each one */ |
| 171 |
< |
addmodifier(mname[i], outf, binv, bincnt); |
| 171 |
> |
addmodifier(mname[i], outf, prms, binv, bincnt); |
| 172 |
|
} |
| 173 |
|
|
| 174 |
|
|
| 175 |
+ |
/* Check if we have any more rays left (and report progress) */ |
| 176 |
+ |
int |
| 177 |
+ |
morays(void) |
| 178 |
+ |
{ |
| 179 |
+ |
static RNUMBER total_rays; |
| 180 |
+ |
static time_t tstart, last_report; |
| 181 |
+ |
time_t tnow; |
| 182 |
+ |
|
| 183 |
+ |
if (!raysleft) |
| 184 |
+ |
return(1); /* unknown total, so nothing to do or say */ |
| 185 |
+ |
|
| 186 |
+ |
if (report_intvl > 0 && (tnow = time(0)) >= last_report+report_intvl) { |
| 187 |
+ |
if (!total_rays) { |
| 188 |
+ |
total_rays = raysleft; |
| 189 |
+ |
tstart = tnow; |
| 190 |
+ |
} |
| 191 |
+ |
sprintf(errmsg, "%.2f%% done after %.3f hours", |
| 192 |
+ |
100.-100.*raysleft/total_rays, |
| 193 |
+ |
(1./3600.)*(tnow - tstart)); |
| 194 |
+ |
eputs(errmsg); |
| 195 |
+ |
last_report = tnow; |
| 196 |
+ |
} |
| 197 |
+ |
return(--raysleft); |
| 198 |
+ |
} |
| 199 |
+ |
|
| 200 |
+ |
|
| 201 |
+ |
/* Quit program */ |
| 202 |
|
void |
| 203 |
< |
quit( /* quit program */ |
| 203 |
> |
quit( |
| 204 |
|
int code |
| 205 |
|
) |
| 206 |
|
{ |
| 207 |
|
if (nchild > 0) /* close children if any */ |
| 208 |
< |
end_children(); |
| 208 |
> |
end_children(code != 0); |
| 209 |
> |
else if (nchild < 0) |
| 210 |
> |
_exit(code); /* avoid flush() in child */ |
| 211 |
|
exit(code); |
| 212 |
|
} |
| 213 |
|
|
| 214 |
|
|
| 215 |
|
/* Initialize our process(es) */ |
| 216 |
|
static void |
| 217 |
< |
rcinit() |
| 217 |
> |
rcinit(void) |
| 218 |
|
{ |
| 219 |
|
int i; |
| 220 |
|
|
| 226 |
|
/* set shared memory boundary */ |
| 227 |
|
shm_boundary = strcpy((char *)malloc(16), "SHM_BOUNDARY"); |
| 228 |
|
} |
| 229 |
< |
if ((nproc > 1) & (accumulate <= 0)) |
| 230 |
< |
put_zero_record(0); /* prime our queue to accumulate */ |
| 231 |
< |
|
| 235 |
< |
if (recover) { /* recover previous output? */ |
| 236 |
< |
if (accumulate <= 0) { |
| 237 |
< |
reload_output(); |
| 238 |
< |
if (nproc > 1) |
| 239 |
< |
queue_modifiers(); |
| 240 |
< |
} else |
| 241 |
< |
recover_output(); |
| 242 |
< |
} |
| 229 |
> |
trace = trace_contrib; /* set up trace call-back */ |
| 230 |
> |
for (i = 0; i < nsources; i++) /* tracing to sources as well */ |
| 231 |
> |
source[i].sflags |= SFOLLOW; |
| 232 |
|
if (yres > 0) { /* set up flushing & ray counts */ |
| 233 |
|
if (xres > 0) |
| 234 |
|
raysleft = (RNUMBER)xres*yres; |
| 239 |
|
if ((account = accumulate) > 1) |
| 240 |
|
raysleft *= accumulate; |
| 241 |
|
waitflush = (yres > 0) & (xres > 1) ? 0 : xres; |
| 253 |
– |
/* tracing to sources as well */ |
| 254 |
– |
for (i = 0; i < nsources; i++) |
| 255 |
– |
source[i].sflags |= SFOLLOW; |
| 242 |
|
|
| 243 |
< |
if (nproc == 1 || in_rchild()) /* single process or child */ |
| 243 |
> |
if (nproc > 1 && in_rchild()) /* forked child? */ |
| 244 |
|
return; /* return to main processing loop */ |
| 245 |
|
|
| 246 |
< |
parental_loop(); /* else run controller */ |
| 246 |
> |
if (recover) { /* recover previous output? */ |
| 247 |
> |
if (accumulate <= 0) |
| 248 |
> |
reload_output(); |
| 249 |
> |
else |
| 250 |
> |
recover_output(); |
| 251 |
> |
} |
| 252 |
> |
if (nproc == 1) /* single process? */ |
| 253 |
> |
return; |
| 254 |
> |
/* else run appropriate controller */ |
| 255 |
> |
if (accumulate <= 0) |
| 256 |
> |
feeder_loop(); |
| 257 |
> |
else |
| 258 |
> |
parental_loop(); |
| 259 |
|
quit(0); /* parent musn't return! */ |
| 260 |
|
} |
| 261 |
|
|
| 266 |
|
trace_contrib(RAY *r) |
| 267 |
|
{ |
| 268 |
|
MODCONT *mp; |
| 269 |
+ |
double bval; |
| 270 |
|
int bn; |
| 271 |
|
RREAL contr[3]; |
| 272 |
|
|
| 273 |
< |
if (r->ro == NULL || !inset(traset, r->ro->omod)) |
| 273 |
> |
if (r->ro == NULL || r->ro->omod == OVOID) |
| 274 |
|
return; |
| 275 |
+ |
/* shadow ray not on source? */ |
| 276 |
+ |
if (r->rsrc >= 0 && source[r->rsrc].so != r->ro) |
| 277 |
+ |
return; |
| 278 |
|
|
| 279 |
|
mp = (MODCONT *)lu_find(&modconttab,objptr(r->ro->omod)->oname)->data; |
| 280 |
|
|
| 281 |
< |
if (mp == NULL) |
| 282 |
< |
error(CONSISTENCY, "unexpected modifier in trace_contrib()"); |
| 281 |
> |
if (mp == NULL) /* not in our list? */ |
| 282 |
> |
return; |
| 283 |
|
|
| 284 |
< |
worldfunc(RCCONTEXT, r); /* get bin number */ |
| 285 |
< |
bn = (int)(evalue(mp->binv) + .5); |
| 286 |
< |
if ((bn < 0) | (bn >= mp->nbins)) { |
| 287 |
< |
error(WARNING, "bad bin number (ignored)"); |
| 284 |
> |
worldfunc(RCCONTEXT, r); /* else set context */ |
| 285 |
> |
set_eparams((char *)mp->params); |
| 286 |
> |
if ((bval = evalue(mp->binv)) <= -.5) /* and get bin number */ |
| 287 |
> |
return; /* silently ignore negatives */ |
| 288 |
> |
if ((bn = (int)(bval + .5)) >= mp->nbins) { |
| 289 |
> |
sprintf(errmsg, "bad bin number (%d ignored)", bn); |
| 290 |
> |
error(WARNING, errmsg); |
| 291 |
|
return; |
| 292 |
|
} |
| 293 |
< |
raycontrib(contr, r, PRIMARY); |
| 293 |
> |
raycontrib(contr, r, PRIMARY); /* compute coefficient */ |
| 294 |
|
if (contrib) |
| 295 |
< |
multcolor(contr, r->rcol); |
| 295 |
> |
multcolor(contr, r->rcol); /* -> contribution */ |
| 296 |
|
addcolor(mp->cbin[bn], contr); |
| 297 |
|
} |
| 298 |
|
|
| 299 |
|
|
| 300 |
+ |
/* Evaluate irradiance contributions */ |
| 301 |
|
static void |
| 302 |
< |
rayirrad( /* compute irradiance rather than radiance */ |
| 297 |
< |
RAY *r |
| 298 |
< |
) |
| 302 |
> |
eval_irrad(FVECT org, FVECT dir) |
| 303 |
|
{ |
| 304 |
< |
r->rot = 1e-5; /* pretend we hit surface */ |
| 305 |
< |
VSUM(r->rop, r->rorg, r->rdir, r->rot); |
| 306 |
< |
r->ron[0] = -r->rdir[0]; |
| 307 |
< |
r->ron[1] = -r->rdir[1]; |
| 308 |
< |
r->ron[2] = -r->rdir[2]; |
| 309 |
< |
r->rod = 1.0; |
| 310 |
< |
/* compute result */ |
| 311 |
< |
r->revf = raytrace; |
| 312 |
< |
(*ofun[Lamb.otype].funp)(&Lamb, r); |
| 313 |
< |
r->revf = rayirrad; |
| 304 |
> |
RAY thisray; |
| 305 |
> |
|
| 306 |
> |
VSUM(thisray.rorg, org, dir, 1.1e-4); |
| 307 |
> |
thisray.rdir[0] = -dir[0]; |
| 308 |
> |
thisray.rdir[1] = -dir[1]; |
| 309 |
> |
thisray.rdir[2] = -dir[2]; |
| 310 |
> |
thisray.rmax = 0.0; |
| 311 |
> |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
| 312 |
> |
/* pretend we hit surface */ |
| 313 |
> |
thisray.rxt = thisray.rot = 1e-5; |
| 314 |
> |
thisray.rod = 1.0; |
| 315 |
> |
VCOPY(thisray.ron, dir); |
| 316 |
> |
VSUM(thisray.rop, org, dir, 1e-4); |
| 317 |
> |
samplendx++; /* compute result */ |
| 318 |
> |
(*ofun[Lamb.otype].funp)(&Lamb, &thisray); |
| 319 |
|
} |
| 320 |
|
|
| 321 |
|
|
| 322 |
< |
/* Evaluate ray contributions */ |
| 322 |
> |
/* Evaluate radiance contributions */ |
| 323 |
|
static void |
| 324 |
< |
eval_ray(FVECT org, FVECT dir, double dmax) |
| 324 |
> |
eval_rad(FVECT org, FVECT dir, double dmax) |
| 325 |
|
{ |
| 326 |
|
RAY thisray; |
| 327 |
|
/* set up ray */ |
| 328 |
+ |
VCOPY(thisray.rorg, org); |
| 329 |
+ |
VCOPY(thisray.rdir, dir); |
| 330 |
+ |
thisray.rmax = dmax; |
| 331 |
|
rayorigin(&thisray, PRIMARY, NULL, NULL); |
| 320 |
– |
if (imm_irrad) { |
| 321 |
– |
VSUM(thisray.rorg, org, dir, 1.1e-4); |
| 322 |
– |
thisray.rdir[0] = -dir[0]; |
| 323 |
– |
thisray.rdir[1] = -dir[1]; |
| 324 |
– |
thisray.rdir[2] = -dir[2]; |
| 325 |
– |
thisray.rmax = 0.0; |
| 326 |
– |
thisray.revf = rayirrad; |
| 327 |
– |
} else { |
| 328 |
– |
VCOPY(thisray.rorg, org); |
| 329 |
– |
VCOPY(thisray.rdir, dir); |
| 330 |
– |
thisray.rmax = dmax; |
| 331 |
– |
} |
| 332 |
|
samplendx++; /* call ray evaluation */ |
| 333 |
|
rayvalue(&thisray); |
| 334 |
|
} |
| 336 |
|
|
| 337 |
|
/* Accumulate and/or output ray contributions (child or only process) */ |
| 338 |
|
static void |
| 339 |
< |
done_contrib() |
| 339 |
> |
done_contrib(void) |
| 340 |
|
{ |
| 341 |
|
MODCONT *mp; |
| 342 |
|
int i; |
| 357 |
|
|
| 358 |
|
/* Principal calculation loop (called by main) */ |
| 359 |
|
void |
| 360 |
< |
rcontrib() |
| 360 |
> |
rcontrib(void) |
| 361 |
|
{ |
| 362 |
|
static int ignore_warning_given = 0; |
| 363 |
|
FVECT orig, direc; |
| 370 |
|
#endif |
| 371 |
|
while (getvec(orig) == 0 && getvec(direc) == 0) { |
| 372 |
|
d = normalize(direc); |
| 373 |
< |
if ((d == 0.0) & (accumulate != 1)) { |
| 373 |
> |
if (nchild != -1 && (d == 0.0) & (accumulate == 0)) { |
| 374 |
|
if (!ignore_warning_given++) |
| 375 |
|
error(WARNING, |
| 376 |
|
"dummy ray(s) ignored during accumulation\n"); |
| 380 |
|
lastray = lastdone = 0; |
| 381 |
|
++lastray; |
| 382 |
|
if (d == 0.0) { /* zero ==> flush */ |
| 383 |
< |
if ((yres <= 0) | (xres <= 0)) |
| 384 |
< |
waitflush = 1; /* flush right after */ |
| 385 |
< |
} else { /* else compute */ |
| 386 |
< |
eval_ray(orig, direc, lim_dist ? d : 0.0); |
| 383 |
> |
if ((yres <= 0) | (xres <= 1)) |
| 384 |
> |
waitflush = 1; /* flush after */ |
| 385 |
> |
if (nchild == -1) |
| 386 |
> |
account = 1; |
| 387 |
> |
} else if (imm_irrad) { /* else compute */ |
| 388 |
> |
eval_irrad(orig, direc); |
| 389 |
> |
} else { |
| 390 |
> |
eval_rad(orig, direc, lim_dist ? d : 0.0); |
| 391 |
|
} |
| 392 |
|
done_contrib(); /* accumulate/output */ |
| 393 |
|
++lastdone; |
| 394 |
< |
if (raysleft && !--raysleft) |
| 394 |
> |
if (!morays()) |
| 395 |
|
break; /* preemptive EOI */ |
| 396 |
|
} |
| 397 |
< |
if (accumulate <= 0 || account < accumulate) { |
| 397 |
> |
if (nchild != -1 && (accumulate <= 0) | (account < accumulate)) { |
| 398 |
|
if (account < accumulate) { |
| 399 |
|
error(WARNING, "partial accumulation in final record"); |
| 400 |
|
accumulate -= account; |
| 402 |
|
account = 1; /* output accumulated totals */ |
| 403 |
|
done_contrib(); |
| 404 |
|
} |
| 405 |
+ |
lu_done(&ofiletab); /* close output files */ |
| 406 |
|
if (raysleft) |
| 407 |
|
error(USER, "unexpected EOF on input"); |
| 403 |
– |
lu_done(&ofiletab); /* close output files */ |
| 408 |
|
} |
