[svn-r14902] Merged fortran_1_8 branch changes r14505:14901 into the trunk. New fortran wrappers added.

15 files changed, 9 insertions, 324 deletions

diff --git a/tools/testfiles/h5diff_58.txt b/tools/testfiles/h5diff_58.txt
index b582c88..38d3177 100644
--- a/tools/testfiles/h5diff_58.txt
+++ b/tools/testfiles/h5diff_58.txt
@@ -2,7 +2,7 @@
 Expected output for 'h5diff -v h5diff_dset1.h5 h5diff_dset2.h5 refreg'
 #############################
 dataset: </refreg> and </refreg>
-Referenced dataset      10272            10272
+Referenced dataset      5904            5904
 ------------------------------------------------------------
 Region blocks
 block #0           (2,2)-(7,7)           (0,0)-(2,2)
diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt
index bc9efbe..fe3e03f 100644
--- a/tools/testfiles/h5diff_70.txt
+++ b/tools/testfiles/h5diff_70.txt
@@ -19,15 +19,6 @@ position        string of </>   string of </>   difference
 [ 1 ]          d                z                
 [ 1 ]          e                z                
 4 differences found
-attribute: <VLstring of </>> and <VLstring of </>>
-size:           [2]           [2]
-position        VLstring of </> VLstring of </> difference          
-------------------------------------------------------------
-[ 0 ]          a                z                
-[ 0 ]          b                z                
-[ 1 ]          d                z                
-[ 1 ]          e                z                
-4 differences found
 attribute: <bitfield of </>> and <bitfield of </>>
 size:           [2]           [2]
 position        bitfield of </> bitfield of </> difference          
@@ -108,23 +99,6 @@ position        string2D of </> string2D of </> difference
 [ 2 1 ]          k                z                
 [ 2 1 ]          l                z                
 12 differences found
-attribute: <VLstring2D of </>> and <VLstring2D of </>>
-size:           [3x2]           [3x2]
-position        VLstring2D of </> VLstring2D of </> difference          
-------------------------------------------------------------
-[ 0 0 ]          a                z                
-[ 0 0 ]          b                z                
-[ 0 1 ]          c                z                
-[ 0 1 ]          d                z                
-[ 1 0 ]          e                z                
-[ 1 0 ]          f                z                
-[ 1 1 ]          g                z                
-[ 1 1 ]          h                z                
-[ 2 0 ]          i                z                
-[ 2 0 ]          j                z                
-[ 2 1 ]          k                z                
-[ 2 1 ]          l                z                
-12 differences found
 attribute: <bitfield2D of </>> and <bitfield2D of </>>
 size:           [3x2]           [3x2]
 position        bitfield2D of </> bitfield2D of </> difference          
@@ -288,58 +262,6 @@ position        string3D of </> string3D of </> difference
 [ 3 2 1 ]          X                z                
 [ 3 2 1 ]          Z                z                
 47 differences found
