Changeset 230 for trunk/matml/src/castabox

Timestamp:

03/02/06 22:48:58 (3 years ago)

Author:

powell

Message:

Fixes for new PETSc 2.3.0, illuminator 0.10.0.

Location:

trunk/matml/src/castabox

Files:

• castabox.c (modified) (8 diffs)
• makefile (modified) (1 diff)

trunk/matml/src/castabox/castabox.c

@@ -21 +21 @@
 
 #include <stdlib.h> /* For atoi() */
+#include <string.h>
 /* This also #includes petscda.h, petscvec.h and several other dependencies. */
 #include <illuminator.h>
@@ -272 +273 @@
   int ts=0, plots=6, keepon=1, ierr;
   char outstring [101];
+  ISurface Surf;
+  IDisplay Disp;
+
+  DPRINTF ("Starting the Geomview display using Illuminator.\n",0);
+  ierr = SurfCreate (&Surf); CHKERRQ (ierr);
+  ierr = GeomviewBegin (PETSC_COMM_WORLD, &Disp); CHKERRQ (ierr);
 
   DPRINTF ("Calculating maximum stable explicit timestep size.\n",0);
@@ -351 +358 @@
                   { 0., p.width_x, 0., p.width_y, 0., p.width_z };
 
-                ierr = DATriangulate (box_da, global, TEMPERATURE, minmax,
+                ierr = DATriangulate (Surf, box_da,global, TEMPERATURE, minmax,
                                       plots=newplots, plot_temps, plot_colors,
-                                      PETSC_NULL, PETSC_NULL, PETSC_NULL);
+                                      PETSC_FALSE, PETSC_FALSE, PETSC_FALSE);
                 CHKERRQ (ierr);
                 /* Work-around for illuminator non-periodic bug */
@@ -360 +367 @@
                 minmax[5] = p.width_z * (p.grid_z-1) / p.grid_z;
                 ierr = GeomviewDisplayTriangulation
-                  (PETSC_COMM_WORLD, minmax, "Temperature", PETSC_FALSE); CHKERRQ(ierr);
+                  (PETSC_COMM_WORLD, Surf, Disp, minmax, "Temperature",
+                   PETSC_FALSE); CHKERRQ(ierr);
               }
             else
@@ -424 +432 @@
                       { 0., p.width_x, 0., p.width_y, 0., p.width_z };
 
-                    ierr = DATriangulate (box_da, global, TEMPERATURE, minmax,
-                                          plots, plot_temps, plot_colors,
-                                          PETSC_NULL, PETSC_NULL, PETSC_NULL);
+                    ierr = DATriangulate (Surf, box_da, global, TEMPERATURE,
+                                          minmax, plots,plot_temps,plot_colors,
+                                          PETSC_FALSE,PETSC_FALSE,PETSC_FALSE);
                     CHKERRQ (ierr);
                     /* Work-around for illuminator non-periodic bug */
@@ -433 +441 @@
                     minmax[5] = p.width_z * (p.grid_z-1) / p.grid_z;
                     ierr = GeomviewDisplayTriangulation
-                      (PETSC_COMM_WORLD, minmax, "Temperature", PETSC_FALSE); CHKERRQ(ierr);
+                      (PETSC_COMM_WORLD, Surf, Disp, minmax, "Temperature",
+                       PETSC_FALSE); CHKERRQ (ierr);
+                    ierr = SurfClear (Surf); CHKERRQ (ierr);
                   }
               }
@@ -451 +461 @@
     }
 
+  ierr = GeomviewEnd (PETSC_COMM_WORLD, Disp); CHKERRQ (ierr);
   return 0;
 }
@@ -593 +604 @@
   }
 
-  DPRINTF ("Starting the Geomview display using Illuminator.\n",0);
-  ierr = GeomviewBegin (PETSC_COMM_WORLD); CHKERRQ (ierr);
-
   DPRINTF ("Starting the timestep loop...\n",0);
   ierr = timestep_loop (box_da, p);
 
   DPRINTF ("Shutting down.\n",0);
-  ierr = GeomviewEnd (PETSC_COMM_WORLD); CHKERRQ (ierr);
   ierr = DADestroy (box_da); CHKERRQ (ierr);
   ierr = PetscFinalize (); CHKERRQ (ierr);

trunk/matml/src/castabox/makefile

@@ -9 +9 @@
 
 castabox: castabox.c
-        $(CC) $^ -o $@ $(PETSC_DM_LIB) -lluminate $(PETSC_INCLUDE) \
-          -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include #-DDEBUG
+        $(CC) $^ -o $@ $(PETSC_DM_LIB_BASIC) -lluminate $(PETSC_INCLUDE) \
+          `pkg-config --cflags gtk+-2.0` #-DDEBUG
 
 clean: