(file) Return to finterpolate.c CVS log (file) (dir) Up to [Development] / JSOC / proj / libs / interpolate

Diff for /JSOC/proj/libs/interpolate/finterpolate.c between version 1.3 and 1.4

version 1.3, 2010/03/19 18:33:36 version 1.4, 2010/03/19 19:04:08
Line 362  private (xk1,xk2,yk1,yk2,sum,sum1,i1,j1,
Line 362  private (xk1,xk2,yk1,yk2,sum,sum1,i1,j1,
 shared (pars,nlead,nx,ny,xin,yin,nleadin,nxin,nyin,image_in,image_out,order) \ shared (pars,nlead,nx,ny,xin,yin,nleadin,nxin,nyin,image_in,image_out,order) \
 shared (malign,order2,kersx,ixmax,iymax,xmax,ymax,shift0,edgemode,extrapolate,fillval) shared (malign,order2,kersx,ixmax,iymax,xmax,ymax,shift0,edgemode,extrapolate,fillval)
 { // Needed to define parallel region { // Needed to define parallel region
     ixins=(float *)(MKL_malloc(nx*sizeof(int),malign));      ixins=(float *)(MKL_malloc(nx*sizeof(float),malign));
     iyins=(float *)(MKL_malloc(nx*sizeof(int),malign));      iyins=(float *)(MKL_malloc(nx*sizeof(float),malign));
     fxins=(float *)(MKL_malloc(nx*sizeof(float),malign));     fxins=(float *)(MKL_malloc(nx*sizeof(float),malign));
     fyins=(float *)(MKL_malloc(nx*sizeof(float),malign));     fyins=(float *)(MKL_malloc(nx*sizeof(float),malign));
     ixin1s=(float *)(MKL_malloc(nx*sizeof(float),malign));     ixin1s=(float *)(MKL_malloc(nx*sizeof(float),malign));
Line 548  shared(image_in,xin,yin,image_out,extrap
Line 548  shared(image_in,xin,yin,image_out,extrap
 shared(nx,ny,nlead,nxin,nyin,nleadin) \ shared(nx,ny,nlead,nxin,nyin,nleadin) \
 shared(malign,xmin,xmax,ymin,ymax) shared(malign,xmin,xmax,ymin,ymax)
   { // Needed to define parallel region   { // Needed to define parallel region
     ixins=(float *)(MKL_malloc(nx*sizeof(int),malign));      ixins=(float *)(MKL_malloc(nx*sizeof(float),malign));
     iyins=(float *)(MKL_malloc(nx*sizeof(int),malign));      iyins=(float *)(MKL_malloc(nx*sizeof(float),malign));
  
 #pragma omp for #pragma omp for
     for (j=0; j<ny; j++) {     for (j=0; j<ny; j++) {
Line 654  shared(image_in,xin,yin,image_out) \
Line 654  shared(image_in,xin,yin,image_out) \
 shared(nxin,nyin,nleadin,nx,ny,nlead,extrapolate,fillval) \ shared(nxin,nyin,nleadin,nx,ny,nlead,extrapolate,fillval) \
 shared(malign,xmin,xmax,ymin,ymax) shared(malign,xmin,xmax,ymin,ymax)
   { // Needed to define parallel region   { // Needed to define parallel region
     ixins=(float *)(MKL_malloc(nx*sizeof(int),malign));      ixins=(float *)(MKL_malloc(nx*sizeof(float),malign));
     iyins=(float *)(MKL_malloc(nx*sizeof(int),malign));      iyins=(float *)(MKL_malloc(nx*sizeof(float),malign));
  
 #pragma omp for #pragma omp for
     for (j=0; j<ny; j++) {     for (j=0; j<ny; j++) {


Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4

Karen Tian
Powered by
ViewCVS 0.9.4