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

Diff for /JSOC/proj/libs/interpolate/gapfill.c between version 1.9 and 1.10

version 1.9, 2010/09/02 18:29:49 version 1.10, 2011/12/06 18:11:03
Line 5 
Line 5 
 #include <math.h> #include <math.h>
 #include <mkl.h> #include <mkl.h>
 #include <omp.h> #include <omp.h>
   #include <sys/param.h>
 #include "cholesky_down.h" #include "cholesky_down.h"
 #include "gapfill.h" #include "gapfill.h"
 #include "drms_defs.h"  
  
 #define minval(x,y) (((x) < (y)) ? (x) : (y)) #define minval(x,y) (((x) < (y)) ? (x) : (y))
 #define maxval(x,y) (((x) < (y)) ? (y) : (x)) #define maxval(x,y) (((x) < (y)) ? (y) : (x))
  
   #define kInterpDataDir "proj/libs/interpolate/data"
   
 struct work_struct { struct work_struct {
  double *a,*rh,*a1b,*a1r,*a1x;  double *a,*rh,*a1b,*a1r,*a1x;
  int *wgood,*wbad;  int *wgood,*wbad;
Line 56  int init_fill(
Line 59  int init_fill(
   int targetx, // Target point in x (normally (order-1)/2)   int targetx, // Target point in x (normally (order-1)/2)
   int targety, // Target point in y (normally (order-1)/2)   int targety, // Target point in y (normally (order-1)/2)
   struct fill_struct *pars, // Structure to save setup information etc.   struct fill_struct *pars, // Structure to save setup information etc.
   char **filenamep // Pointer to name of file to read covariance from.    char **filenamep, // Pointer to name of file to read covariance from.
                    // Set to actual file used if method > 0.                    // Set to actual file used if method > 0.
     const char *path // to data files read by this function.
 ) )
 { {
   double *acor;   double *acor;
Line 72  int init_fill(
Line 76  int init_fill(
   double *a0,*rh0,*a0t,*rh0t;   double *a0,*rh0,*a0t,*rh0t;
   int info;   int info;
   char uplo[] = "U";   char uplo[] = "U";
     char buf[PATH_MAX];
  
   pars->order=order;   pars->order=order;
  
Line 81  int init_fill(
Line 86  int init_fill(
     pars->filename=strdup(*filenamep);     pars->filename=strdup(*filenamep);
     break;     break;
   case 8:   case 8:
     pars->filename=strdup(DEFS_MKPATH("/data/acor1_08_80.txt"));      snprintf(buf, sizeof(buf), "%s/%s/acor1_08_80.txt", path, kInterpDataDir);
       pars->filename=strdup(buf);
     break;     break;
   case 9:   case 9:
     pars->filename=strdup(DEFS_MKPATH("/data/acor1_09_80.txt"));      snprintf(buf, sizeof(buf), "%s/%s/acor1_09_80.txt", path, kInterpDataDir);
       pars->filename=strdup(buf);
     break;     break;
   case 10:   case 10:
     pars->filename=strdup(DEFS_MKPATH("/data/acor1_10_80.txt"));      snprintf(buf, sizeof(buf), "%s/%s/acor1_10_80.txt", path, kInterpDataDir);
       pars->filename=strdup(buf);
     break;     break;
   case 11:   case 11:
     pars->filename=strdup(DEFS_MKPATH("/data/acor1_11_80.txt"));      snprintf(buf, sizeof(buf), "%s/%s/acor1_11_80.txt", path, kInterpDataDir);
       pars->filename=strdup(buf);
     break;     break;
   default:   default:
     printf("Unknown method in init_fill.\n");     printf("Unknown method in init_fill.\n");

Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10
Karen Tian
 Powered by
ViewCVS 0.9.4