-attribute: <VLstring3D of </>> and <VLstring3D of </>>
-size:           [4x3x2]           [4x3x2]
-position        VLstring3D of </> VLstring3D of </> difference          
-------------------------------------------------------------
-[ 0 0 0 ]          a                z                
-[ 0 0 0 ]          b                z                
-[ 0 0 1 ]          c                z                
-[ 0 0 1 ]          d                z                
-[ 0 1 0 ]          e                z                
-[ 0 1 0 ]          f                z                
-[ 0 1 1 ]          g                z                
-[ 0 1 1 ]          h                z                
-[ 0 2 0 ]          i                z                
-[ 0 2 0 ]          j                z                
-[ 0 2 1 ]          k                z                
-[ 0 2 1 ]          l                z                
-[ 1 0 0 ]          m                z                
-[ 1 0 0 ]          n                z                
-[ 1 0 1 ]          p                z                
-[ 1 0 1 ]          q                z                
-[ 1 1 0 ]          r                z                
-[ 1 1 0 ]          s                z                
-[ 1 1 1 ]          t                z                
-[ 1 1 1 ]          u                z                
-[ 1 2 0 ]          v                z                
-[ 1 2 0 ]          w                z                
-[ 1 2 1 ]          x                z                
-[ 2 0 0 ]          A                z                
-[ 2 0 0 ]          B                z                
-[ 2 0 1 ]          C                z                
-[ 2 0 1 ]          D                z                
-[ 2 1 0 ]          E                z                
-[ 2 1 0 ]          F                z                
-[ 2 1 1 ]          G                z                
-[ 2 1 1 ]          H                z                
-[ 2 2 0 ]          I                z                
-[ 2 2 0 ]          J                z                
-[ 2 2 1 ]          K                z                
-[ 2 2 1 ]          L                z                
-[ 3 0 0 ]          M                z                
-[ 3 0 0 ]          N                z                
-[ 3 0 1 ]          P                z                
-[ 3 0 1 ]          Q                z                
-[ 3 1 0 ]          R                z                
-[ 3 1 0 ]          S                z                
-[ 3 1 1 ]          T                z                
-[ 3 1 1 ]          U                z                
-[ 3 2 0 ]          V                z                
-[ 3 2 0 ]          W                z                
-[ 3 2 1 ]          X                z                
-[ 3 2 1 ]          Z                z                
-47 differences found
 attribute: <bitfield3D of </>> and <bitfield3D of </>>
 size:           [4x3x2]           [4x3x2]
 position        bitfield3D of </> bitfield3D of </> difference          
@@ -690,15 +612,6 @@ position        string of </dset> string of </dset> difference
 [ 1 ]          d                z                
 [ 1 ]          e                z                
 4 differences found
-attribute: <VLstring of </dset>> and <VLstring of </dset>>
-size:           [2]           [2]
-position        VLstring of </dset> VLstring of </dset> difference          
-------------------------------------------------------------
-[ 0 ]          a                z                
-[ 0 ]          b                z                
-[ 1 ]          d                z                
-[ 1 ]          e                z                
-4 differences found
 attribute: <bitfield of </dset>> and <bitfield of </dset>>
 size:           [2]           [2]
 position        bitfield of </dset> bitfield of </dset> difference          
@@ -781,23 +694,6 @@ position        string2D of </dset> string2D of </dset> difference
 [ 2 1 ]          k                z                
 [ 2 1 ]          l                z                
 12 differences found
-attribute: <VLstring2D of </dset>> and <VLstring2D of </dset>>
-size:           [3x2]           [3x2]
-position        VLstring2D of </dset> VLstring2D of </dset> difference          
-------------------------------------------------------------
-[ 0 0 ]          a                z                
-[ 0 0 ]          b                z                
-[ 0 1 ]          c                z                
-[ 0 1 ]          d                z                
-[ 1 0 ]          e                z                
-[ 1 0 ]          f                z                
-[ 1 1 ]          g                z                
-[ 1 1 ]          h                z                
-[ 2 0 ]          i                z                
-[ 2 0 ]          j                z                
-[ 2 1 ]          k                z                
-[ 2 1 ]          l                z                
-12 differences found
 attribute: <bitfield2D of </dset>> and <bitfield2D of </dset>>
 size:           [3x2]           [3x2]
 position        bitfield2D of </dset> bitfield2D of </dset> difference          
@@ -963,58 +859,6 @@ position        string3D of </dset> string3D of </dset> difference
 [ 3 2 1 ]          X                z                
 [ 3 2 1 ]          Z                z                
 47 differences found
