Changeset 2843 for trunk/packages/vizservers/nanovis/Unirect.cpp

Timestamp:

Mar 12, 2012 1:13:51 AM (12 years ago)

Author:

ldelgass

Message:

tabs -> spaces

File:

• trunk/packages/vizservers/nanovis/Unirect.cpp (modified) (31 diffs)

trunk/packages/vizservers/nanovis/Unirect.cpp

@@ -18 +18 @@
 {
     while (isspace(*string)) {
-        string++;
+        string++;
     }
     return string;
@@ -30 +30 @@
     line = skipspaces(*stringPtr);
     for (p = line; p < endPtr; p++) {
-        if (*p == '\n') {
-            *p++ = '\0';
-            *stringPtr = p;
-            return line;
-        }
+        if (*p == '\n') {
+            *p++ = '\0';
+            *stringPtr = p;
+            return line;
+        }
     }
     *stringPtr = p;
@@ -48 +48 @@
     int objc;
     if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     int result;
@@ -54 +54 @@
     Tcl_DecrRefCount(objPtr);
     if ((result != TCL_OK) || (!isInitialized())) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     return TCL_OK;
@@ -67 +67 @@
     int objc;
     if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     int result;
@@ -73 +73 @@
     Tcl_DecrRefCount(objPtr);
     if ((result != TCL_OK) || (!isInitialized())) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     return TCL_OK;
@@ -80 +80 @@
 int 
 Rappture::Unirect3d::LoadData(Tcl_Interp *interp, int objc, 
-                              Tcl_Obj *const *objv)
+                              Tcl_Obj *const *objv)
 {
     int num[3], nValues;
@@ -174 +174 @@
 
             if (Tcl_ListObjGetElements(interp, objv[i+1], &nValues, &vobj)
-                != TCL_OK) {
+                != TCL_OK) {
                 return TCL_ERROR;
             }
@@ -182 +182 @@
                 if (GetFloatFromObj(interp, vobj[j], _values + j)!=TCL_OK) {
                     return TCL_ERROR;
-                }
-            }
+                }
+            }
         } else if ((c == 'u') && (strcmp(string, "units") == 0)) {
             _vUnits = strdup(Tcl_GetString(objv[i+1]));
         } else if ((c == 'c') && (strcmp(string, "components") == 0)) {
-            int n;
-
-            if (Tcl_GetIntFromObj(interp, objv[i+1], &n) != TCL_OK) {
-                return TCL_ERROR;
-            }
-            if (n <= 0) {
+            int n;
+
+            if (Tcl_GetIntFromObj(interp, objv[i+1], &n) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            if (n <= 0) {
                 Tcl_AppendResult(interp, "bad extents value: must be > 0",
                                  (char *)NULL);
                 return TCL_ERROR;
             }
-            _nComponents = n;
+            _nComponents = n;
         } else if ((c == 'a') && (strcmp(string, "axisorder") == 0)) {
-            Tcl_Obj **axes;
-            int n;
-
-            if (Tcl_ListObjGetElements(interp, objv[i+1], &n, &axes) 
-                != TCL_OK) {
-                return TCL_ERROR;
-            }
-            if (n != 3) {
-                return TCL_ERROR;
-            }
-            if ((GetAxisFromObj(interp, axes[0], &axis1) != TCL_OK) ||
-                (GetAxisFromObj(interp, axes[1], &axis2) != TCL_OK) ||
-                (GetAxisFromObj(interp, axes[2], &axis3) != TCL_OK)) {
-                return TCL_ERROR;
-            }
+            Tcl_Obj **axes;
+            int n;
+
+            if (Tcl_ListObjGetElements(interp, objv[i+1], &n, &axes) 
+                != TCL_OK) {
+                return TCL_ERROR;
+            }
+            if (n != 3) {
+                return TCL_ERROR;
+            }
+            if ((GetAxisFromObj(interp, axes[0], &axis1) != TCL_OK) ||
+                (GetAxisFromObj(interp, axes[1], &axis2) != TCL_OK) ||
+                (GetAxisFromObj(interp, axes[2], &axis3) != TCL_OK)) {
+                return TCL_ERROR;
+            }
         } else {
             Tcl_AppendResult(interp, "unknown key \"", string,
@@ -225 +225 @@
     }
     if ((size_t)nValues != (num[0] * num[1] * num[2] * _nComponents)) {
-        TRACE("num[0]=%d num[1]=%d num[2]=%d ncomponents=%d nValues=%d\n",
-               num[0], num[1], num[2], _nComponents, nValues);
+        TRACE("num[0]=%d num[1]=%d num[2]=%d ncomponents=%d nValues=%d\n",
+               num[0], num[1], num[2], _nComponents, nValues);
         Tcl_AppendResult(interp, 
-                "wrong # of values: must be xnum*ynum*znum*extents", 
-                         (char *)NULL);
+                "wrong # of values: must be xnum*ynum*znum*extents", 
+                         (char *)NULL);
        return TCL_ERROR;
     }
@@ -235 +235 @@
 #ifdef notdef
     if ((axis1 != 0) || (axis2 != 1) || (axis3 != 2)) {
-        // Reorder the data into x, y, z where x varies fastest and so on.
-        int z;
-        float *data, *dp;
-
-        dp = data = new float[nValues];
-        for (z = 0; z < num[0]; z++) {
-            int y;
-
-            for (y = 0; y < num[1]; y++) {
-                int x;
-
-                for (x = 0; x < num[2]; x++) {
-                    int i;
-                    
-                    /* Compute the index from the data's described ordering. */
-                    i = ((z*num[axis2]*num[axis3]) + (y*num[axis3]) + x) * 3;
-                    for(size_t v = 0; v < _nComponents; v++) {
-                        dp[v] = values[i+v];
-                    }
-                    dp += _nComponents;
-                }
-            }
-        }
-        delete [] values;
-        values = data;
+        // Reorder the data into x, y, z where x varies fastest and so on.
+        int z;
+        float *data, *dp;
+
+        dp = data = new float[nValues];
+        for (z = 0; z < num[0]; z++) {
+            int y;
+
+            for (y = 0; y < num[1]; y++) {
+                int x;
+
+                for (x = 0; x < num[2]; x++) {
+                    int i;
+                    
+                    /* Compute the index from the data's described ordering. */
+                    i = ((z*num[axis2]*num[axis3]) + (y*num[axis3]) + x) * 3;
+                    for(size_t v = 0; v < _nComponents; v++) {
+                        dp[v] = values[i+v];
+                    }
+                    dp += _nComponents;
+                }
+            }
+        }
+        delete [] values;
+        values = data;
     }
 #endif
     _nValues = nValues;
     if (units[3] != NULL) {
-        if (_vUnits != NULL) {
-            free(_vUnits);
-        }
-        _vUnits = strdup(units[3]);
+        if (_vUnits != NULL) {
+            free(_vUnits);
+        }
+        _vUnits = strdup(units[3]);
     }
     _xMin = min[axis3];
@@ -273 +273 @@
     _xNum = num[axis3];
     if (units[axis3] != NULL) {
-        if (_xUnits != NULL) {
-            free(_xUnits);
-        }
-        _xUnits = strdup(units[axis3]);
+        if (_xUnits != NULL) {
+            free(_xUnits);
+        }
+        _xUnits = strdup(units[axis3]);
     }
     _yMin = min[axis2];
@@ -282 +282 @@
     _yNum = num[axis2];
     if (units[axis2] != NULL) {
-        if (_yUnits != NULL) {
-            free(_yUnits);
-        }
-        _yUnits = strdup(units[axis2]);
+        if (_yUnits != NULL) {
+            free(_yUnits);
+        }
+        _yUnits = strdup(units[axis2]);
     }
     _zMin = min[axis1];
@@ -291 +291 @@
     _zNum = num[axis1];
     if (units[axis1] != NULL) {
-        if (_zUnits != NULL) {
-            free(_zUnits);
-        }
-        _zUnits = strdup(units[axis1]);
+        if (_zUnits != NULL) {
+            free(_zUnits);
+        }
+        _zUnits = strdup(units[axis1]);
     }
     _initialized = true;
 #ifdef notdef
     { 
-        FILE *f;
-        f = fopen("/tmp/unirect3d.txt", "w");
-        fprintf(f, "unirect3d xmin %g xmax %g xnum %d ", _xMin, _xMax, _xNum);
-        fprintf(f, "ymin %g ymax %g ynum %d ", _yMin, _yMax, _yNum);
-        fprintf(f, "zmin %g zmax %g znum %d ", _zMin, _zMax, _zNum);
-        fprintf(f, "components %d values {\n",  _nComponents);
-        for (size_t i = 0; i < _nValues; i+= 3) {
-            fprintf(f, "%g %g %g\n", _values[i], _values[i+1], _values[i+2]);
-        }
-        fprintf(f, "}\n");
-        fclose(f);
+        FILE *f;
+        f = fopen("/tmp/unirect3d.txt", "w");
+        fprintf(f, "unirect3d xmin %g xmax %g xnum %d ", _xMin, _xMax, _xNum);
+        fprintf(f, "ymin %g ymax %g ynum %d ", _yMin, _yMax, _yNum);
+        fprintf(f, "zmin %g zmax %g znum %d ", _zMin, _zMax, _zNum);
+        fprintf(f, "components %d values {\n",  _nComponents);
+        for (size_t i = 0; i < _nValues; i+= 3) {
+            fprintf(f, "%g %g %g\n", _values[i], _values[i+1], _values[i+2]);
+        }
+        fprintf(f, "}\n");
+        fclose(f);
     }
 #endif
@@ -318 +318 @@
 int 
 Rappture::Unirect2d::LoadData(Tcl_Interp *interp, int objc, 
-                              Tcl_Obj *const *objv)
+                              Tcl_Obj *const *objv)
 {
     if ((objc & 0x01) == 0) {
@@ -328 +328 @@
 
     int axis[2];
-    axis[0] = 1;                        /* X-axis */
+    axis[0] = 1;                         /* X-axis */
     axis[1] = 0;                        /* Y-axis */
 
@@ -334 +334 @@
     _xMin = _yMin = _xMax = _yMax = 0.0f;
     if (_xUnits != NULL) {
-        free(_xUnits);
+        free(_xUnits);
     }
     if (_yUnits != NULL) {
-        free(_yUnits);
+        free(_yUnits);
     }
     if (_vUnits != NULL) {
-        free(_vUnits);
+        free(_vUnits);
     }
     _xUnits = _yUnits = _vUnits = NULL;
@@ -361 +361 @@
             }
         } else if ((c == 'x') && (strcmp(string, "xnum") == 0)) {
-            int n;
+            int n;
             if (Tcl_GetIntFromObj(interp, objv[i+1], &n) != TCL_OK) {
                 return TCL_ERROR;
@@ -370 +370 @@
                 return TCL_ERROR;
             }
-            _xNum = n;
+            _xNum = n;
         } else if ((c == 'x') && (strcmp(string, "xunits") == 0)) {
             _xUnits = strdup(Tcl_GetString(objv[i+1]));
@@ -382 +382 @@
             }
         } else if ((c == 'y') && (strcmp(string, "ynum") == 0)) {
-            int n;
+            int n;
             if (Tcl_GetIntFromObj(interp, objv[i+1], &n) != TCL_OK) {
                 return TCL_ERROR;
@@ -391 +391 @@
                 return TCL_ERROR;
             }
-            _yNum = n;
+            _yNum = n;
         } else if ((c == 'y') && (strcmp(string, "yunits") == 0)) {
             _yUnits = strdup(Tcl_GetString(objv[i+1]));
         } else if ((c == 'v') && (strcmp(string, "values") == 0)) {
             Tcl_Obj **vobj;
-            int n;
-
-            Tcl_IncrRefCount(objv[i+1]);
+            int n;
+
+            Tcl_IncrRefCount(objv[i+1]);
             if (Tcl_ListObjGetElements(interp, objv[i+1], &n, &vobj) != TCL_OK){
                 return TCL_ERROR;
             }
-            if (n <= 0) {
+            if (n <= 0) {
                 Tcl_AppendResult(interp, "empty values list : must be > 0",
                                  (char *)NULL);
                 return TCL_ERROR;
-            }
-            _nValues = n;
+            }
+            _nValues = n;
             _values = (float *)realloc(_values, sizeof(float) * _nValues);
             size_t j;
@@ -413 +413 @@
                 if (GetFloatFromObj(interp, vobj[j], _values + j)!=TCL_OK) {
                     return TCL_ERROR;
-                }
-            }
-            Tcl_DecrRefCount(objv[i+1]);
+                }
+            }
+            Tcl_DecrRefCount(objv[i+1]);
         } else if ((c == 'u') && (strcmp(string, "units") == 0)) {
             _vUnits = strdup(Tcl_GetString(objv[i+1]));
         } else if ((c == 'c') && (strcmp(string, "components") == 0)) {
-            int n;
-
-            if (Tcl_GetIntFromObj(interp, objv[i+1], &n) != TCL_OK) {
-                return TCL_ERROR;
-            }
-            if (n <= 0) {
+            int n;
+
+            if (Tcl_GetIntFromObj(interp, objv[i+1], &n) != TCL_OK) {
+                return TCL_ERROR;
+            }
+            if (n <= 0) {
                 Tcl_AppendResult(interp, "bad extents value: must be > 0",
                                  (char *)NULL);
                 return TCL_ERROR;
             }
-            _nComponents = n;
+            _nComponents = n;
         } else if ((c == 'a') && (strcmp(string, "axisorder") == 0)) {
-            Tcl_Obj **order;
-            int n;
-
-            if (Tcl_ListObjGetElements(interp, objv[i+1], &n, &order) 
-                != TCL_OK) {
-                return TCL_ERROR;
-            }
-            if (n != 2) {
-                Tcl_AppendResult(interp, 
-                        "wrong # of axes defined for ordering the data",
-                        (char *)NULL);
-                return TCL_ERROR;
-            }
-            if ((GetAxisFromObj(interp, order[0], axis) != TCL_OK) ||
-                (GetAxisFromObj(interp, order[1], axis+1) != TCL_OK)) {
-                return TCL_ERROR;
-            }
+            Tcl_Obj **order;
+            int n;
+
+            if (Tcl_ListObjGetElements(interp, objv[i+1], &n, &order) 
+                != TCL_OK) {
+                return TCL_ERROR;
+            }
+            if (n != 2) {
+                Tcl_AppendResult(interp, 
+                        "wrong # of axes defined for ordering the data",
+                        (char *)NULL);
+                return TCL_ERROR;
+            }
+            if ((GetAxisFromObj(interp, order[0], axis) != TCL_OK) ||
+                (GetAxisFromObj(interp, order[1], axis+1) != TCL_OK)) {
+                return TCL_ERROR;
+            }
         } else {
             Tcl_AppendResult(interp, "unknown key \"", string,
@@ -460 +460 @@
     if (_nValues != (_xNum * _yNum * _nComponents)) {
         Tcl_AppendResult(interp, 
-                "wrong number of values: must be xnum*ynum*components", 
-                         (char *)NULL);
+                "wrong number of values: must be xnum*ynum*components", 
+                         (char *)NULL);
         return TCL_ERROR;
     }
     
     if ((axis[0] != 1) || (axis[1] != 0)) {
-        TRACE("reordering data\n");
-        /* Reorder the data into x, y where x varies fastest and so on. */
-        size_t y;
-        float *dp;
-
-        dp = _values = (float *)realloc(_values, sizeof(float) * _nValues);
-        for (y = 0; y < _yNum; y++) {
-            size_t x;
-
-            for (x = 0; x < _xNum; x++) {
-                size_t i, v;
-                    
-                /* Compute the index from the data's described ordering. */
-                i = (y + (_yNum * x)) * _nComponents;
-                for(v = 0; v < _nComponents; v++) {
-                    dp[v] = _values[i+v];
-                }
-                dp += _nComponents;
-            }
-        }
+        TRACE("reordering data\n");
+        /* Reorder the data into x, y where x varies fastest and so on. */
+        size_t y;
+        float *dp;
+
+        dp = _values = (float *)realloc(_values, sizeof(float) * _nValues);
+        for (y = 0; y < _yNum; y++) {
+            size_t x;
+
+            for (x = 0; x < _xNum; x++) {
+                size_t i, v;
+                    
+                /* Compute the index from the data's described ordering. */
+                i = (y + (_yNum * x)) * _nComponents;
+                for(v = 0; v < _nComponents; v++) {
+                    dp[v] = _values[i+v];
+                }
+                dp += _nComponents;
+            }
+        }
     }
     _initialized = true;
@@ -494 +494 @@
 bool
 Rappture::Unirect3d::ImportDx(Rappture::Outcome &result, size_t nComponents,
-                              size_t length, char *string) 
+                              size_t length, char *string) 
 {
     int nx, ny, nz, npts;
@@ -504 +504 @@
     nx = ny = nz = npts = 0;            /* Suppress compiler warning. */
     for (p = string, pend = p + length; p < pend; /*empty*/) {
-        char *line;
-
-        line = getline(&p, pend);
+        char *line;
+
+        line = getline(&p, pend);
         if (line == pend) {
-            break;                      /* EOF */
-        }
+            break;                        /* EOF */
+        }
         if ((line[0] == '#') || (line == '\0')) {
-            continue;                   /* Skip blank or comment lines. */
-        }
-        if (sscanf(line, "object %*d class gridpositions counts %d %d %d", 
-                   &nx, &ny, &nz) == 3) {
-            if ((nx < 0) || (ny < 0) || (nz < 0)) {
-                result.addError("invalid grid size: x=%d, y=%d, z=%d", 
-                        nx, ny, nz);
-                return false;
-            }
-        } else if (sscanf(line, "origin %lg %lg %lg", &x0, &y0, &z0) == 3) {
-            /* Found origin. */
-        } else if (sscanf(line, "delta %lg %lg %lg", &ddx, &ddy, &ddz) == 3) {
-            /* Found one of the delta lines. */
-            if (ddx != 0.0) {
-                dx = ddx;
-            } else if (ddy != 0.0) {
-                dy = ddy;
-            } else if (ddz != 0.0) {
-                dz = ddz;
-            }
-        } else if (sscanf(line, "object %*d class array type %*s shape 3"
-                " rank 1 items %d data follows", &npts) == 1) {
-            if (npts < 0) {
-                result.addError("bad # points %d", npts);
-                return false;
-            }   
-            printf("#points=%d\n", npts);
-            if (npts != nx*ny*nz) {
-                result.addError("inconsistent data: expected %d points"
-                                " but found %d points", nx*ny*nz, npts);
-                return false;
-            }
-            break;
-        } else if (sscanf(line, "object %*d class array type %*s rank 0"
-                " times %d data follows", &npts) == 1) {
-            if (npts != nx*ny*nz) {
-                result.addError("inconsistent data: expected %d points"
-                                " but found %d points", nx*ny*nz, npts);
-                return false;
-            }
-            break;
-        }
+            continue;                        /* Skip blank or comment lines. */
+        }
+        if (sscanf(line, "object %*d class gridpositions counts %d %d %d", 
+                   &nx, &ny, &nz) == 3) {
+            if ((nx < 0) || (ny < 0) || (nz < 0)) {
+                result.addError("invalid grid size: x=%d, y=%d, z=%d", 
+                        nx, ny, nz);
+                return false;
+            }
+        } else if (sscanf(line, "origin %lg %lg %lg", &x0, &y0, &z0) == 3) {
+            /* Found origin. */
+        } else if (sscanf(line, "delta %lg %lg %lg", &ddx, &ddy, &ddz) == 3) {
+            /* Found one of the delta lines. */
+            if (ddx != 0.0) {
+                dx = ddx;
+            } else if (ddy != 0.0) {
+                dy = ddy;
+            } else if (ddz != 0.0) {
+                dz = ddz;
+            }
+        } else if (sscanf(line, "object %*d class array type %*s shape 3"
+                " rank 1 items %d data follows", &npts) == 1) {
+            if (npts < 0) {
+                result.addError("bad # points %d", npts);
+                return false;
+            }
+            TRACE("#points=%d\n", npts);
+            if (npts != nx*ny*nz) {
+                result.addError("inconsistent data: expected %d points"
+                                " but found %d points", nx*ny*nz, npts);
+                return false;
+            }
+            break;
+        } else if (sscanf(line, "object %*d class array type %*s rank 0"
+                " times %d data follows", &npts) == 1) {
+            if (npts != nx*ny*nz) {
+                result.addError("inconsistent data: expected %d points"
+                                " but found %d points", nx*ny*nz, npts);
+                return false;
+            }
+            break;
+        }
     }
     if (npts != nx*ny*nz) {
-        result.addError("inconsistent data: expected %d points"
-                        " but found %d points", nx*ny*nz, npts);
-        return false;
+        result.addError("inconsistent data: expected %d points"
+                        " but found %d points", nx*ny*nz, npts);
+        return false;
     }
 
