Changeset 5267 for anuga_work/development/anugavis/src/init.c

Timestamp:

May 2, 2008, 12:13:55 PM (17 years ago)

Author:

jack

Message:

AnugaVis?: compile the data into openGL display lists.

File:

• anuga_work/development/anugavis/src/init.c (modified) (5 diffs)

anuga_work/development/anugavis/src/init.c

@@ -20 +20 @@
 #include "error.h"
 #include "globals.h"
+#include "init.h"
 #include "netcdf_util.h"
-#include "xmalloc.h"
+#include "xfunctions.h"
 
 int AnugaVis_Init(int width, int height, const char *swwFilePath){
@@ -43 +44 @@
   }
 
+  SDL_WM_SetCaption("ANUGA Visualiser", "ANUGA Visualiser");
   glEnable(GL_DEPTH_TEST);
   glShadeModel(GL_FLAT);
@@ -63 +65 @@
      (nc_inq_dimlen_by_name(anugavis.netcdfId, "number_of_volumes",
                             &anugavis.number_of_volumes) != NC_NOERR) ||
+     (nc_inq_dimlen_by_name(anugavis.netcdfId, "number_of_timesteps",
+                            &anugavis.number_of_timesteps) != NC_NOERR) ||
      ((anugavis.x = xmalloc(sizeof(float) * anugavis.number_of_points,
                             "AnugaVis_Init()")) == NULL) ||
@@ -77 +81 @@
      (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();
+    AnugaVis_DeInit();
     return -1;
   }
@@ -91 +91 @@
     AnugaVis_UndefineHeightQuantity(anugavis.heights->name);
   nc_close(anugavis.netcdfId);
-  free(anugavis.x);
-  free(anugavis.y);
-  free(anugavis.volumes);
+  if(anugavis.x != NULL) free(anugavis.x);
+  if(anugavis.y != NULL) free(anugavis.y);
+  if(anugavis.volumes != NULL) free(anugavis.volumes);
   SDL_Quit();
 }