Fixes for #243 and #244.

Author: imckstewart

src/grid2fits.c

@@ -1415,7 +1415,7 @@ The present function mallocs the pointer *links.
       processFitsError(status);
 
       for(i_LL=0;i_LL<totalNumLinks;i_LL++)
-        (*links)[i_LL].vels[gridInfoRead->nDims*j_us + i_us] = vels[i_LL];
+        (*links)[i_LL].vels[gridInfoRead->nDims*i_us + j_us] = vels[i_LL];
     }
   }
   free(vels);

src/grid2hdf5.c

@@ -1882,7 +1882,7 @@ The present function mallocs the pointer *links.
 //*** check status?
 
       for(i_ui=0;i_ui<gridInfoRead->nLinks;i_ui++)
-        (*links)[i_ui].vels[gridInfoRead->nDims*j_us + i_us] = vels[i_ui];
+        (*links)[i_ui].vels[gridInfoRead->nDims*i_us + j_us] = vels[i_ui];
     }
   }
   free(vels);

src/gridio.c

@@ -634,16 +634,7 @@ There is a subtle point about ordering to grasp. The order of the .vels entries
     gp[i_ui].v2 = malloc(gridInfoRead.nDims*gp[i_ui].numNeigh*sizeof(double));
     gp[i_ui].v3 = malloc(gridInfoRead.nDims*gp[i_ui].numNeigh*sizeof(double));
   }
-  for(i_ui=gridInfoRead.nInternalPoints;i_ui<gridInfoRead.nSinkPoints;i_ui++){
-    for(j=0;j<gp[i_ui].numNeigh;j++){
-      for(i_us=0;i_us<gridInfoRead.nDims;i_us++){
-        gp[i_ui].v1[gridInfoRead.nDims*j+i_us] = 0.0;
-        gp[i_ui].v2[gridInfoRead.nDims*j+i_us] = 0.0;
-        gp[i_ui].v3[gridInfoRead.nDims*j+i_us] = 0.0;
-      }
-    }
-  }
-  for(i_ui=0;i_ui<gridInfoRead.nInternalPoints;i_ui++){
+  for(i_ui=0;i_ui<totalNumGridPoints;i_ui++){
     for(j=0;j<gp[i_ui].numNeigh;j++){
       linkPtr = nnLinks[firstNearNeigh[i_ui]+j];
       if(linkPtr->gis[0]==i_ui){

src/raytrace.c

@@ -1391,11 +1391,11 @@ While this is off however, gsl_* calls will not exit if they encounter a problem
     if(img[im].doline && img[im].doInterpolateVels){
       free(velBuff.shapeFns);
       for(i=0;i<velBuff.numEdges;i++)
-        free(velBuff.edgeVels);
+        free(velBuff.edgeVels[i]);
       free(velBuff.edgeVels);
       free(velBuff.edgeVertexIndices);
       for(i=0;i<velBuff.numVertices;i++)
-        free(velBuff.vertexVels);
+        free(velBuff.vertexVels[i]);
       free(velBuff.vertexVels);
       free(velBuff.exitCellBary);
       free(velBuff.midCellBary);