Changeset 5261

Timestamp:

May 1, 2008, 3:02:09 PM (16 years ago)

Author:

jack

Message:

AnugaVis?: read lists of x and y points from NetCDF file.

Location:

anuga_work/development/anugavis/src

Files:

• Makefile.am (modified) (1 diff)
• events.c (added)
• events.h (added)
• globals.h (modified) (1 diff)
• height_quantity.c (modified) (2 diffs)
• init.c (modified) (4 diffs)
• init.h (added)
• xmalloc.c (added)
• xmalloc.h (added)

anuga_work/development/anugavis/src/Makefile.am

@@ -12 +12 @@
                         height_quantity.h \
                         init.c \
-                        init.h
+                        init.h \
+                        xmalloc.c \
+                        xmalloc.h
 libanugavis_a_CFLAGS = @SDL_CFLAGS@ @GLU_CFLAGS@
 libanugavis_a_LIBADD = @LIBOBJS@

anuga_work/development/anugavis/src/globals.h

@@ -9 +9 @@
   int netcdfId;
   size_t number_of_points;
+  float *x;
+  float *y;
+  float *cells;
   struct height_quantity_simple *heights;
 } ANUGAVIS;

anuga_work/development/anugavis/src/height_quantity.c

@@ -14 +14 @@
 #include "globals.h"
 #include "height_quantity.h"
+#include "xmalloc.h"
 
 int AnugaVis_DefineHeightQuantity(const char *name,
@@ -33 +34 @@
 
   if(height == NULL){ /* Make a new entry. */
-    if((height = malloc(sizeof(struct height_quantity_simple))) == NULL){
-      AnugaVis_SetError("Failed to malloc %d bytes in "
-                        "AnugaVis_DefineHeightQuantity()",
-                        sizeof(struct height_quantity_simple));
+    if((height = xmalloc(sizeof(struct height_quantity_simple),
+                         "AnugaVis_DefineHeightQuantity()")) == NULL)
       return -1;
-    }
     height->next = anugavis.heights;
     anugavis.heights = height;

anuga_work/development/anugavis/src/init.c

@@ -3 +3 @@
 #endif
 
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
 #ifdef HAVE_GL_GL_H
 #  include <GL/gl.h>
@@ -17 +20 @@
 #include "error.h"
 #include "globals.h"
+#include "xmalloc.h"
 
 int AnugaVis_Init(int width, int height, const char *swwFilePath){
   int ncstatus;
   int ncdimid;
+  int ncvarid;
+  anugavis.x = NULL;
+  anugavis.y = NULL;
+  anugavis.cells = NULL;
+  anugavis.heights = NULL;
   if((SDL_Init(SDL_INIT_VIDEO) == -1) ||
      (SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5) == -1) ||
@@ -44 +53 @@
                          &anugavis.netcdfId)) != NC_NOERR) goto nc_err;
   if((ncstatus = nc_inq_dimid(anugavis.netcdfId, "number_of_points",
-                              &ncdimid)) != NC_NOERR) goto nc_err;
+                              &ncdimid)) != NC_NOERR) goto nc_err1;
   if((ncstatus = nc_inq_dimlen(anugavis.netcdfId, ncdimid,
                                &anugavis.number_of_points)) != NC_NOERR)
-    goto nc_err;
+    goto nc_err1;
 
-  anugavis.heights = NULL;
+  /* Get the number of vertices to keep space for. */
+  if((anugavis.x = xmalloc(sizeof(float) * anugavis.number_of_points,
+                           "AnugaVis_Init()")) == NULL)
+    goto bad_malloc;
+  if((anugavis.y = xmalloc(sizeof(float) * anugavis.number_of_points,
+                           "AnugaVis_Init()")) == NULL)
+    goto bad_malloc;
+
+  /* Load the list of x and y points from the NetCDF file. */
+  if((ncstatus = nc_inq_varid(anugavis.netcdfId, "x",
+                              &ncvarid)) != NC_NOERR) goto nc_err1;
+  if((ncstatus = nc_get_var_float(anugavis.netcdfId, ncvarid,
+                                  anugavis.x)) != NC_NOERR) goto nc_err1;
+  if((ncstatus = nc_inq_varid(anugavis.netcdfId, "y",
+                              &ncvarid)) != NC_NOERR) goto nc_err1;
+  if((ncstatus = nc_get_var_float(anugavis.netcdfId, ncvarid,
+                                  anugavis.y)) != NC_NOERR) goto nc_err1;
+
   return 0;
+ nc_err1:
+  nc_close(anugavis.netcdfId);
  nc_err:
   AnugaVis_NetCDFError(ncstatus);
+ bad_malloc:
+  if(anugavis.x != NULL) free(anugavis.x);
+  if(anugavis.y != NULL) free(anugavis.y);
   SDL_Quit();
   return -1;
@@ -61 +92 @@
     AnugaVis_UndefineHeightQuantity(anugavis.heights->name);
   nc_close(anugavis.netcdfId);
+  free(anugavis.x);
+  free(anugavis.y);
   SDL_Quit();
 }