331 |
|
float mbfact, mcfact; |
332 |
|
int n, i, j, k; |
333 |
|
FVECT v0, v1, v2; |
334 |
< |
double s, t, s_full, t_full; |
334 |
> |
double s, t, t_full; |
335 |
|
|
336 |
|
VCOPY(sivec, invec); /* find triangle/edge */ |
337 |
|
sym = get_interp(miga, sivec); |
360 |
|
normalize(v2); |
361 |
|
fcross(v1, sivec, miga[1]->rbfv[1]->invec); |
362 |
|
normalize(v1); |
363 |
< |
s = acos(DOT(v0,v1)); |
363 |
> |
s = acos(DOT(v0,v1)) / acos(DOT(v0,v2)); |
364 |
|
geodesic(v1, miga[0]->rbfv[0]->invec, miga[0]->rbfv[1]->invec, |
365 |
< |
s, GEOD_RAD); |
366 |
< |
s /= s_full = acos(DOT(v0,v2)); |
365 |
> |
s, GEOD_REL); |
366 |
|
t = acos(DOT(v1,sivec)) / |
367 |
|
(t_full = acos(DOT(v1,miga[1]->rbfv[1]->invec))); |
368 |
|
n = 0; /* count migrating particles */ |
405 |
|
rad1j = R2ANG(rbf1j->crad); |
406 |
|
srad2 = (1.-s)*(1.-t)*rad0i*rad0i + s*(1.-t)*rad1j*rad1j; |
407 |
|
ovec_from_pos(v1, rbf1j->gx, rbf1j->gy); |
408 |
< |
geodesic(v1, v0, v1, s*s_full, GEOD_RAD); |
408 |
> |
geodesic(v1, v0, v1, s, GEOD_REL); |
409 |
|
for (k = 0; k < mtx_ncols(miga[2]); k++) { |
410 |
|
float mb = mtx_coef(miga[1],j,k); |
411 |
|
float mc = mtx_coef(miga[2],i,k); |