242 |
|
/* load variable values */ |
243 |
|
loadvars(rifname); |
244 |
|
/* get any additional assignments */ |
245 |
< |
for (i++; i < argc; i++) |
246 |
< |
if (setvariable(argv[i], matchvar) < 0) { |
247 |
< |
fprintf(stderr, "%s: unknown variable: %s\n", |
245 |
> |
for (i++; i < argc; i++) { |
246 |
> |
int rv = setvariable(argv[i], matchvar); |
247 |
> |
if (rv < 0) { |
248 |
> |
fprintf(stderr, "%s: unknown setting: %s\n", |
249 |
|
progname, argv[i]); |
250 |
|
quit(1); |
251 |
|
} |
252 |
+ |
if (!rv) |
253 |
+ |
fprintf(stderr, |
254 |
+ |
"%s: bad variable assignment: %s (ignored)\n", |
255 |
+ |
progname, argv[i]); |
256 |
+ |
} |
257 |
|
/* check assignments */ |
258 |
|
checkvalues(); |
259 |
|
/* check files and dates */ |
930 |
|
d = ambval(); |
931 |
|
sprintf(op, " -av %.2g %.2g %.2g", d, d, d); |
932 |
|
op += strlen(op); |
933 |
< |
op = addarg(op, "-lr 6 -lw .003"); |
933 |
> |
op = addarg(op, "-lr 6 -lw .001"); |
934 |
|
} |
935 |
|
|
936 |
|
|
1084 |
|
d = ambval(); |
1085 |
|
sprintf(op, " -av %.2g %.2g %.2g", d, d, d); |
1086 |
|
op += strlen(op); |
1087 |
< |
op = addarg(op, "-lr 12 -lw 1e-5"); |
1087 |
> |
op = addarg(op, "-lr 12 -lw 5e-6"); |
1088 |
|
} |
1089 |
|
|
1090 |
|
|