@@ -573 +573 @@
     _nValues = 0;
     for (size_t ix = 0; ix < _xNum; ix++) {
-        for (size_t iy = 0; iy < _yNum; iy++) {
-            for (size_t iz = 0; iz < _zNum; iz++) {
-                char *line;
-                if ((p == pend) || (_nValues > (size_t)npts)) {
-                    break;
-                }
-                line = getline(&p, pend);
-                if ((line[0] == '#') || (line[0] == '\0')) {
-                    continue;           /* Skip blank or comment lines. */
-                }
-                double vx, vy, vz;
-                if (sscanf(line, "%lg %lg %lg", &vx, &vy, &vz) == 3) {
-                    int nindex = (iz*nx*ny + iy*nx + ix) * 3;
-                    if (vx < _xValueMin) {
-                        _xValueMin = vx;
-                    } else if (vx > _xValueMax) {
-                        _xValueMax = vx;
-                    }
-                    if (vy < _yValueMin) {
-                        _yValueMin = vy;
-                    } else if (vy > _yValueMax) {
-                        _yValueMax = vy;
-                    }
-                    if (vz < _zValueMin) {
-                        _zValueMin = vz;
-                    } else if (vz > _zValueMax) {
-                        _zValueMax = vz;
-                    }
-                    _values[nindex] = vx;
-                    _values[nindex+1] = vy;
-                    _values[nindex+2] = vz;
-                    _nValues++;
-                }
-            }
-        }
+        for (size_t iy = 0; iy < _yNum; iy++) {
+            for (size_t iz = 0; iz < _zNum; iz++) {
+                char *line;
+                if ((p == pend) || (_nValues > (size_t)npts)) {
+                    break;
+                }
+                line = getline(&p, pend);
+                if ((line[0] == '#') || (line[0] == '\0')) {
+                    continue;                /* Skip blank or comment lines. */
+                }
+                double vx, vy, vz;
+                if (sscanf(line, "%lg %lg %lg", &vx, &vy, &vz) == 3) {
+                    int nindex = (iz*nx*ny + iy*nx + ix) * 3;
+                    if (vx < _xValueMin) {
+                        _xValueMin = vx;
+                    } else if (vx > _xValueMax) {
+                        _xValueMax = vx;
+                    }
+                    if (vy < _yValueMin) {
+                        _yValueMin = vy;
+                    } else if (vy > _yValueMax) {
+                        _yValueMax = vy;
+                    }
+                    if (vz < _zValueMin) {
+                        _zValueMin = vz;
+                    } else if (vz > _zValueMax) {
+                        _zValueMax = vz;
+                    }
+                    _values[nindex] = vx;
+                    _values[nindex+1] = vy;
+                    _values[nindex+2] = vz;
+                    _nValues++;
+                }
+            }
+        }
     }
     /* Make sure that we read all of the expected points. */
     if (_nValues != (size_t)npts) {
-        result.addError("inconsistent data: expected %d points"
-                        " but found %d points", npts, _nValues);
-        free(_values);
-        _values = NULL;
-        return false;
+        result.addError("inconsistent data: expected %d points"
+                        " but found %d points", npts, _nValues);
+        free(_values);
+        _values = NULL;
+        return false;
     }
     _nValues *= _nComponents;