-attribute: <VLstring3D of </dset>> and <VLstring3D of </dset>>
-size:           [4x3x2]           [4x3x2]
-position        VLstring3D of </dset> VLstring3D of </dset> difference          
-------------------------------------------------------------
-[ 0 0 0 ]          a                z                
-[ 0 0 0 ]          b                z                
-[ 0 0 1 ]          c                z                
-[ 0 0 1 ]          d                z                
-[ 0 1 0 ]          e                z                
-[ 0 1 0 ]          f                z                
-[ 0 1 1 ]          g                z                
-[ 0 1 1 ]          h                z                
-[ 0 2 0 ]          i                z                
-[ 0 2 0 ]          j                z                
-[ 0 2 1 ]          k                z                
-[ 0 2 1 ]          l                z                
-[ 1 0 0 ]          m                z                
-[ 1 0 0 ]          n                z                
-[ 1 0 1 ]          p                z                
-[ 1 0 1 ]          q                z                
-[ 1 1 0 ]          r                z                
-[ 1 1 0 ]          s                z                
-[ 1 1 1 ]          t                z                
-[ 1 1 1 ]          u                z                
-[ 1 2 0 ]          v                z                
-[ 1 2 0 ]          w                z                
-[ 1 2 1 ]          x                z                
-[ 2 0 0 ]          A                z                
-[ 2 0 0 ]          B                z                
-[ 2 0 1 ]          C                z                
-[ 2 0 1 ]          D                z                
-[ 2 1 0 ]          E                z                
-[ 2 1 0 ]          F                z                
-[ 2 1 1 ]          G                z                
-[ 2 1 1 ]          H                z                
-[ 2 2 0 ]          I                z                
-[ 2 2 0 ]          J                z                
-[ 2 2 1 ]          K                z                
-[ 2 2 1 ]          L                z                
-[ 3 0 0 ]          M                z                
-[ 3 0 0 ]          N                z                
-[ 3 0 1 ]          P                z                
-[ 3 0 1 ]          Q                z                
-[ 3 1 0 ]          R                z                
-[ 3 1 0 ]          S                z                
-[ 3 1 1 ]          T                z                
-[ 3 1 1 ]          U                z                
-[ 3 2 0 ]          V                z                
-[ 3 2 0 ]          W                z                
-[ 3 2 1 ]          X                z                
-[ 3 2 1 ]          Z                z                
-47 differences found
 attribute: <bitfield3D of </dset>> and <bitfield3D of </dset>>
 size:           [4x3x2]           [4x3x2]
 position        bitfield3D of </dset> bitfield3D of </dset> difference          
@@ -1356,7 +1200,7 @@ position        float3D of </dset> float3D of </dset> difference
 [ 3 2 0 ]          23              0               23             
 [ 3 2 1 ]          24              0               24             
 24 differences found
-519 differences found
+456 differences found
 group  : </g1> and </g1>
 0 differences found
 attribute: <string of </g1>> and <string of </g1>>
@@ -1368,15 +1212,6 @@ position        string of </g1> string of </g1> difference
 [ 1 ]          d                z                
 [ 1 ]          e                z                
 4 differences found
-attribute: <VLstring of </g1>> and <VLstring of </g1>>
-size:           [2]           [2]
-position        VLstring of </g1> VLstring of </g1> difference          
-------------------------------------------------------------
-[ 0 ]          a                z                
-[ 0 ]          b                z                
-[ 1 ]          d                z                
-[ 1 ]          e                z                
-4 differences found
 attribute: <bitfield of </g1>> and <bitfield of </g1>>
 size:           [2]           [2]
 position        bitfield of </g1> bitfield of </g1> difference          
@@ -1457,23 +1292,6 @@ position        string2D of </g1> string2D of </g1> difference
 [ 2 1 ]          k                z                
 [ 2 1 ]          l                z                
 12 differences found
-attribute: <VLstring2D of </g1>> and <VLstring2D of </g1>>
-size:           [3x2]           [3x2]
-position        VLstring2D of </g1> VLstring2D of </g1> difference          
-------------------------------------------------------------
-[ 0 0 ]          a                z                
-[ 0 0 ]          b                z                
-[ 0 1 ]          c                z                
-[ 0 1 ]          d                z                
-[ 1 0 ]          e                z                
-[ 1 0 ]          f                z                
-[ 1 1 ]          g                z                
-[ 1 1 ]          h                z                
-[ 2 0 ]          i                z                
-[ 2 0 ]          j                z                
-[ 2 1 ]          k                z                
-[ 2 1 ]          l                z                
-12 differences found
 attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>>
 size:           [3x2]           [3x2]
 position        bitfield2D of </g1> bitfield2D of </g1> difference          
@@ -1637,58 +1455,6 @@ position        string3D of </g1> string3D of </g1> difference
 [ 3 2 1 ]          X                z                
 [ 3 2 1 ]          Z                z                
 47 differences found
