22 |
|
#include <string.h> |
23 |
|
|
24 |
|
#include "standard.h" |
25 |
+ |
#include "paths.h" |
26 |
|
#include "view.h" |
27 |
|
|
28 |
|
|
92 |
|
) |
93 |
|
{ |
94 |
|
struct named_func *funp; |
94 |
– |
char *progtail; |
95 |
|
int i; |
96 |
|
/* get program name */ |
97 |
< |
progname = argv[0]; |
98 |
< |
progtail = strrchr(progname, '/'); /* final component */ |
99 |
< |
if (progtail == NULL) |
100 |
< |
progtail = progname; |
101 |
< |
else |
102 |
< |
progtail++; |
97 |
> |
progname = fixargv0(argv[0]); |
98 |
|
/* get options */ |
99 |
|
for (i = 1; i < argc && argv[i][0] == '-'; i++) |
100 |
|
switch (argv[i][1]) { |
101 |
|
case 't': |
102 |
< |
progtail = argv[++i]; |
102 |
> |
progname = argv[++i]; |
103 |
|
break; |
104 |
|
case 'h': |
105 |
|
print_header = 0; |
116 |
|
} |
117 |
|
/* find and run calculation */ |
118 |
|
for (funp = all_funcs; funp->name != NULL; funp++) |
119 |
< |
if (!strcmp(funp->name, progtail)) { |
119 |
> |
if (!strcmp(funp->name, progname)) { |
120 |
|
init(); |
121 |
|
read_input(); |
122 |
|
if (print_header) { |
375 |
|
omega += (2.*PI-r*PI*(1.+1./(r*r)))*(-p[0]-0.1667*(p[1]+p[3]) |
376 |
|
+0.3334*(p[2]+p[4]+p[5]+p[6])); |
377 |
|
if (omega <= 0.) |
378 |
< |
omega = 0.; |
378 |
> |
continue; |
379 |
|
sum += pow(gs->lum,1.6) * pow(omega,0.8) / |
380 |
|
(gd->indirect*(1./PI) + 0.07*sqrt(gs->dom)*gs->lum); |
381 |
|
} |