[cig-commits] r4096 - mc/3D/CitcomS/trunk/lib

[luis at geodynamics.org]

Author: luis
Date: 2006-07-24 04:18:58 -0700 (Mon, 24 Jul 2006)
New Revision: 4096

Modified:
   mc/3D/CitcomS/trunk/lib/global_defs.h
Log:
Added output function pointer to All_variables struct.


Modified: mc/3D/CitcomS/trunk/lib/global_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/global_defs.h	2006-07-21 16:03:56 UTC (rev 4095)
+++ mc/3D/CitcomS/trunk/lib/global_defs.h	2006-07-24 11:18:58 UTC (rev 4096)
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include "mpi.h"
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include "hdf5.h"
 #endif
 
@@ -631,27 +631,33 @@
     int post_p;
     int post_topo;
     int SLAB;
+
     char GEOMETRY[20]; /* one of ... */
     int CART2D;
     int CART2pt5D;
     int CART3D;
     int AXI;
+    
     char SOLVER_TYPE[20]; /* one of ... */
     int DIRECT;
     int CONJ_GRAD;
     int NMULTIGRID;
     int EMULTIGRID;
     int DIRECTII;
+    
     char NODE_SPACING[20]; /* turns into ... */
     int GRID_TYPE;
     int COMPRESS;
     int AVS;
     int CONMAN;
+    
     int read_density;
     int read_slab;
     int read_slabgeoid;
+
+    int output_format;  /* 0: ascii, 1: hdf5 */
+    int pseudo_free_surf;
     int tracer;
-    int pseudo_free_surf;
 
 
     double theta_min, theta_max, fi_min, fi_max;
@@ -793,7 +799,7 @@
 #include "advection.h"
 #include "tracer_defs.h"
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include "hdf5_info.h"
 #endif
 
@@ -913,6 +919,9 @@
 
     float (* node_space_function[3])(void*);
 
+    /* function pointer for choosing between various output routines */
+    void (* output)(struct All_variables *, int);
+
   /* the following function pointers are for exchanger */
   void (* exchange_node_d)(struct All_variables *, double**, int);
   void (* exchange_node_f)(struct All_variables *, float**, int);