-attribute: <VLstring3D of </g1>> and <VLstring3D of </g1>>
-size:           [4x3x2]           [4x3x2]
-position        VLstring3D of </g1> VLstring3D of </g1> difference          
-------------------------------------------------------------
-[ 0 0 0 ]          a                z                
-[ 0 0 0 ]          b                z                
-[ 0 0 1 ]          c                z                
-[ 0 0 1 ]          d                z                
-[ 0 1 0 ]          e                z                
-[ 0 1 0 ]          f                z                
-[ 0 1 1 ]          g                z                
-[ 0 1 1 ]          h                z                
-[ 0 2 0 ]          i                z                
-[ 0 2 0 ]          j                z                
-[ 0 2 1 ]          k                z                
-[ 0 2 1 ]          l                z                
-[ 1 0 0 ]          m                z                
-[ 1 0 0 ]          n                z                
-[ 1 0 1 ]          p                z                
-[ 1 0 1 ]          q                z                
-[ 1 1 0 ]          r                z                
-[ 1 1 0 ]          s                z                
-[ 1 1 1 ]          t                z                
-[ 1 1 1 ]          u                z                
-[ 1 2 0 ]          v                z                
-[ 1 2 0 ]          w                z                
-[ 1 2 1 ]          x                z                
-[ 2 0 0 ]          A                z                
-[ 2 0 0 ]          B                z                
-[ 2 0 1 ]          C                z                
-[ 2 0 1 ]          D                z                
-[ 2 1 0 ]          E                z                
-[ 2 1 0 ]          F                z                
-[ 2 1 1 ]          G                z                
-[ 2 1 1 ]          H                z                
-[ 2 2 0 ]          I                z                
-[ 2 2 0 ]          J                z                
-[ 2 2 1 ]          K                z                
-[ 2 2 1 ]          L                z                
-[ 3 0 0 ]          M                z                
-[ 3 0 0 ]          N                z                
-[ 3 0 1 ]          P                z                
-[ 3 0 1 ]          Q                z                
-[ 3 1 0 ]          R                z                
-[ 3 1 0 ]          S                z                
-[ 3 1 1 ]          T                z                
-[ 3 1 1 ]          U                z                
-[ 3 2 0 ]          V                z                
-[ 3 2 0 ]          W                z                
-[ 3 2 1 ]          X                z                
-[ 3 2 1 ]          Z                z                
-47 differences found
 attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>>
 size:           [4x3x2]           [4x3x2]
 position        bitfield3D of </g1> bitfield3D of </g1> difference          
diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt
index 9c0bd33..90ee5c0 100644
--- a/tools/testfiles/h5diff_80.txt
+++ b/tools/testfiles/h5diff_80.txt
@@ -8,9 +8,6 @@ file1     file2
     x      x    /dset          
     x      x    /dsetref       
     x      x    /g1            
-    x      x    /g1/VLstring   
-    x      x    /g1/VLstring2D 
-    x      x    /g1/VLstring3D 
     x      x    /g1/array      
     x      x    /g1/array2D    
     x      x    /g1/array3D    
@@ -56,84 +53,6 @@ dataset: </dsetref> and </dsetref>
 0 differences found
 group  : </g1> and </g1>
 0 differences found
