Changeset 5263 for anuga_work

Timestamp:

May 1, 2008, 3:34:03 PM (17 years ago)

Author:

jack

Message:

AnugaVis?: Tightened up the init code.

Location:

anuga_work/development/anugavis/src

Files:

• Makefile.am (modified) (1 diff)
• anugavis_simple.c (modified) (2 diffs)
• globals.h (modified) (1 diff)
• init.c (modified) (2 diffs)
• netcdf_util.c (added)
• netcdf_util.h (added)

anuga_work/development/anugavis/src/Makefile.am

@@ -13 +13 @@
                         init.c \
                         init.h \
+                        netcdf_util.c \
+                        netcdf_util.h \
                         xmalloc.c \
                         xmalloc.h

anuga_work/development/anugavis/src/anugavis_simple.c

@@ -3 +3 @@
 #include "height_quantity.h"
 #include "init.h"
+#include "globals.h"
+#include <stdio.h>
 int main(int argc, char *argv[]){
   if(argc != 2){
@@ -12 +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){

anuga_work/development/anugavis/src/globals.h

@@ -9 +9 @@
   int netcdfId;
   size_t number_of_points;
+  size_t number_of_vertices;
+  size_t number_of_volumes;
   float *x;
   float *y;

anuga_work/development/anugavis/src/init.c

@@ -20 +20 @@
 #include "error.h"
 #include "globals.h"
+#include "netcdf_util.h"
 #include "xmalloc.h"
 
@@ -51 +52 @@
 
   if((ncstatus = nc_open(swwFilePath, NC_SHARE,
-                         &anugavis.netcdfId)) != NC_NOERR) goto nc_err;
-  if((ncstatus = nc_inq_dimid(anugavis.netcdfId, "number_of_points",
-                              &ncdimid)) != NC_NOERR) goto nc_err1;
-  if((ncstatus = nc_inq_dimlen(anugavis.netcdfId, ncdimid,
-                               &anugavis.number_of_points)) != NC_NOERR)
-    goto nc_err1;
+                         &anugavis.netcdfId)) != NC_NOERR){
+    SDL_Quit();
+    return -1;
+  }
 
-  /* 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;
-
+  if((nc_inq_dimlen_by_name(anugavis.netcdfId, "number_of_points",
+                            &anugavis.number_of_points) != NC_NOERR) ||
+     (nc_inq_dimlen_by_name(anugavis.netcdfId, "number_of_vertices",
+                            &anugavis.number_of_vertices) != NC_NOERR) ||
+     (nc_inq_dimlen_by_name(anugavis.netcdfId, "number_of_volumes",
+                            &anugavis.number_of_volumes) != NC_NOERR) ||
+     ((anugavis.x = xmalloc(sizeof(float) * anugavis.number_of_points,
+                            "AnugaVis_Init()")) == NULL) ||
+     ((anugavis.y = xmalloc(sizeof(float) * anugavis.number_of_points,
+                            "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)){
+    nc_close(anugavis.netcdfId);
+    if(anugavis.x != NULL) free(anugavis.x);
+    if(anugavis.y != NULL) free(anugavis.y);
+    SDL_Quit();
+    return -1;
+  }
   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;
 }