@@ -621 +621 @@
 #ifdef notdef
     { 
-        FILE *f;
-        f = fopen("/tmp/dx.txt", "w");
-        fprintf(f, "unirect3d xmin %g xmax %g xnum %d ", _xMin, _xMax, _xNum);
-        fprintf(f, "ymin %g ymax %g ynum %d ", _yMin, _yMax, _yNum);
-        fprintf(f, "zmin %g zmax %g znum %d ", _zMin, _zMax, _zNum);
-        fprintf(f, "components %d values {\n",  _nComponents);
-        for (size_t i = 0; i < _nValues; i+= 3) {
-            fprintf(f, "%g %g %g\n", _values[i], _values[i+1], _values[i+2]);
-        }
-        fprintf(f, "}\n");
-        fclose(f);
+        FILE *f;
+        f = fopen("/tmp/dx.txt", "w");
+        fprintf(f, "unirect3d xmin %g xmax %g xnum %d ", _xMin, _xMax, _xNum);
+        fprintf(f, "ymin %g ymax %g ynum %d ", _yMin, _yMax, _yNum);
+        fprintf(f, "zmin %g zmax %g znum %d ", _zMin, _zMax, _zNum);
+        fprintf(f, "components %d values {\n",  _nComponents);
+        for (size_t i = 0; i < _nValues; i+= 3) {
+            fprintf(f, "%g %g %g\n", _values[i], _values[i+1], _values[i+2]);
+        }
+        fprintf(f, "}\n");
+        fclose(f);
     }
 #endif
