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

[luis at geodynamics.org]

Author: luis
Date: 2006-08-06 21:56:58 -0700 (Sun, 06 Aug 2006)
New Revision: 4240

Added:
   mc/3D/CitcomS/trunk/lib/hdf5_related.h
Removed:
   mc/3D/CitcomS/trunk/lib/hdf5_info.h
Modified:
   mc/3D/CitcomS/trunk/lib/Makefile.am
   mc/3D/CitcomS/trunk/lib/global_defs.h
Log:
Need to maintain multiple structs in header file, so
renaming hdf5_info.h to hdf5_related.h


Modified: mc/3D/CitcomS/trunk/lib/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/lib/Makefile.am	2006-08-07 00:46:55 UTC (rev 4239)
+++ mc/3D/CitcomS/trunk/lib/Makefile.am	2006-08-07 04:56:58 UTC (rev 4240)
@@ -63,7 +63,7 @@
 	General_matrix_functions.c \
 	global_defs.h \
 	Global_operations.c \
-	hdf5_info.h \
+	hdf5_related.h \
 	Initial_temperature.c \
 	initial_temperature.h \
 	Instructions.c \

Modified: mc/3D/CitcomS/trunk/lib/global_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/global_defs.h	2006-08-07 00:46:55 UTC (rev 4239)
+++ mc/3D/CitcomS/trunk/lib/global_defs.h	2006-08-07 04:56:58 UTC (rev 4240)
@@ -132,7 +132,7 @@
     float y2[40];
     float halfw[40];
     float mag[40];
-} ;
+};
 
 
 struct Circ {
@@ -183,7 +183,7 @@
     float z2[40];
     float halfw[40];
     float mag[40];
-} ;
+};
 
 
 struct CircBc {
@@ -227,7 +227,7 @@
     float ka[20][40];
     float phx[20][40];
     float phz[20][40];
- };
+};
 
 
 struct Shape_function_dA  {
@@ -797,6 +797,10 @@
     float   timedir;
 };
 
+#ifdef USE_HDF5
+#include "hdf5_related.h"
+#endif
+
 struct All_variables {
 
 #include "solver.h"
@@ -806,13 +810,13 @@
 #include "advection.h"
 #include "tracer_defs.h"
 
-#ifdef USE_HDF5
-#include "hdf5_info.h"
-#endif
-
     FILE *fp;
     FILE *fptime;
     FILE *fp_out;
+
+#ifdef USE_HDF5
+    struct HDF5_INFO hdf5;
+#endif
     struct HAVE Have;
     struct BAVE Bulkave;
     struct MESH_DATA mesh;

Deleted: mc/3D/CitcomS/trunk/lib/hdf5_info.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/hdf5_info.h	2006-08-07 00:46:55 UTC (rev 4239)
+++ mc/3D/CitcomS/trunk/lib/hdf5_info.h	2006-08-07 04:56:58 UTC (rev 4240)
@@ -1,79 +0,0 @@
-/*
- *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * 
- *<LicenseText>
- *
- * CitcomS by Louis Moresi, Shijie Zhong, Lijie Han, Eh Tan,
- * Clint Conrad, Michael Gurnis, and Eun-seo Choi.
- * Copyright (C) 1994-2005, California Institute of Technology.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *</LicenseText>
- * 
- *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
-/* In this file we define the contents of the HDF5_INFO data structure
- * that is used for collective output of citcom data. The contents
- * of this structure are initialized by the function h5output_open().
- */
-
-struct HDF5_INFO
-{
-    char filename[100];
-
-    /* Keep a reference to the open hdf5 output file */
-    hid_t file_id;
-
-    /* Default type used is H5T_NATIVE_FLOAT */
-    hid_t type_id;
-
-    /* Keep track of how many times we call h5output() */
-    int count;
-
-    /* Group names under which to store the appropriate data,
-     * represented by an array of strings. For a regional
-     * model, only cap_groups[0] should be used.
-     */
-    char cap_groups[12][7];
-    
-    /* Cap ID for current process */
-    int capid;
-
-
-    /* Temporary data buffers to use in dataset writes...
-     * Note that most of these buffers correspond to time-slices
-     * over a filespace in the HDF5 file.
-     *
-     * vector3d: coord, velocity
-     * scalar3d: temperature, viscosity, pressure
-     * vector2d: surf_coord, surf_velocity
-     * scalar2d: surf_heatflux, surf_topography
-     * scalar1d: horiz_avg_temperature, horiz_rms_vz, horiz_rms_vxy
-     *
-     */
-    
-    double *connectivity;           /* shape (nel,8) */
-    double *material;               /* shape (nel,) */
-    double *stress;                 /* shape (nx,ny,nz,6) */
-
-    double *vector3d;               /* shape (nx,ny,nz,3) */
-    double *scalar3d;               /* shape (nx,ny,nz) */
-    double *vector2d;               /* shape (nx,ny,2) */
-    double *scalar2d;               /* shape (nx,ny) */
-    double *scalar1d;               /* shape (nz,) */
-
-} hdf5;

Copied: mc/3D/CitcomS/trunk/lib/hdf5_related.h (from rev 4238, mc/3D/CitcomS/trunk/lib/hdf5_info.h)