260 |
|
if (rbf == NULL) |
261 |
|
goto memerr; |
262 |
|
memcpy(rbf, mig->rbfv[0], n); /* just duplicate */ |
263 |
+ |
rbf->next = NULL; rbf->ejl = NULL; |
264 |
|
return(rbf); |
265 |
|
} |
266 |
|
full_dist = acos(DOT(mig->rbfv[0]->invec, mig->rbfv[1]->invec)); |
270 |
|
if (rbf == NULL) |
271 |
|
goto memerr; |
272 |
|
memcpy(rbf, mig->rbfv[1], n); /* just duplicate */ |
273 |
+ |
rbf->next = NULL; rbf->ejl = NULL; |
274 |
|
return(rbf); |
275 |
|
} |
276 |
|
t /= full_dist; |
307 |
|
rbf->rbfa[n].crad = ANG2R(sqrt(rad0*rad0*(1.-t) + |
308 |
|
rad1*rad1*t)); |
309 |
|
ovec_from_pos(v, rbf1j->gx, rbf1j->gy); |
310 |
< |
geodesic(v, v0, v, t*full_dist, GEOD_RAD); |
310 |
> |
geodesic(v, v0, v, t, GEOD_REL); |
311 |
|
pos_from_vec(pos, v); |
312 |
|
rbf->rbfa[n].gx = pos[0]; |
313 |
|
rbf->rbfa[n].gy = pos[1]; |
333 |
|
float mbfact, mcfact; |
334 |
|
int n, i, j, k; |
335 |
|
FVECT v0, v1, v2; |
336 |
< |
double s, t, t_full; |
336 |
> |
double s, t; |
337 |
|
|
338 |
|
VCOPY(sivec, invec); /* find triangle/edge */ |
339 |
|
sym = get_interp(miga, sivec); |
365 |
|
s = acos(DOT(v0,v1)) / acos(DOT(v0,v2)); |
366 |
|
geodesic(v1, miga[0]->rbfv[0]->invec, miga[0]->rbfv[1]->invec, |
367 |
|
s, GEOD_REL); |
368 |
< |
t = acos(DOT(v1,sivec)) / |
367 |
< |
(t_full = acos(DOT(v1,miga[1]->rbfv[1]->invec))); |
368 |
> |
t = acos(DOT(v1,sivec)) / acos(DOT(v1,miga[1]->rbfv[1]->invec)); |
369 |
|
n = 0; /* count migrating particles */ |
370 |
|
for (i = 0; i < mtx_nrows(miga[0]); i++) |
371 |
|
for (j = 0; j < mtx_ncols(miga[0]); j++) |
412 |
|
float mc = mtx_coef(miga[2],i,k); |
413 |
|
const RBFVAL *rbf2k; |
414 |
|
double rad2k; |
414 |
– |
FVECT vout; |
415 |
|
int pos[2]; |
416 |
|
if ((mb <= FTINY) & (mc <= FTINY)) |
417 |
|
continue; |
420 |
|
rad2k = R2ANG(rbf2k->crad); |
421 |
|
rbf->rbfa[n].crad = ANG2R(sqrt(srad2 + t*rad2k*rad2k)); |
422 |
|
ovec_from_pos(v2, rbf2k->gx, rbf2k->gy); |
423 |
< |
geodesic(vout, v1, v2, t*t_full, GEOD_RAD); |
424 |
< |
pos_from_vec(pos, vout); |
423 |
> |
geodesic(v2, v1, v2, t, GEOD_REL); |
424 |
> |
pos_from_vec(pos, v2); |
425 |
|
rbf->rbfa[n].gx = pos[0]; |
426 |
|
rbf->rbfa[n].gy = pos[1]; |
427 |
|
++n; |