Author: luis
Date: 2008-12-17 02:32:13 -0800 (Wed, 17 Dec 2008)
New Revision: 13723
Modified:
cs/cigma/trunk/tests/data/brick1/brick1.h5
cs/cigma/trunk/tests/data/brick1/brick1.py
cs/cigma/trunk/tests/data/brick2/brick2.h5
cs/cigma/trunk/tests/data/brick2/brick2.py
Log:
Updated mesh files to include the appropriate CellType string attribute
Modified: cs/cigma/trunk/tests/data/brick1/brick1.h5
===================================================================
--- cs/cigma/trunk/tests/data/brick1/brick1.h5 2008-12-17 10:32:10 UTC (rev 13722)
+++ cs/cigma/trunk/tests/data/brick1/brick1.h5 2008-12-17 10:32:13 UTC (rev 13723)
@@ -1,10 +1,8 @@
‰HDF
- ÿÿÿÿÿÿÿÿè ÿÿÿÿÿÿÿÿ € ` HEAP ( € coordinates connectivity Ø TREE ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ à è
- ? @ 4 4ÿ
-O!I ( CLASS ARRAY ( VERSION 2.3 8 ` SNOD ( Ð ˆ
-
-O!I ( CLASS ARRAY ( VERSION 2.3 ˜ ` ( TITLE ( FLAVOR numpy ( TITLE ( FLAVOR numpy à¿ à¿ à? à¿ à¿ à¿ à¿ à? à¿ à? à¿ à? à¿ à¿ à¿ à¿ à¿ à¿ à¿ à¿ à¿ à? à¿ à? à? à? à? à? à¿ à? à¿ à? à¿ à? à¿ à? à? à¿ à? à? à? à? à¿ à¿ à? à¿ à? à? à? à? à? à? à? à¿
+ ÿÿÿÿÿÿÿÿ ÿÿÿÿÿÿÿÿ € ` HEAP ( € coordinates connectivity Ø TREE ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ à
+ ? @ 4 4ÿ MAI ( CLASS ARRAY ( VERSION 2.3 8 ` SNOD ( Ð ˆ
+ MAI ( CLASS ARRAY ( VERSION 2.3 ˜ ` ( TITLE ( FLAVOR numpy ( TITLE ( FLAVOR numpy à¿ à¿ à? à¿ à¿ à¿ à¿ à? à¿ à? à¿ à? à¿ à¿ à¿ à¿ à¿ à¿ à¿ à¿ à¿ à? à¿ à? à? à? à? à? à¿ à? à¿ à? à¿ à? à¿ à? à? à¿ à? à? à? à? à¿ à¿ à? à¿ à? à? à? à? à? à? à? à¿
- € ` ( TITLE ( CLASS GROUP ( VERSION 1.0 8 PYTABLES_FORMAT_VERSION 2.0
\ No newline at end of file
+ € ` ( TITLE ( CLASS GROUP ( VERSION 1.0 8 PYTABLES_FORMAT_VERSION 2.0 0 CellType hex8
\ No newline at end of file
Modified: cs/cigma/trunk/tests/data/brick1/brick1.py
===================================================================
--- cs/cigma/trunk/tests/data/brick1/brick1.py 2008-12-17 10:32:10 UTC (rev 13722)
+++ cs/cigma/trunk/tests/data/brick1/brick1.py 2008-12-17 10:32:13 UTC (rev 13723)
@@ -29,13 +29,13 @@
#
# Write mesh data to simple text files
#
- with open('brick1_coords.dat', 'w') as f:
+ with open('coords.dat', 'w') as f:
f.write('%d %d\n' % (nno,nsd))
for n in xrange(nno):
f.write('%g %g %g\n' % tuple(coord[n]))
print 'Wrote', f.name
- with open('brick1_connect.dat', 'w') as f:
+ with open('connect.dat', 'w') as f:
f.write('%d %d\n' % (nel,ndofs))
for e in xrange(nel):
for i in xrange(ndofs):
@@ -47,6 +47,7 @@
# Write mesh data to HDF5
#
h5 = tables.openFile('brick1.h5', 'w')
+ h5.root._v_attrs.CellType = 'hex8'
h5.createArray('/', 'coordinates', coord)
h5.createArray('/', 'connectivity', connect)
print 'Wrote', h5.filename
Modified: cs/cigma/trunk/tests/data/brick2/brick2.h5
===================================================================
--- cs/cigma/trunk/tests/data/brick2/brick2.h5 2008-12-17 10:32:10 UTC (rev 13722)
+++ cs/cigma/trunk/tests/data/brick2/brick2.h5 2008-12-17 10:32:13 UTC (rev 13723)
@@ -1,11 +1,11 @@
‰HDF
- ÿÿÿÿÿÿÿÿè ÿÿÿÿÿÿÿÿ € ` HEAP ( € coordinates connectivity Ø TREE ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ à è
- ? @ 4 4ÿ süI ( CLASS ARRAY ( VERSION 2.3 8 ` SNOD ( Ð &
- & süI ( CLASS ARRAY ( VERSION 2.3 ˜ ` ( TITLE ( FLAVOR numpy ( TITLE ( FLAVOR numpy àb¿p? €©ªº? ZM¿? @Ôº„¿ à$WÀ¿ ’&¿¿ à? à¿ à? à¿ à¿ à¿ à? à¿ à¿ à¿ à? à? à¿ à¿ à¿ à¿ à¿ à¿ à¿ à¿ à¿ à? à? à? à¿ à? à? à¿ à? à? à? à¿ à? à¿ à? à? à? à? à? à¿ à¿ à? à? à¿ à? à? à? à¿
+ ÿÿÿÿÿÿÿÿ ÿÿÿÿÿÿÿÿ € ` HEAP ( € coordinates connectivity Ø TREE ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ à
+ ? @ 4 4ÿ (MAI ( CLASS ARRAY ( VERSION 2.3 8 ` SNOD ( Ð &
+ & (MAI ( CLASS ARRAY ( VERSION 2.3 ˜ ` ( TITLE ( FLAVOR numpy ( TITLE ( FLAVOR numpy àb¿p? €©ªº? ZM¿? @Ôº„¿ à$WÀ¿ ’&¿¿ à? à¿ à? à¿ à¿ à¿ à? à¿ à¿ à¿ à? à? à¿ à¿ à¿ à¿ à¿ à¿ à¿ à¿ à¿ à? à? à? à¿ à? à? à¿ à? à? à? à¿ à? à¿ à? à? à? à? à? à¿ à¿ à? à? à¿ à? à? à? à¿
- € ` ( TITLE ( CLASS GROUP ( VERSION 1.0 8 PYTABLES_FORMAT_VERSION 2.0
\ No newline at end of file
+ € ` ( TITLE ( CLASS GROUP ( VERSION 1.0 8 PYTABLES_FORMAT_VERSION 2.0 0 CellType tet4
\ No newline at end of file
Modified: cs/cigma/trunk/tests/data/brick2/brick2.py
===================================================================
--- cs/cigma/trunk/tests/data/brick2/brick2.py 2008-12-17 10:32:10 UTC (rev 13722)
+++ cs/cigma/trunk/tests/data/brick2/brick2.py 2008-12-17 10:32:13 UTC (rev 13723)
@@ -28,13 +28,13 @@
#
# Write mesh data to simple text files
#
- with open('brick2_coords.dat', 'w') as f:
+ with open('coords.dat', 'w') as f:
f.write('%d %d\n' % (nno,nsd))
for n in xrange(nno):
f.write('%g %g %g\n' % tuple(coord[n]))
print 'Wrote', f.name
- with open('brick2_connect.dat', 'w') as f:
+ with open('connect.dat', 'w') as f:
f.write('%d %d\n' % (nel,ndofs))
for e in xrange(nel):
for i in xrange(ndofs):
@@ -46,6 +46,7 @@
# Write mesh data to HDF5
#
h5 = tables.openFile('brick2.h5', 'w')
+ h5.root._v_attrs.CellType = 'tet4'
h5.createArray('/', 'coordinates', coord)
h5.createArray('/', 'connectivity', connect)
print 'Wrote', h5.filename