Index: trunk/Ohana/src/opihi/cmd.data/contour.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/contour.c	(revision 7917)
+++ trunk/Ohana/src/opihi/cmd.data/contour.c	(revision 20936)
@@ -44,11 +44,10 @@
 int N, NVEC;
 
-void DUMP (float x, float y, float dx, float dy) {
-  
-  xv[0].elements[N]   = x;
-  xv[0].elements[N+1] = x+dx;
-  
-  yv[0].elements[N]   = y;
-  yv[0].elements[N+1] = y+dy;
+void DUMP (opihi_flt x, opihi_flt y, opihi_flt dx, opihi_flt dy) {
+  
+  xv[0].elements.Flt[N]   = x;
+  xv[0].elements.Flt[N+1] = x+dx;
+  yv[0].elements.Flt[N]   = y;
+  yv[0].elements.Flt[N+1] = y+dy;
   
   N+=2;
@@ -56,6 +55,6 @@
   if (N >= NVEC - 2) {
     NVEC += 100;
-    REALLOCATE (xv[0].elements, float, NVEC);
-    REALLOCATE (yv[0].elements, float, NVEC);
+    REALLOCATE (xv[0].elements.Flt, opihi_flt, NVEC);
+    REALLOCATE (yv[0].elements.Flt, opihi_flt, NVEC);
   }
 }
@@ -64,6 +63,6 @@
 
   int i, j, Nx, Ny;
+  opihi_flt x, y, dx, dy;
   float level, d00, d01, d10, d11, tmp;
-  float x, y, dx, dy;
   float *v00, *v01, *v10, *v11;
   float *matrix;
@@ -93,6 +92,6 @@
   N = 0;
   NVEC = 100;
-  REALLOCATE (xv[0].elements, float, NVEC);
-  REALLOCATE (yv[0].elements, float, NVEC);
+  ResetVector (xv, OPIHI_FLT, NVEC);
+  ResetVector (yv, OPIHI_FLT, NVEC);
 
   for (j = 1; j < Ny; j++) {