Changeset 5228 for anuga_work/development/anugavis/src/libanugavis/height_quantity.c

Timestamp:

Apr 22, 2008, 1:36:01 PM (16 years ago)

Author:

jack

Message:

anugavis: Added checking of dynamism in simple height quantities.
anugavis: Added basic OpenGL initialisation. Broke building of DLL.

File:

• anuga_work/development/anugavis/src/libanugavis/height_quantity.c (modified) (3 diffs)

anuga_work/development/anugavis/src/libanugavis/height_quantity.c

@@ -1 +1 @@
 #include <stdlib.h>
 #include <string.h>
+#include <netcdf.h>
 #include <SDL.h>
 #include "anugavis.h"
@@ -7 +8 @@
 #include "height_quantity.h"
 
-int AnugaVis_DefineHeightQuantity(char *name,
+int AnugaVis_DefineHeightQuantity(const char *name,
                                   double offset, double scale,
                                   int red, int green, int blue){
   struct height_quantity_simple *height;
+  int ncstatus;
+  int ncvarid;
+  int numdims;
+  /* Check that it's actually in the NetCDF file */
+  if((ncstatus = nc_inq_varid(anugavis.netcdfId, name, &ncvarid)) != NC_NOERR){
+    AnugaVis_NetCDFError(ncstatus);
+    return -1;
+  }     
+
   /* Redefining a quantity? */
   for(height = anugavis.heights ; height != NULL ; height = height->next)
@@ -26 +36 @@
   }
   
-  /* TODO: use NetCDF to check if the quantity is dynamic */
+  /* If the NetCDF variable is 2-dimensional, then it's dynamic. */
+  if((ncstatus = nc_inq_varndims(anugavis.netcdfId,
+                                 ncvarid, &numdims)) != NC_NOERR){
+    AnugaVis_NetCDFError(ncstatus);
+    return -1;
+  }
+  height->dynamic = (numdims == 2);
   height->offset = offset;
   height->scale = scale;