Changeset 5264

Timestamp:

May 1, 2008, 3:50:15 PM (17 years ago)

Author:

jack

Message:

AnugaVis? loads volume data from NetCDF file.

Location:

anuga_work/development/anugavis/src

Files:

• anugavis_simple.c (modified) (1 diff)
• globals.h (modified) (1 diff)
• init.c (modified) (3 diffs)
• netcdf_util.c (modified) (1 diff)
• netcdf_util.h (modified) (1 diff)

anuga_work/development/anugavis/src/anugavis_simple.c

@@ -14 +14 @@
     return 1;
   }
-
-  printf("points: %d\nvertices: %d\nvolumes: %d\n",
-         anugavis.number_of_points,
-         anugavis.number_of_vertices,
-         anugavis.number_of_volumes);
-
   if(AnugaVis_DefineHeightQuantity("elevation", 0, 1, 128, 128, 128) == -1){
     printf("AnugaVis_DefineHeightQuantity() Error: %s\n", AnugaVis_GetError());

anuga_work/development/anugavis/src/globals.h

@@ -13 +13 @@
   float *x;
   float *y;
-  float *cells;
+  int *volumes;
   struct height_quantity_simple *heights;
 } ANUGAVIS;

anuga_work/development/anugavis/src/init.c

@@ -29 +29 @@
   anugavis.x = NULL;
   anugavis.y = NULL;
-  anugavis.cells = NULL;
+  anugavis.volumes = NULL;
   anugavis.heights = NULL;
   if((SDL_Init(SDL_INIT_VIDEO) == -1) ||
@@ -67 +67 @@
      ((anugavis.y = xmalloc(sizeof(float) * anugavis.number_of_points,
                             "AnugaVis_Init()")) == NULL) ||
+     ((anugavis.volumes = xmalloc(sizeof(int)
+                                  * anugavis.number_of_volumes
+                                  * anugavis.number_of_vertices,
+                                  "AnugaVis_Init()")) == NULL) ||
      (nc_get_var_float_by_name(anugavis.netcdfId, "x",
                                anugavis.x) != NC_NOERR) ||
      (nc_get_var_float_by_name(anugavis.netcdfId, "y",
-                               anugavis.y) != NC_NOERR)){
+                               anugavis.y) != NC_NOERR) ||
+     (nc_get_var_int_by_name(anugavis.netcdfId, "volumes",
+                             anugavis.volumes) != NC_NOERR)){
     nc_close(anugavis.netcdfId);
     if(anugavis.x != NULL) free(anugavis.x);
     if(anugavis.y != NULL) free(anugavis.y);
+    if(anugavis.volumes != NULL) free(anugavis.volumes);
     SDL_Quit();
     return -1;
@@ -86 +93 @@
   free(anugavis.x);
   free(anugavis.y);
+  free(anugavis.volumes);
   SDL_Quit();
 }

anuga_work/development/anugavis/src/netcdf_util.c

@@ -19 +19 @@
   return status;
 }
+
+int nc_get_var_int_by_name(int ncid, const char *name, int *ip){
+  int status;
+  int varid;
+  if(((status = nc_inq_varid(ncid, name, &varid)) != NC_NOERR) ||
+     ((status = nc_get_var_int(ncid, varid, ip)) != NC_NOERR))
+    AnugaVis_NetCDFError(status);
+  return status;
+}

anuga_work/development/anugavis/src/netcdf_util.h

@@ -5 +5 @@
 extern int nc_inq_dimlen_by_name(int ncid, const char *name, size_t *size);
 extern int nc_get_var_float_by_name(int ncid, const char *name, float *fp);
+extern int nc_get_var_int_by_name(int ncid, const char *name, int *ip);
 
 #endif