-dataset: </g1/VLstring> and </g1/VLstring>
-size:           [2]           [2]
-position        VLstring        VLstring        difference          
-------------------------------------------------------------
-[ 0 ]          a                z                
-[ 0 ]          b                z                
-[ 1 ]          d                z                
-[ 1 ]          e                z                
-4 differences found
-dataset: </g1/VLstring2D> and </g1/VLstring2D>
-size:           [3x2]           [3x2]
-position        VLstring2D      VLstring2D      difference          
-------------------------------------------------------------
-[ 0 0 ]          a                z                
-[ 0 0 ]          b                z                
-[ 0 1 ]          c                z                
-[ 0 1 ]          d                z                
-[ 1 0 ]          e                z                
-[ 1 0 ]          f                z                
-[ 1 1 ]          g                z                
-[ 1 1 ]          h                z                
-[ 2 0 ]          i                z                
-[ 2 0 ]          j                z                
-[ 2 1 ]          k                z                
-[ 2 1 ]          l                z                
-12 differences found
-dataset: </g1/VLstring3D> and </g1/VLstring3D>
-size:           [4x3x2]           [4x3x2]
-position        VLstring3D      VLstring3D      difference          
-------------------------------------------------------------
-[ 0 0 0 ]          a                z                
-[ 0 0 0 ]          b                z                
-[ 0 0 1 ]          c                z                
-[ 0 0 1 ]          d                z                
-[ 0 1 0 ]          e                z                
-[ 0 1 0 ]          f                z                
-[ 0 1 1 ]          g                z                
-[ 0 1 1 ]          h                z                
-[ 0 2 0 ]          i                z                
-[ 0 2 0 ]          j                z                
-[ 0 2 1 ]          k                z                
-[ 0 2 1 ]          l                z                
-[ 1 0 0 ]          m                z                
-[ 1 0 0 ]          n                z                
-[ 1 0 1 ]          p                z                
-[ 1 0 1 ]          q                z                
-[ 1 1 0 ]          r                z                
-[ 1 1 0 ]          s                z                
-[ 1 1 1 ]          t                z                
-[ 1 1 1 ]          u                z                
-[ 1 2 0 ]          v                z                
-[ 1 2 0 ]          w                z                
-[ 1 2 1 ]          x                z                
-[ 2 0 0 ]          A                z                
-[ 2 0 0 ]          B                z                
-[ 2 0 1 ]          C                z                
-[ 2 0 1 ]          D                z                
-[ 2 1 0 ]          E                z                
-[ 2 1 0 ]          F                z                
-[ 2 1 1 ]          G                z                
-[ 2 1 1 ]          H                z                
-[ 2 2 0 ]          I                z                
-[ 2 2 0 ]          J                z                
-[ 2 2 1 ]          K                z                
-[ 2 2 1 ]          L                z                
-[ 3 0 0 ]          M                z                
-[ 3 0 0 ]          N                z                
-[ 3 0 1 ]          P                z                
-[ 3 0 1 ]          Q                z                
-[ 3 1 0 ]          R                z                
-[ 3 1 0 ]          S                z                
-[ 3 1 1 ]          T                z                
-[ 3 1 1 ]          U                z                
-[ 3 2 0 ]          V                z                
-[ 3 2 0 ]          W                z                
-[ 3 2 1 ]          X                z                
-[ 3 2 1 ]          Z                z                
-47 differences found
 dataset: </g1/array> and </g1/array>
 size:           [2]           [2]
 position        array           array           difference          
@@ -857,7 +776,7 @@ position        vlen3D          vlen3D          difference
 [ 3 2 1 ]          59              0               59             
 59 differences found
 dataset: </refreg> and </refreg>
-Referenced dataset      10272            10272
+Referenced dataset      5904            5904
 ------------------------------------------------------------
 Region blocks
 block #0           (2,2)-(7,7)           (0,0)-(2,2)
