[svn-r23105] Changed Fortran examples to reflect tutorial examples via Barbara;

added: h5_cmprss.f90

Tested: jam (gnu compilers)

6 files changed, 143 insertions, 6 deletions

diff --git a/MANIFEST b/MANIFEST
index 9d50102..80ce202 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -251,6 +251,7 @@
 ./fortran/examples/compound.f90
 ./fortran/examples/compound_fortran2003.f90
 ./fortran/examples/compound_complex_fortran2003.f90
+./fortran/examples/h5_cmprss.f90
 ./fortran/examples/h5_crtatt.f90
 ./fortran/examples/h5_crtdat.f90
 ./fortran/examples/h5_crtgrp.f90
diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index bf4b11a..6154387 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -14,6 +14,7 @@ INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${
 # Define Sources
 #-----------------------------------------------------------------------------
 SET (examples
+    h5_cmprss
     h5_crtdat
     h5_rdwt
     h5_crtatt
diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am
index 867d891..e994d4e 100644
--- a/fortran/examples/Makefile.am
+++ b/fortran/examples/Makefile.am
@@ -33,14 +33,14 @@ endif
 # compile them with the regular fortran compiler.
 
 EXAMPLE_PROG=h5_crtdat h5_rdwt h5_crtatt h5_crtgrp \
-     h5_crtgrpar h5_crtgrpd h5_extend h5_subset hyperslab selectele \
+     h5_crtgrpar h5_crtgrpd h5_extend h5_subset h5_cmprss hyperslab selectele \
      refobjexample refregexample mountexample compound
 
 # List files to be installed here
 INSTALL_FILES=h5_crtdat.f90 h5_rdwt.f90 \
      h5_crtatt.f90 h5_crtgrp.f90 h5_crtgrpar.f90 h5_crtgrpd.f90  \
-     h5_extend.f90 h5_subset.f90 hyperslab.f90 selectele.f90 refobjexample.f90 \
-     refregexample.f90 mountexample.f90  compound.f90 ph5example.f90
+     h5_extend.f90 h5_subset.f90 h5_cmprss.f90 hyperslab.f90 selectele.f90 refobjexample.f90 \
+     refregexample.f90 mountexample.f90 compound.f90 ph5example.f90
 INSTALL_SCRIPT_FILES = run-fortran-ex.sh
 
 
@@ -92,6 +92,7 @@ h5_crtatt: h5_crtatt.f90
 h5_crtgrp: h5_crtgrp.f90
 h5_crtgrpar: h5_crtgrpar.f90
 h5_crtgrpd: h5_crtgrpd.f90
+h5_cmprss: h5_cmprss.f90
 hyperslab: hyperslab.f90
 selectele: selectele.f90
 refobjexample: refobjexample.f90
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index a0eb2c4..a3b0b98 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -406,14 +406,14 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
 # We don't tell automake about these programs so that it doesn't try to
 # compile them with the regular fortran compiler.
 EXAMPLE_PROG = h5_crtdat h5_rdwt h5_crtatt h5_crtgrp h5_crtgrpar \
-	h5_crtgrpd h5_extend h5_subset hyperslab selectele \
+	h5_crtgrpd h5_extend h5_subset h5_cmprss hyperslab selectele \
 	refobjexample refregexample mountexample compound \
 	$(am__append_1)
 
 # List files to be installed here
 INSTALL_FILES = h5_crtdat.f90 h5_rdwt.f90 h5_crtatt.f90 h5_crtgrp.f90 \
 	h5_crtgrpar.f90 h5_crtgrpd.f90 h5_extend.f90 h5_subset.f90 \
-	hyperslab.f90 selectele.f90 refobjexample.f90 \
+	h5_cmprss.f90 hyperslab.f90 selectele.f90 refobjexample.f90 \
 	refregexample.f90 mountexample.f90 compound.f90 ph5example.f90 \
 	$(am__append_2)
 INSTALL_SCRIPT_FILES = run-fortran-ex.sh
@@ -696,6 +696,7 @@ h5_crtatt: h5_crtatt.f90
 h5_crtgrp: h5_crtgrp.f90
 h5_crtgrpar: h5_crtgrpar.f90
 h5_crtgrpd: h5_crtgrpd.f90
+h5_cmprss: h5_cmprss.f90
 hyperslab: hyperslab.f90
 selectele: selectele.f90
 refobjexample: refobjexample.f90
diff --git a/fortran/examples/h5_cmprss.f90 b/fortran/examples/h5_cmprss.f90
new file mode 100644
index 0000000..847a922
--- /dev/null
+++ b/fortran/examples/h5_cmprss.f90
@@ -0,0 +1,131 @@
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

+!   Copyright by The HDF Group.                                               *

+!   Copyright by the Board of Trustees of the University of Illinois.         *

+!   All rights reserved.                                                      *

+!                                                                             *

+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *

+!   terms governing use, modification, and redistribution, is contained in    *

+!   the files COPYING and Copyright.html.  COPYING can be found at the root   *

+!   of the source code distribution tree; Copyright.html can be found at the  *

+!   root level of an installed copy of the electronic HDF5 document set and   *

+!   is linked from the top-level documents page.  It can also be found at     *

+!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *

+!   access to either file, you may request a copy from help@hdfgroup.org.     *

+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

+! 

+!  This example illustrates how to create a compressed dataset.

+!  It is used in the HDF5 Tutorial.

+! 

+PROGRAM h5_cmprss

+

+  USE HDF5 ! This module contains all necessary modules 

+

+  IMPLICIT NONE

+  !

+  ! The dataset is stored in file "h5_cmprss.h5" 

+  !

+  CHARACTER(LEN=12), PARAMETER :: filename = "h5_cmprss.h5"

+  INTEGER, PARAMETER  :: rank = 2   ! Rank of the data set

+  INTEGER, PARAMETER  :: dim0 = 100 ! Data set sizes

+  INTEGER, PARAMETER  :: dim1 = 20

+

+  INTEGER(hid_t) :: file_id, dataset_id, dataspace_id ! Identifiers

+  INTEGER(hid_t) :: plist_id ! Property list identifier

+

+  INTEGER :: error

+  INTEGER(hsize_t), DIMENSION(1:rank) :: dims ! dimensions of data

+  INTEGER(hsize_t), DIMENSION(1:rank) :: cdims ! sizes of chunked data

+ 

+  INTEGER :: i,j, numfilt

+  INTEGER, DIMENSION(1:dim0,1:dim1) :: buf ! write buffer

+  INTEGER, DIMENSION(1:dim0,1:dim1) :: rbuf ! read buffer

+  INTEGER(HSIZE_T), DIMENSION(1:rank) :: data_dims ! dimensions of data buffers

+

+  INTEGER, DIMENSION(1:1) :: cd_values ! Auxiliary data for the filter

+  INTEGER(size_t) :: nelmts            ! Number of elements in cd_values

+  INTEGER :: flags ! Bit vector specifying certain general properties of the filter

+  INTEGER(SIZE_T) :: namelen = 180 ! Anticipated number of characters in name

+  CHARACTER(LEN=180) :: name ! Name of the filter

+  INTEGER :: filter_id ! Filter identification number

+

+  ! Uncomment these variables to use SZIP compression

+  !INTEGER :: szip_options_mask

+  !INTEGER :: szip_pixels_per_block

+

+  !

+  !Initialize FORTRAN predifined datatypes

+  !

+  CALL h5open_f(error)

+  !

+  ! Create a file

+  CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)

+  !

+  ! Create dataset "Compressed Data" in the group using absolute name.

+  dims(1:2) = (/dim0, dim1/)

+  CALL h5screate_simple_f(rank, dims, dataspace_id, error)

+  CALL h5pcreate_f(H5P_DATASET_CREATE_F, plist_id, error)

+  !

+  ! Dataset must be chunked for compression 

+  cdims(1:2) = 20

+  CALL h5pset_chunk_f(plist_id, 2, cdims, error)

+

+  ! Set ZLIB / DEFLATE Compression using compression level 6.

+  ! To use SZIP Compression comment out these lines. 

+  CALL h5pset_deflate_f(plist_id, 6, error)

+

+  ! Uncomment these lines to set SZIP Compression 

+  !szip_options_mask = H5_SZIP_NN_OM_F

+  !szip_pixels_per_block = 16

+  !CALL H5Pset_szip_f(plist_id, szip_options_mask, szip_pixels_per_block, error)

+

+  ! Create data set

+  CALL h5dcreate_f(file_id, "Compressed_Data", H5T_NATIVE_INTEGER, dataspace_id, &

+       dataset_id, error, dcpl_id=plist_id)

+

+  DO j = 1, dim1

+     DO i = 1, dim0

+        buf(i,j) = i+j

+     ENDDO

+  ENDDO

+

+  data_dims(1:2) = (/dim0,dim1/) 

+  CALL h5dwrite_f(dataset_id, H5T_NATIVE_INTEGER, buf, data_dims, error)

+

+  ! Close resources

+  CALL h5sclose_f(dataspace_id, error)

+  CALL h5pclose_f(plist_id, error)

+  CALL h5dclose_f(dataset_id, error)

+  CALL h5fclose_f(file_id, error)

+

+  ! Now reopen the file and dataset in the file.

+  CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file_id, error)