@@ -650 +650 @@
     size_t i, j;
     for (i = 0, j = 0; i < _nValues; i += _nComponents, j++) {
-        double vx, vy, vz;
-
-        vx = _values[i];
-        vy = _values[i+1];
-        vz = _values[i+2];
-        
-        xfield.define(j, vx);
-        yfield.define(j, vy);
-        zfield.define(j, vz);
+        double vx, vy, vz;
+
+        vx = _values[i];
+        vy = _values[i+1];
+        vz = _values[i+2];
+        
+        xfield.define(j, vx);
+        yfield.define(j, vy);
+        zfield.define(j, vz);
     }
     // Figure out a good mesh spacing
@@ -690 +690 @@
     float *destPtr = _values;
     for (size_t i = 0; i < _zNum; i++) {
-        double z;
-
-        z = _zMin + (i * dmin);
-        for (size_t j = 0; j < _yNum; j++) {
-            double y;
-                
-            y = _yMin + (j * dmin);
-            for (size_t k = 0; k < _xNum; k++) {
-                double x;
-
-                x = _xMin + (k * dmin);
-                destPtr[0] = xfield.value(x, y, z);
-                destPtr[1] = yfield.value(x, y, z);
-                destPtr[2] = zfield.value(x, y, z);
-            }
-        }
+        double z;
+
+        z = _zMin + (i * dmin);
+        for (size_t j = 0; j < _yNum; j++) {
+            double y;
+                
+            y = _yMin + (j * dmin);
+            for (size_t k = 0; k < _xNum; k++) {
+                double x;
+
+                x = _xMin + (k * dmin);
+                destPtr[0] = xfield.value(x, y, z);
+                destPtr[1] = yfield.value(x, y, z);
+                destPtr[2] = zfield.value(x, y, z);
+            }
+        }
     }
     _nValues = _xNum * _yNum * _zNum * _nComponents;