diff --git a/tools/testfiles/h5diff_attr1.h5 b/tools/testfiles/h5diff_attr1.h5
index c44066b..e261486 100644
--- a/tools/testfiles/h5diff_attr1.h5
+++ b/tools/testfiles/h5diff_attr1.h5
diff --git a/tools/testfiles/h5diff_attr2.h5 b/tools/testfiles/h5diff_attr2.h5
index 5de3303..0a59fc5 100644
--- a/tools/testfiles/h5diff_attr2.h5
+++ b/tools/testfiles/h5diff_attr2.h5
diff --git a/tools/testfiles/h5diff_basic2.h5 b/tools/testfiles/h5diff_basic2.h5
index ad45cc0..209485f 100644
--- a/tools/testfiles/h5diff_basic2.h5
+++ b/tools/testfiles/h5diff_basic2.h5
diff --git a/tools/testfiles/h5diff_dset1.h5 b/tools/testfiles/h5diff_dset1.h5
index ab6b96f..3f853be 100644
--- a/tools/testfiles/h5diff_dset1.h5
+++ b/tools/testfiles/h5diff_dset1.h5
diff --git a/tools/testfiles/h5diff_dset2.h5 b/tools/testfiles/h5diff_dset2.h5
index 3db0c8e..1f14d29 100644
--- a/tools/testfiles/h5diff_dset2.h5
+++ b/tools/testfiles/h5diff_dset2.h5
diff --git a/tools/testfiles/tallfilters.ddl b/tools/testfiles/tallfilters.ddl
index 43c27a9..282c085 100644
--- a/tools/testfiles/tallfilters.ddl
+++ b/tools/testfiles/tallfilters.ddl
@@ -7,7 +7,7 @@ DATASET "all" {
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
    STORAGE_LAYOUT {
       CHUNKED ( 10, 5 )
-      SIZE 458 (42.8%COMPRESSION)
+      SIZE 458
     }
    FILTERS {
       PREPROCESSING SHUFFLE
diff --git a/tools/testfiles/tbin4.ddl b/tools/testfiles/tbin4.ddl
index 78a6cd2..89849e4 100644
--- a/tools/testfiles/tbin4.ddl
+++ b/tools/testfiles/tbin4.ddl
@@ -1,7 +1,7 @@
 HDF5 "tbinary.h5" {
 DATASET "double" {
    DATATYPE  H5T_IEEE_F64LE
-   DATASPACE  SIMPLE { ( 6 ) / ( 6 ) }
+   DATASPACE  SIMPLE { ( 100000 ) / ( 100000 ) }
    DATA {
    }
 }
diff --git a/tools/testfiles/tbinary.h5 b/tools/testfiles/tbinary.h5
index adc5b15..691b008 100644
--- a/tools/testfiles/tbinary.h5
+++ b/tools/testfiles/tbinary.h5
diff --git a/tools/testfiles/tdeflate.ddl b/tools/testfiles/tdeflate.ddl
index cc5b49b..fc98432 100644
--- a/tools/testfiles/tdeflate.ddl
+++ b/tools/testfiles/tdeflate.ddl
@@ -7,7 +7,7 @@ DATASET "deflate" {
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
    STORAGE_LAYOUT {
       CHUNKED ( 10, 5 )
-      SIZE 385 (51.9%COMPRESSION)
+      SIZE 385
     }
    FILTERS {
       COMPRESSION DEFLATE { LEVEL 9 }
diff --git a/tools/testfiles/tnbit.ddl b/tools/testfiles/tnbit.ddl
index 2f932b5..a8bf549 100644
--- a/tools/testfiles/tnbit.ddl
+++ b/tools/testfiles/tnbit.ddl
@@ -7,7 +7,7 @@ DATASET "nbit" {
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
    STORAGE_LAYOUT {
       CHUNKED ( 10, 5 )
-      SIZE 76 (90.5%COMPRESSION)
+      SIZE 76
     }
    FILTERS {
       COMPRESSION NBIT
diff --git a/tools/testfiles/tscaleoffset.ddl b/tools/testfiles/tscaleoffset.ddl
index c9a46f4..6693f92 100644
--- a/tools/testfiles/tscaleoffset.ddl
+++ b/tools/testfiles/tscaleoffset.ddl
@@ -7,7 +7,7 @@ DATASET "scaleoffset" {
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
    STORAGE_LAYOUT {
       CHUNKED ( 10, 5 )
-      SIZE 152 (81.0%COMPRESSION)
+      SIZE 152
     }
    FILTERS {
       COMPRESSION SCALEOFFSET { MIN BITS 4 }
diff --git a/tools/testfiles/tszip.ddl b/tools/testfiles/tszip.ddl
index 6411bc3..4c6af47 100644
--- a/tools/testfiles/tszip.ddl
+++ b/tools/testfiles/tszip.ddl
@@ -7,7 +7,7 @@ DATASET "szip" {
    DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
    STORAGE_LAYOUT {
       CHUNKED ( 10, 5 )
-      SIZE 372 (53.5%COMPRESSION)
+      SIZE 372
     }
    FILTERS {
       COMPRESSION SZIP {