88 |
|
default: |
89 |
|
goto userr; |
90 |
|
} |
91 |
– |
/* do we have a job? */ |
92 |
– |
if (outdev == NULL && ncprocs <= 0) |
93 |
– |
goto userr; |
91 |
|
/* get root file name */ |
92 |
|
rootname(froot, hdkfile=argv[i++]); |
93 |
< |
/* load... */ |
94 |
< |
if (i < argc) { /* variables */ |
95 |
< |
loadvars(argv[i++]); |
96 |
< |
/* cmdline settings */ |
97 |
< |
for ( ; i < argc; i++) |
98 |
< |
if (setvariable(argv[i], matchvar) < 0) { |
99 |
< |
sprintf(errmsg, "unknown variable: %s", |
100 |
< |
argv[i]); |
101 |
< |
error(USER, errmsg); |
102 |
< |
} |
103 |
< |
/* check settings */ |
104 |
< |
checkvalues(); |
105 |
< |
/* load RIF if any */ |
106 |
< |
getradfile(); |
93 |
> |
/* load variables? */ |
94 |
> |
if (i < argc) |
95 |
> |
if (argv[i][0] != '-' && argv[i][0] != '+') |
96 |
> |
loadvars(argv[i]); /* load variables from file */ |
97 |
> |
|
98 |
> |
if (i >= argc || argv[i][0] == '+') |
99 |
> |
loadholo(); /* load existing holodeck */ |
100 |
> |
|
101 |
> |
while (++i < argc) /* get command line settings */ |
102 |
> |
if (setvariable(argv[i], matchvar) < 0) { |
103 |
> |
sprintf(errmsg, "unknown variable: %s", argv[i]); |
104 |
> |
error(USER, errmsg); |
105 |
> |
} |
106 |
> |
/* check settings */ |
107 |
> |
checkvalues(); |
108 |
> |
/* load RIF if any */ |
109 |
> |
getradfile(); |
110 |
> |
|
111 |
> |
if (hdlist[i] == NULL) { /* create new holodeck */ |
112 |
|
/* set defaults */ |
113 |
|
setdefaults(&hdg); |
114 |
|
/* holodeck exists? */ |
117 |
|
"holodeck file exists -- use -f to overwrite"); |
118 |
|
/* create holodeck */ |
119 |
|
creatholo(&hdg); |
120 |
< |
} else { /* else load holodeck */ |
119 |
< |
loadholo(); |
120 |
< |
/* check settings */ |
121 |
< |
checkvalues(); |
122 |
< |
/* load RIF if any */ |
123 |
< |
getradfile(); |
124 |
< |
/* set defaults */ |
120 |
> |
} else /* else just set defaults */ |
121 |
|
setdefaults(NULL); |
126 |
– |
} |
122 |
|
/* initialize */ |
123 |
|
initrholo(); |
124 |
|
/* main loop */ |
128 |
|
quit(0); |
129 |
|
userr: |
130 |
|
fprintf(stderr, |
131 |
< |
"Usage: %s {-n nprocs|-o disp} [-w][-f] output.hdk [control.hif [VAR=val ..]]\n", |
131 |
> |
"Usage: %s [-n nprocs][-o disp][-w][-f] output.hdk [control.hif|+|- [VAR=val ..]]\n", |
132 |
|
progname); |
133 |
|
quit(1); |
134 |
|
} |
201 |
|
if (!vdef(TIME) || vflt(TIME) <= FTINY) |
202 |
|
endtime = 0; |
203 |
|
else |
204 |
< |
endtime = starttime + vflt(TIME)*3600.; |
204 |
> |
endtime = starttime + vflt(TIME)*3600. + .5; |
205 |
|
/* set up memory cache */ |
206 |
|
if (outdev == NULL) |
207 |
|
hdcachesize = 0; /* manual flushing */ |
228 |
|
goto memerr; |
229 |
|
freepacks[--i].nr = 0; |
230 |
|
freepacks[i].next = NULL; |
231 |
< |
if (!vbool(OBSTRUCTIONS)) { |
231 |
> |
if (!vdef(OBSTRUCTIONS) || !vbool(OBSTRUCTIONS)) { |
232 |
|
freepacks[i].offset = (float *)bmalloc( |
233 |
|
RPACKSIZ*sizeof(float)*(i+1) ); |
234 |
|
if (freepacks[i].offset == NULL) |
310 |
|
} |
311 |
|
|
312 |
|
|
318 |
– |
report(t) /* report progress so far */ |
319 |
– |
time_t t; |
320 |
– |
{ |
321 |
– |
static time_t seconds2go = 1000000; |
322 |
– |
|
323 |
– |
if (t == 0L) |
324 |
– |
t = time(NULL); |
325 |
– |
sprintf(errmsg, "%ld packets (%ld rays) done after %.2f hours\n", |
326 |
– |
npacksdone, nraysdone, (t-starttime)/3600.); |
327 |
– |
eputs(errmsg); |
328 |
– |
if (seconds2go == 1000000) |
329 |
– |
seconds2go = vdef(REPORT) ? (long)(vflt(REPORT)*60. + .5) : 0L; |
330 |
– |
if (seconds2go) |
331 |
– |
reporttime = t + seconds2go; |
332 |
– |
} |
333 |
– |
|
334 |
– |
|
313 |
|
setdefaults(gp) /* set default values */ |
314 |
|
register HDGRID *gp; |
315 |
|
{ |
332 |
|
sprintf(vval(OCTREE), "%s.oct", froot); |
333 |
|
vdef(OCTREE)++; |
334 |
|
} |
357 |
– |
if (!vdef(OBSTRUCTIONS)) { |
358 |
– |
vval(OBSTRUCTIONS) = "T"; |
359 |
– |
vdef(OBSTRUCTIONS)++; |
360 |
– |
} |
335 |
|
if (!vdef(VDIST)) { |
336 |
|
vval(VDIST) = "F"; |
337 |
|
vdef(VDIST)++; |
539 |
|
{ |
540 |
|
int status = 0; |
541 |
|
|
542 |
< |
if (hdlist[0] != NULL) { /* flush holodeck */ |
542 |
> |
if (hdlist[0] != NULL) { /* close holodeck */ |
543 |
|
if (nprocs > 0) |
544 |
< |
status = done_rtrace(); |
571 |
< |
hdflush(NULL); |
544 |
> |
status = done_rtrace(); /* calls hdsync() */ |
545 |
|
if (ncprocs > 0 && vdef(REPORT)) { |
546 |
|
long fsiz, fuse; |
547 |
|
fsiz = hdfilen(hdlist[0]->fd); |