@@ -720 +720 @@
     size_t i;
     for (i = 0; i < _nValues; i += _nComponents) {
-        double vx, vy, vz, vm;
-
-        vx = _values[i];
-        vy = _values[i+1];
-        vz = _values[i+2];
-                    
-        vm = sqrt(vx*vx + vy*vy + vz*vz);
-        if (vm > _magMax) {
-            _magMax = vm;
-        }
-        if (vm < _magMin) {
-            _magMin = vm;
-        }
+        double vx, vy, vz, vm;
+
+        vx = _values[i];
+        vy = _values[i+1];
+        vz = _values[i+2];
+                    
+        vm = sqrt(vx*vx + vy*vy + vz*vz);
+        if (vm > _magMax) {
+            _magMax = vm;
+        }
+        if (vm < _magMin) {
+            _magMin = vm;
+        }
     }
 }
@@ -756 +756 @@
     case 1:
     case 3:
-        _values = (float *)realloc(_values, sizeof(float) * dataPtr->nValues());
-        if (_values == NULL) {
-            return false;
-        }
-        memcpy(_values, dataPtr->values(), dataPtr->nValues());
-        _nValues = dataPtr->nValues();
-        _nComponents = dataPtr->nComponents();
-        break;
+        _values = (float *)realloc(_values, sizeof(float) * dataPtr->nValues());
+        if (_values == NULL) {
+            return false;
+        }
+        memcpy(_values, dataPtr->values(), dataPtr->nValues());
+        _nValues = dataPtr->nValues();
+        _nComponents = dataPtr->nComponents();
+        break;
     case 2:
-        float *values;
-        _nValues = 3 * _xNum * _yNum * _zNum;
-        _values = (float *)realloc(_values, sizeof(float) * _nValues);
-        if (_values == NULL) {
-            return false;
-        }
-        values = dataPtr->values();
-        size_t i, j;
-        for(j = i = 0; i < dataPtr->nValues(); i += 2, j+= 3) {
-            _values[j] = values[i];
-            _values[j+1] = values[i+1];
-            _values[j+2] = 0.0f;
-        }           
-        _nComponents = 3;
-        break;
+        float *values;
+        _nValues = 3 * _xNum * _yNum * _zNum;
+        _values = (float *)realloc(_values, sizeof(float) * _nValues);
+        if (_values == NULL) {
+            return false;
+        }
+        values = dataPtr->values();
+        size_t i, j;
+        for (j = i = 0; i < dataPtr->nValues(); i += 2, j+= 3) {
+            _values[j] = values[i];
+            _values[j+1] = values[i+1];
+            _values[j+2] = 0.0f;
+        }
+        _nComponents = 3;
+        break;
     }
     return true;