(file) Return to sharp.c CVS log (file) (dir) Up to [Development] / JSOC / proj / sharp / apps

Diff for /JSOC/proj/sharp/apps/sharp.c between version 1.29 and 1.30

version 1.29, 2014/06/02 19:47:10 version 1.30, 2014/06/05 21:27:19
Line 180  struct swIndex {
Line 180  struct swIndex {
     float totpot_err;     float totpot_err;
     float meanshear_angle_err;     float meanshear_angle_err;
     float Rparam;     float Rparam;
       float totfx;
       float totfy;
       float totfz;
       float totbsq;
       float epsx;
       float epsy;
       float epsz;
 }; };
  
 // Mapping method // Mapping method
Line 1937  void computeSWIndex(struct swIndex *swKe
Line 1944  void computeSWIndex(struct swIndex *swKe
         // convert cdelt1_orig from degrees to arcsec         // convert cdelt1_orig from degrees to arcsec
         float cdelt1       = (atan((rsun_ref*cdelt1_orig*RADSINDEG)/(dsun_obs)))*(1/RADSINDEG)*(3600.);         float cdelt1       = (atan((rsun_ref*cdelt1_orig*RADSINDEG)/(dsun_obs)))*(1/RADSINDEG)*(3600.);
  
   
   
         //if (nx1 > floor((nx-1)/scale + 1) )         //if (nx1 > floor((nx-1)/scale + 1) )
         //      DIE("X-dimension of output array in fsample() is too large.");         //      DIE("X-dimension of output array in fsample() is too large.");
         //if (ny1 > floor((ny-1)/scale + 1) )         //if (ny1 > floor((ny-1)/scale + 1) )
Line 1983  void computeSWIndex(struct swIndex *swKe
Line 1988  void computeSWIndex(struct swIndex *swKe
         float *p1pad   = (float *)malloc(nxp*nyp*sizeof(float));         float *p1pad   = (float *)malloc(nxp*nyp*sizeof(float));
         float *pmapn   = (float *)malloc(nx1*ny1*sizeof(float));         float *pmapn   = (float *)malloc(nx1*ny1*sizeof(float));
  
           // define some arrays for the lorentz force calculation
           float *fx = (float *) (malloc(nxny * sizeof(float)));
           float *fy = (float *) (malloc(nxny * sizeof(float)));
           float *fz = (float *) (malloc(nxny * sizeof(float)));
   
   
         //spaceweather quantities computed         //spaceweather quantities computed
         if (computeAbsFlux(bz_err, bz , dims, &(swKeys_ptr->absFlux), &(swKeys_ptr->mean_vf),  &(swKeys_ptr->mean_vf_err),         if (computeAbsFlux(bz_err, bz , dims, &(swKeys_ptr->absFlux), &(swKeys_ptr->mean_vf),  &(swKeys_ptr->mean_vf_err),
                            &(swKeys_ptr->count_mask), mask, bitmask, cdelt1, rsun_ref, rsun_obs))                            &(swKeys_ptr->count_mask), mask, bitmask, cdelt1, rsun_ref, rsun_obs))
Line 2094  void computeSWIndex(struct swIndex *swKe
Line 2105  void computeSWIndex(struct swIndex *swKe
         }         }
  
  
           if (computeLorentz(bx, by, bz, fx, fy, fz, dims, &(swKeys_ptr->totfx), &(swKeys_ptr->totfy), &(swKeys_ptr->totfz), &(swKeys_ptr->totbsq),
              &(swKeys_ptr->epsx), &(swKeys_ptr->epsy), &(swKeys_ptr->epsz), mask, bitmask, cdelt1, rsun_ref, rsun_obs))
           {
                   swKeys_ptr->totfx             = DRMS_MISSING_FLOAT;
                   swKeys_ptr->totfy             = DRMS_MISSING_FLOAT;
                   swKeys_ptr->totfz             = DRMS_MISSING_FLOAT;
                   swKeys_ptr->totbsq            = DRMS_MISSING_FLOAT;
                   swKeys_ptr->epsx              = DRMS_MISSING_FLOAT;
                   swKeys_ptr->epsy              = DRMS_MISSING_FLOAT;
                   swKeys_ptr->epsz              = DRMS_MISSING_FLOAT;
   
           }
   
   
         // Clean up the arrays         // Clean up the arrays
  
         drms_free_array(bitmaskArray);          // Dec 18 2012 Xudong         drms_free_array(bitmaskArray);          // Dec 18 2012 Xudong
Line 2116  void computeSWIndex(struct swIndex *swKe
Line 2141  void computeSWIndex(struct swIndex *swKe
         free(jz_err_squared); free(jz_rms_err);         free(jz_err_squared); free(jz_rms_err);
         free(jz_err_squared_smooth);         free(jz_err_squared_smooth);
  
           // free the arrays that are related to the r calculation
         free(rim);         free(rim);
         free(p1p0);         free(p1p0);
         free(p1n0);         free(p1n0);
Line 2125  void computeSWIndex(struct swIndex *swKe
Line 2151  void computeSWIndex(struct swIndex *swKe
         free(pmap);         free(pmap);
         free(p1pad);         free(p1pad);
         free(pmapn);         free(pmapn);
   
           // free the arrays that are related to the lorentz calculation
           free(fx); free(fy); free(fz);
 } }
  
 /* /*
Line 2167  void setSWIndex(DRMS_Record_t *outRec, s
Line 2196  void setSWIndex(DRMS_Record_t *outRec, s
     drms_setkey_float(outRec, "ERRTPOT", swKeys_ptr->totpot_err);     drms_setkey_float(outRec, "ERRTPOT", swKeys_ptr->totpot_err);
     drms_setkey_float(outRec, "ERRMSHA", swKeys_ptr->meanshear_angle_err);     drms_setkey_float(outRec, "ERRMSHA", swKeys_ptr->meanshear_angle_err);
     drms_setkey_float(outRec, "R_VALUE", swKeys_ptr->Rparam);     drms_setkey_float(outRec, "R_VALUE", swKeys_ptr->Rparam);
       drms_setkey_float(outRec, "TOTFX",   swKeys_ptr->totfx);
       drms_setkey_float(outRec, "TOTFY",   swKeys_ptr->totfy);
       drms_setkey_float(outRec, "TOTFZ",   swKeys_ptr->totfz);
       drms_setkey_float(outRec, "TOTBSQ",  swKeys_ptr->totbsq);
       drms_setkey_float(outRec, "EPSX",    swKeys_ptr->epsx);
       drms_setkey_float(outRec, "EPSY",    swKeys_ptr->epsy);
       drms_setkey_float(outRec, "EPSZ",    swKeys_ptr->epsz);
 }; };
  
 /* /*

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