[cig-commits] r4508 - in mc/3D/CitcomS/trunk: lib visual

[luis at geodynamics.org]

Author: luis
Date: 2006-09-10 00:36:21 -0700 (Sun, 10 Sep 2006)
New Revision: 4508

Modified:
   mc/3D/CitcomS/trunk/lib/Output_h5.c
   mc/3D/CitcomS/trunk/visual/estimate.py
Log:
Moved connectivity dataset to root group.


Modified: mc/3D/CitcomS/trunk/lib/Output_h5.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output_h5.c	2006-09-10 03:05:30 UTC (rev 4507)
+++ mc/3D/CitcomS/trunk/lib/Output_h5.c	2006-09-10 07:36:21 UTC (rev 4508)
@@ -130,7 +130,7 @@
         h5output_surf_botm_coord(E);
         h5output_have_coord(E);
         h5output_material(E);
-        if(E->output.connectivity == 1)
+        if(E->output.connectivity == 1 && E->hdf5.capid == 0)
             h5output_connectivity(E);
     }
 
@@ -267,16 +267,23 @@
     h5allocate_field(E, SCALAR_FIELD, 1, 1, dtype, &(E->hdf5.scalar1d));
 
 
-    /*
-     * Create time table (to store nondimensional and cpu times)
-     */
-
+    /********************************************************************
+     * Create time table (to store nondimensional and cpu times)        *
+     ********************************************************************/
     h5create_time(file_id);
 
 
-    /*
-     * Create necessary groups and arrays
-     */
+    /********************************************************************
+     * Create connectivity dataset                                      *
+     ********************************************************************/
+    procs_per_cap = nprocx * nprocy * nprocz;
+    if (E->output.connectivity == 1)
+        h5create_connectivity(file_id, E->lmesh.nel * procs_per_cap);
+
+
+    /********************************************************************
+     * Create necessary groups and arrays                               *
+     ********************************************************************/
     for(cap = 0; cap < caps; cap++)
     {
         cap_name = E->hdf5.cap_names[cap];
@@ -300,13 +307,6 @@
             h5create_stress(cap_group, E->hdf5.tensor3d);
 
         /********************************************************************
-         * Create connectivity dataset                                      *
-         ********************************************************************/
-        procs_per_cap = nprocx * nprocy * nprocz;
-        if (E->output.connectivity == 1)
-            h5create_connectivity(cap_group, E->lmesh.nel * procs_per_cap);
-
-        /********************************************************************
          * Create /cap/surf/ group                                          *
          ********************************************************************/
         if (E->output.surf == 1)
@@ -2001,7 +2001,7 @@
         data[8*e+7] = ien[8]-1;
     }
 
-    dataset = H5Dopen(E->hdf5.cap_group, "connectivity");
+    dataset = H5Dopen(E->hdf5.file_id, "connectivity");
 
     status = h5write_dataset(dataset, H5T_NATIVE_INT, data, rank, memdims,
                              offset, stride, count, block);

Modified: mc/3D/CitcomS/trunk/visual/estimate.py
===================================================================
--- mc/3D/CitcomS/trunk/visual/estimate.py	2006-09-10 03:05:30 UTC (rev 4507)
+++ mc/3D/CitcomS/trunk/visual/estimate.py	2006-09-10 07:36:21 UTC (rev 4508)
@@ -168,15 +168,14 @@
                    vector2d + scalar2d + \
                    scalar1d
 
-    connectivity = f * caps * nel * 8
+    connectivity = f * nel * 8
+    coord        = caps * scalar3d
+    velocity     = steps * caps * vector3d
+    temperature  = steps * caps * scalar3d
+    viscosity    = steps * caps * scalar3d
+    pressure     = steps * caps * scalar3d
+    stress       = steps * caps * tensor3d
 
-    coord       = caps * scalar3d
-    velocity    = steps * caps * vector3d
-    temperature = steps * caps * scalar3d
-    viscosity   = steps * caps * scalar3d
-    pressure    = steps * caps * scalar3d
-    stress      = steps * caps * tensor3d
-
     surf_coord       = caps * vector2d
     surf_velocity    = steps * caps * vector2d
     surf_temperature = steps * caps * scalar2d