From 39d4289d7b2dbbd75a98e635b36bfd741e06e22b Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 19 May 1999 19:46:07 -0500 Subject: [svn-r1264] Fixed output of hdp comparison files to align with the output from the v4.1r3 dumper. --- tools/testfiles/tall.dmp | 20 ++++++++++---------- tools/testfiles/tattr.dmp | 10 +++++----- tools/testfiles/tcompound.dmp | 20 ++++++++++---------- tools/testfiles/tcompound2.dmp | 20 ++++++++++---------- tools/testfiles/tdset.dmp | 17 ++++------------- tools/testfiles/tdset2.dmp | 17 ++++------------- tools/testfiles/thlink.dmp | 2 +- tools/testfiles/tmany.dmp | 16 ++++++++-------- tools/testfiles/tstr.dmp | 10 +++++----- tools/testfiles/tstr2.dmp | 30 +++++++++++++++--------------- 10 files changed, 72 insertions(+), 90 deletions(-) diff --git a/tools/testfiles/tall.dmp b/tools/testfiles/tall.dmp index 3d3c74e..845df06 100644 --- a/tools/testfiles/tall.dmp +++ b/tools/testfiles/tall.dmp @@ -441,7 +441,7 @@ File name: ./testfiles/tall.hdf Vdata: 0 tag = 1962; reference = 3; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [VALUES]; record size (in bytes) = 10; name = attr1; class = Attr0.0; @@ -453,7 +453,7 @@ Loc. Data Vdata: 1 tag = 1962; reference = 4; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [VALUES]; record size (in bytes) = 16; name = attr2; class = Attr0.0; @@ -465,7 +465,7 @@ Loc. Data Vdata: 2 tag = 1962; reference = 18; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim0; class = DimVal0.1; @@ -477,7 +477,7 @@ Loc. Data Vdata: 3 tag = 1962; reference = 20; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim1; class = DimVal0.1; @@ -489,7 +489,7 @@ Loc. Data Vdata: 4 tag = 1962; reference = 22; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim2; class = DimVal0.1; @@ -501,7 +501,7 @@ Loc. Data Vdata: 5 tag = 1962; reference = 24; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim3; class = DimVal0.1; @@ -513,7 +513,7 @@ Loc. Data Vdata: 6 tag = 1962; reference = 26; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim4; class = DimVal0.1; @@ -525,7 +525,7 @@ Loc. Data Vdata: 7 tag = 1962; reference = 28; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim5; class = DimVal0.1; @@ -537,7 +537,7 @@ Loc. Data Vdata: 8 tag = 1962; reference = 30; - number of records = 27; interlace = 0; + number of records = 27; interlace = FULL_INTERLACE (0); fields = [VALUES]; record size (in bytes) = 1; name = attr1; class = Attr0.0; @@ -555,7 +555,7 @@ Loc. Data Vdata: 9 tag = 1962; reference = 31; - number of records = 27; interlace = 0; + number of records = 27; interlace = FULL_INTERLACE (0); fields = [VALUES]; record size (in bytes) = 1; name = attr2; class = Attr0.0; diff --git a/tools/testfiles/tattr.dmp b/tools/testfiles/tattr.dmp index 32903d8..2b93beb 100644 --- a/tools/testfiles/tattr.dmp +++ b/tools/testfiles/tattr.dmp @@ -32,7 +32,7 @@ File name: ./testfiles/tattr.hdf Vdata: 0 tag = 1962; reference = 3; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [VALUES]; record size (in bytes) = 24; name = attr1; class = Attr0.0; @@ -44,7 +44,7 @@ Loc. Data Vdata: 1 tag = 1962; reference = 4; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [VALUES]; record size (in bytes) = 40; name = attr2; class = Attr0.0; @@ -56,7 +56,7 @@ Loc. Data Vdata: 2 tag = 1962; reference = 5; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [VALUES]; record size (in bytes) = 80; name = attr3; class = Attr0.0; @@ -68,7 +68,7 @@ Loc. Data Vdata: 3 tag = 1962; reference = 6; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [VALUES]; record size (in bytes) = 4; name = attr4; class = Attr0.0; @@ -80,7 +80,7 @@ Loc. Data Vdata: 4 tag = 1962; reference = 7; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [VALUES]; record size (in bytes) = 17; name = attr5; class = Attr0.0; diff --git a/tools/testfiles/tcompound.dmp b/tools/testfiles/tcompound.dmp index d837f27..5c82966 100644 --- a/tools/testfiles/tcompound.dmp +++ b/tools/testfiles/tcompound.dmp @@ -20,7 +20,7 @@ Entries:- name = group1; class = HDF5 number of attributes = 0 #2 (Vgroup) - tag = 1965;reference = 10; + tag = 1965;reference = 7; number of entries = 1; name = group2; class = HDF5 number of attributes = 0 @@ -40,7 +40,7 @@ Entries:- name = dset2; class = HDF5; total number of attributes = 0. #1 (Vdata) - tag = 1962; reference = 7; + tag = 1962; reference = 6; number of records = 5; interlace = 0; fields = [int, float]; record size (in bytes) = 8; @@ -49,13 +49,13 @@ Entries:- Vgroup:2 - tag = 1965; reference = 10; + tag = 1965; reference = 7; name = group2; class = HDF5; number of entries = 1; number of attributes = 0 Entries:- #0 (Vdata) - tag = 1962; reference = 11; + tag = 1962; reference = 8; number of records = 5; interlace = 0; fields = [int, float]; record size (in bytes) = 8; @@ -80,7 +80,7 @@ File name: ./testfiles/tcompound.hdf Vdata: 0 tag = 1962; reference = 3; - number of records = 5; interlace = 0; + number of records = 5; interlace = FULL_INTERLACE (0); fields = [a_name, b_name, c_name]; record size (in bytes) = 16; name = dset1; class = HDF5; @@ -97,7 +97,7 @@ Loc. Data Vdata: 1 tag = 1962; reference = 5; - number of records = 5; interlace = 0; + number of records = 5; interlace = FULL_INTERLACE (0); fields = [int_name, float_name]; record size (in bytes) = 8; name = dset2; class = HDF5; @@ -111,8 +111,8 @@ Loc. Data 3 3 3.300000 ; 4 4.400000 ; Vdata: 2 - tag = 1962; reference = 7; - number of records = 5; interlace = 0; + tag = 1962; reference = 6; + number of records = 5; interlace = FULL_INTERLACE (0); fields = [int, float]; record size (in bytes) = 8; name = dset4; class = HDF5; @@ -126,8 +126,8 @@ Loc. Data 3 3 3.000000 ; 4 4.000000 ; Vdata: 3 - tag = 1962; reference = 11; - number of records = 5; interlace = 0; + tag = 1962; reference = 8; + number of records = 5; interlace = FULL_INTERLACE (0); fields = [int, float]; record size (in bytes) = 8; name = dset5; class = HDF5; diff --git a/tools/testfiles/tcompound2.dmp b/tools/testfiles/tcompound2.dmp index d082630..f62252c 100644 --- a/tools/testfiles/tcompound2.dmp +++ b/tools/testfiles/tcompound2.dmp @@ -20,7 +20,7 @@ Entries:- name = group1; class = HDF5 number of attributes = 0 #2 (Vgroup) - tag = 1965;reference = 10; + tag = 1965;reference = 7; number of entries = 1; name = group2; class = HDF5 number of attributes = 0 @@ -40,7 +40,7 @@ Entries:- name = dset2; class = HDF5; total number of attributes = 0. #1 (Vdata) - tag = 1962; reference = 7; + tag = 1962; reference = 6; number of records = 6; interlace = 0; fields = [int, float]; record size (in bytes) = 8; @@ -49,13 +49,13 @@ Entries:- Vgroup:2 - tag = 1965; reference = 10; + tag = 1965; reference = 7; name = group2; class = HDF5; number of entries = 1; number of attributes = 0 Entries:- #0 (Vdata) - tag = 1962; reference = 11; + tag = 1962; reference = 8; number of records = 6; interlace = 0; fields = [int, float]; record size (in bytes) = 8; @@ -80,7 +80,7 @@ File name: ./testfiles/tcompound2.hdf Vdata: 0 tag = 1962; reference = 3; - number of records = 6; interlace = 0; + number of records = 6; interlace = FULL_INTERLACE (0); fields = [a_name, b_name, c_name]; record size (in bytes) = 16; name = dset1; class = HDF5; @@ -98,7 +98,7 @@ Loc. Data Vdata: 1 tag = 1962; reference = 5; - number of records = 6; interlace = 0; + number of records = 6; interlace = FULL_INTERLACE (0); fields = [int_name, float_name]; record size (in bytes) = 8; name = dset2; class = HDF5; @@ -113,8 +113,8 @@ Loc. Data Vdata: 2 - tag = 1962; reference = 7; - number of records = 6; interlace = 0; + tag = 1962; reference = 6; + number of records = 6; interlace = FULL_INTERLACE (0); fields = [int, float]; record size (in bytes) = 8; name = dset4; class = HDF5; @@ -129,8 +129,8 @@ Loc. Data Vdata: 3 - tag = 1962; reference = 11; - number of records = 6; interlace = 0; + tag = 1962; reference = 8; + number of records = 6; interlace = FULL_INTERLACE (0); fields = [int, float]; record size (in bytes) = 8; name = dset5; class = HDF5; diff --git a/tools/testfiles/tdset.dmp b/tools/testfiles/tdset.dmp index 04261fb..81cf82c 100644 --- a/tools/testfiles/tdset.dmp +++ b/tools/testfiles/tdset.dmp @@ -212,7 +212,7 @@ File name: ./testfiles/tdset.hdf Vdata: 0 tag = 1962; reference = 7; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim0; class = DimVal0.1; @@ -224,7 +224,7 @@ Loc. Data Vdata: 1 tag = 1962; reference = 9; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim1; class = DimVal0.1; @@ -236,7 +236,7 @@ Loc. Data Vdata: 2 tag = 1962; reference = 11; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim2; class = DimVal0.1; @@ -248,7 +248,7 @@ Loc. Data Vdata: 3 tag = 1962; reference = 13; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim3; class = DimVal0.1; @@ -276,23 +276,14 @@ Variable Name = dset1 Number of attributes = 0 Data : 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 diff --git a/tools/testfiles/tdset2.dmp b/tools/testfiles/tdset2.dmp index 1c4c3ed..158d1a5 100644 --- a/tools/testfiles/tdset2.dmp +++ b/tools/testfiles/tdset2.dmp @@ -212,7 +212,7 @@ File name: ./testfiles/tdset2.hdf Vdata: 0 tag = 1962; reference = 7; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim0; class = DimVal0.1; @@ -224,7 +224,7 @@ Loc. Data Vdata: 1 tag = 1962; reference = 9; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim1; class = DimVal0.1; @@ -236,7 +236,7 @@ Loc. Data Vdata: 2 tag = 1962; reference = 11; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim2; class = DimVal0.1; @@ -248,7 +248,7 @@ Loc. Data Vdata: 3 tag = 1962; reference = 13; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim3; class = DimVal0.1; @@ -276,23 +276,14 @@ Variable Name = dset1 Number of attributes = 0 Data : 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 diff --git a/tools/testfiles/thlink.dmp b/tools/testfiles/thlink.dmp index 50d1dde..4cb6ecb 100644 --- a/tools/testfiles/thlink.dmp +++ b/tools/testfiles/thlink.dmp @@ -132,7 +132,7 @@ File name: ./testfiles/thlink.hdf Vdata: 0 tag = 1962; reference = 7; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim0; class = DimVal0.1; diff --git a/tools/testfiles/tmany.dmp b/tools/testfiles/tmany.dmp index 03c501c..cd6f038 100644 --- a/tools/testfiles/tmany.dmp +++ b/tools/testfiles/tmany.dmp @@ -363,7 +363,7 @@ File name: ./testfiles/tmany.hdf Vdata: 0 tag = 1962; reference = 5; - number of records = 6; interlace = 0; + number of records = 6; interlace = FULL_INTERLACE (0); fields = [a_array, b_array, c_array]; record size (in bytes) = 320; name = dset1; class = HDF5; @@ -392,7 +392,7 @@ Loc. Data Vdata: 1 tag = 1962; reference = 6; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [VALUES]; record size (in bytes) = 10; name = attr1; class = Attr0.0; @@ -404,7 +404,7 @@ Loc. Data Vdata: 2 tag = 1962; reference = 7; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [VALUES]; record size (in bytes) = 16; name = attr2; class = Attr0.0; @@ -416,7 +416,7 @@ Loc. Data Vdata: 3 tag = 1962; reference = 8; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [VALUES]; record size (in bytes) = 80; name = attr3; class = Attr0.0; @@ -428,7 +428,7 @@ Loc. Data Vdata: 4 tag = 1962; reference = 19; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim0; class = DimVal0.1; @@ -440,7 +440,7 @@ Loc. Data Vdata: 5 tag = 1962; reference = 21; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim1; class = DimVal0.1; @@ -452,7 +452,7 @@ Loc. Data Vdata: 6 tag = 1962; reference = 23; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim2; class = DimVal0.1; @@ -464,7 +464,7 @@ Loc. Data Vdata: 7 tag = 1962; reference = 25; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [Values]; record size (in bytes) = 4; name = fakeDim3; class = DimVal0.1; diff --git a/tools/testfiles/tstr.dmp b/tools/testfiles/tstr.dmp index 9435754..5948c67 100644 --- a/tools/testfiles/tstr.dmp +++ b/tools/testfiles/tstr.dmp @@ -22,7 +22,7 @@ Entries:- name = string3; class = HDF5; total number of attributes = 0. #2 (Vdata) - tag = 1962; reference = 7; + tag = 1962; reference = 5; number of records = 3; interlace = 0; fields = [string]; record size (in bytes) = 168; @@ -41,7 +41,7 @@ File name: ./testfiles/tstr.hdf Vdata: 0 tag = 1962; reference = 3; - number of records = 20; interlace = 0; + number of records = 20; interlace = FULL_INTERLACE (0); fields = [string]; record size (in bytes) = 11; name = string2; class = HDF5; @@ -63,7 +63,7 @@ Loc. Data Vdata: 1 tag = 1962; reference = 4; - number of records = 27; interlace = 0; + number of records = 27; interlace = FULL_INTERLACE (0); fields = [string]; record size (in bytes) = 8; name = string3; class = HDF5; @@ -87,8 +87,8 @@ Loc. Data 26 97 98 99 100 54 0 0 0 ; Vdata: 2 - tag = 1962; reference = 7; - number of records = 3; interlace = 0; + tag = 1962; reference = 5; + number of records = 3; interlace = FULL_INTERLACE (0); fields = [string]; record size (in bytes) = 168; name = string4; class = HDF5; diff --git a/tools/testfiles/tstr2.dmp b/tools/testfiles/tstr2.dmp index 2eaa106..65fd3a3 100644 --- a/tools/testfiles/tstr2.dmp +++ b/tools/testfiles/tstr2.dmp @@ -28,12 +28,12 @@ Entries:- name = g4; class = HDF5 number of attributes = 0 #4 (Vgroup) - tag = 1965;reference = 13; + tag = 1965;reference = 12; number of entries = 1; name = g5; class = HDF5 number of attributes = 0 #5 (Vgroup) - tag = 1965;reference = 16; + tag = 1965;reference = 14; number of entries = 1; name = g6; class = HDF5 number of attributes = 0 @@ -100,13 +100,13 @@ Entries:- Vgroup:5 - tag = 1965; reference = 13; + tag = 1965; reference = 12; name = g5; class = HDF5; number of entries = 1; number of attributes = 0 Entries:- #0 (Vdata) - tag = 1962; reference = 14; + tag = 1962; reference = 13; number of records = 10; interlace = 0; fields = [string]; record size (in bytes) = 50; @@ -115,13 +115,13 @@ Entries:- Vgroup:6 - tag = 1965; reference = 16; + tag = 1965; reference = 14; name = g6; class = HDF5; number of entries = 1; number of attributes = 0 Entries:- #0 (Vdata) - tag = 1962; reference = 17; + tag = 1962; reference = 15; number of records = 10; interlace = 0; fields = [string]; record size (in bytes) = 50; @@ -155,7 +155,7 @@ File name: ./testfiles/tstr2.hdf Vdata: 0 tag = 1962; reference = 4; - number of records = 10; interlace = 0; + number of records = 10; interlace = FULL_INTERLACE (0); fields = [string]; record size (in bytes) = 50; name = dset1; class = HDF5; @@ -180,7 +180,7 @@ Loc. Data Vdata: 1 tag = 1962; reference = 5; - number of records = 1; interlace = 0; + number of records = 1; interlace = FULL_INTERLACE (0); fields = [VALUES]; record size (in bytes) = 33; name = attr1; class = Attr0.0; @@ -193,7 +193,7 @@ Loc. Data Vdata: 2 tag = 1962; reference = 7; - number of records = 10; interlace = 0; + number of records = 10; interlace = FULL_INTERLACE (0); fields = [string]; record size (in bytes) = 50; name = dset2; class = HDF5; @@ -215,7 +215,7 @@ Loc. Data Vdata: 3 tag = 1962; reference = 9; - number of records = 10; interlace = 0; + number of records = 10; interlace = FULL_INTERLACE (0); fields = [string]; record size (in bytes) = 50; name = dset3; class = HDF5; @@ -237,7 +237,7 @@ Loc. Data Vdata: 4 tag = 1962; reference = 11; - number of records = 10; interlace = 0; + number of records = 10; interlace = FULL_INTERLACE (0); fields = [string]; record size (in bytes) = 50; name = dset4; class = HDF5; @@ -258,8 +258,8 @@ Loc. Data Vdata: 5 - tag = 1962; reference = 14; - number of records = 10; interlace = 0; + tag = 1962; reference = 13; + number of records = 10; interlace = FULL_INTERLACE (0); fields = [string]; record size (in bytes) = 50; name = dset5; class = HDF5; @@ -280,8 +280,8 @@ Loc. Data Vdata: 6 - tag = 1962; reference = 17; - number of records = 10; interlace = 0; + tag = 1962; reference = 15; + number of records = 10; interlace = FULL_INTERLACE (0); fields = [string]; record size (in bytes) = 50; name = dset6; class = HDF5; -- cgit v0.12