+  CALL h5dopen_f(file_id, "Compressed_Data", dataset_id, error)

+

+  ! Retrieve filter information. 

+  CALL h5dget_create_plist_f(dataset_id, plist_id, error)

+    

+  CALL h5pget_nfilters_f(plist_id, numfilt, error)

+  WRITE(*,'(A, I0)') "Number of filters associated with dataset: ", numfilt

+     

+  DO i = 1, numfilt

+     nelmts = 1

+     CALL h5pget_filter_f(plist_id, 0, flags, nelmts, cd_values, &

+          namelen, name, filter_id, error)

+

+      WRITE(*,'(30X,A)', ADVANCE='NO')"Filter Type: "

+      IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN

+         WRITE(*,'(A)') "H5Z_FILTER_DEFLATE"

+      ELSEIF (filter_id.EQ.H5Z_FILTER_SZIP_F)THEN

+         WRITE(*,'(A)') "H5Z_FILTER_SZIP"

+      ELSE

+         WRITE(*,'(A)') "Other filter type included"

+      ENDIF

+   ENDDO

+  data_dims(1:2) = (/dim0,dim1/)

+  CALL h5dread_f(dataset_id, H5T_NATIVE_INTEGER, rbuf, data_dims, error)

+    

+  CALL h5dclose_f(dataset_id, error)

+  CALL h5pclose_f(plist_id, error)

+  CALL h5fclose_f(file_id, error)

+

+END PROGRAM h5_cmprss

diff --git a/fortran/examples/run-fortran-ex.sh.in b/fortran/examples/run-fortran-ex.sh.in
index 23c2266..c5c379e 100644
--- a/fortran/examples/run-fortran-ex.sh.in
+++ b/fortran/examples/run-fortran-ex.sh.in
@@ -70,7 +70,9 @@ RunTest()
 # Run tests
 if [ $? -eq 0 ]
 then
-    if (RunTest h5_crtdat &&\
+    if (RunTest h5_cmprss &&\
+        rm h5_cmprss &&\
+        RunTest h5_crtdat &&\
         rm h5_crtdat &&\
         RunTest h5_extend &&\
         rm h5_extend &&\