summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-07-07 19:02:46 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-07-07 19:02:46 (GMT)
commit4e23c807585ed705173f32e374884a46e4a4f2dd (patch)
treedf458773252f84a19720b4d8b3588db955f4b6d1 /fortran
parent2d5f8835fd9851c65d8e33a9c4bbe5da64d5427e (diff)
downloadhdf5-4e23c807585ed705173f32e374884a46e4a4f2dd.zip
hdf5-4e23c807585ed705173f32e374884a46e4a4f2dd.tar.gz
hdf5-4e23c807585ed705173f32e374884a46e4a4f2dd.tar.bz2
[svn-r7181] Purpose:
Version update Description: Removed 1.4 compatibility code in the library. Platforms tested: FreeBSD 4.8 (sleipnir) h5committest
Diffstat (limited to 'fortran')
-rw-r--r--fortran/src/H5Pf.c76
-rw-r--r--fortran/src/H5Pff.f90122
-rw-r--r--fortran/src/H5f90proto.h8
3 files changed, 0 insertions, 206 deletions
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 1ca819b..98d88cb 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -660,11 +660,7 @@ nh5pget_sym_k_c (hid_t_f *prp_id, int_f* ik, int_f* lk)
hid_t c_prp_id;
herr_t ret;
int c_ik;
-#ifdef H5_WANT_H5_V1_4_COMPAT
- int c_lk;
-#else /* H5_WANT_H5_V1_4_COMPAT */
unsigned c_lk;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
/*
* Call H5Pget_sym_k function.
@@ -1666,78 +1662,6 @@ DONE:
}
/*----------------------------------------------------------------------------
- * Name: h5pset_hyper_cache_c
- * Purpose: Call H5Pset__hyper_cache to indicate whether to
- * cache hyperslab blocks during I/O.
- * Inputs: prp_id - property list identifier
- * cache -
- * limit - Maximum size of the hyperslab block to cache.
- * 0 (zero) indicates no limit.
- * Returns: 0 on success, -1 on failure
- * Programmer: Xiangyang Su
- * Friday, February 25, 2000
- * Modifications:
- *---------------------------------------------------------------------------*/
-int_f
-nh5pset_hyper_cache_c(hid_t_f *prp_id, int_f * cache, int_f * limit)
-{
- int ret_value = -1;
- hid_t c_prp_id;
-#ifdef H5_WANT_H5_V1_4_COMPAT
- herr_t ret;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
- unsigned c_cache, c_limit;
-
- c_cache = (unsigned) *cache;
- c_limit = (unsigned) *limit;
-
- /*
- * Call H5Pset_hyper_cache function.
- */
- c_prp_id = (hid_t)*prp_id;
-#ifdef H5_WANT_H5_V1_4_COMPAT
- ret = H5Pset_hyper_cache(c_prp_id, c_cache, c_limit);
- if (ret < 0) return ret_value;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
- ret_value = 0;
- return ret_value;
-}
-
-/*----------------------------------------------------------------------------
- * Name: h5pget_hyper_cache_c
- * Purpose: Call H5Pget_hyper_cache to get information regarding
- * the caching of hyperslab blocks
- * Inputs: prp_id - property list identifier
- * cache -
- * limit - Maximum size of the hyperslab block to cache.
- * 0 (zero) indicates no limit.
- * Returns: 0 on success, -1 on failure
- * Programmer: Xiangyang Su
- * Friday, February 25, 2000
- * Modifications:
- *---------------------------------------------------------------------------*/
-int_f
-nh5pget_hyper_cache_c(hid_t_f *prp_id, int_f * cache, int_f * limit)
-{
- int ret_value = -1;
-#ifdef H5_WANT_H5_V1_4_COMPAT
- hid_t c_prp_id;
- herr_t ret;
- unsigned c_cache, c_limit;
- /*
- * Call H5Pget__hyper_cache function.
- */
- c_prp_id = (hid_t)*prp_id;
- ret = H5Pget_hyper_cache(c_prp_id, &c_cache, &c_limit);
- if (ret < 0) return ret_value;
- *cache = (int_f)c_cache;
- *limit = (int_f)c_limit;
- ret_value = 0;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
- return ret_value;
-}
-
-/*----------------------------------------------------------------------------
* Name: h5pset_btree_ratios_c
* Purpose: Call H5Pset_btree_ratios to set B-tree split ratios for B-tree split ratios for a dataset transfer property list. a
* dataset transfer property list.
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
index c59ad55..e70a573 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -2970,128 +2970,6 @@
END SUBROUTINE h5pget_external_f
!----------------------------------------------------------------------
-! Name: h5pset_hyper_cache_f
-!
-! Purpose: Indicates whether to cache hyperslab blocks during I/O
-!
-! Inputs:
-! prp_id - dataset transfer property list identifier
-! cache - A flag indicating whether caching is to
-! be set to on (1) or off (0).
-! limit - maximum size of the hyperslab block to
-! cache; 0 (zero) indicates no limit
-! Outputs:
-! hdferr: - error code
-! Success: 0
-! Failure: -1
-! Optional parameters:
-! NONE
-!
-! Programmer: Elena Pourmal
-! August 12, 1999
-!
-! Modifications: Explicit Fortran interfaces were added for
-! called C functions (it is needed for Windows
-! port). March 14, 2001
-!
-! Comment:
-!----------------------------------------------------------------------
-
- SUBROUTINE h5pset_hyper_cache_f(prp_id, cache, limit, hdferr)
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5pset_hyper_cache_f
-!DEC$endif
-!
- IMPLICIT NONE
- INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
- INTEGER, INTENT(IN) :: cache !
- INTEGER, INTENT(IN) :: limit ! Maximum size of the hyperslab block to
- !cache. 0 (zero) indicates no limit.
- INTEGER, INTENT(OUT) :: hdferr ! Error code
-
-! INTEGER, EXTERNAL :: h5pset_hyper_cache_c
-! MS FORTRAN needs explicit interface for C functions called here.
-!
- INTERFACE
- INTEGER FUNCTION h5pset_hyper_cache_c(prp_id, cache, limit)
- USE H5GLOBAL
- !DEC$ IF DEFINED(HDF5F90_WINDOWS)
- !MS$ATTRIBUTES C,reference,alias:'_H5PSET_HYPER_CACHE_C'::h5pset_hyper_cache_c
- !DEC$ ENDIF
- INTEGER(HID_T), INTENT(IN) :: prp_id
- INTEGER, INTENT(IN) :: cache
- INTEGER, INTENT(IN) :: limit
- END FUNCTION h5pset_hyper_cache_c
- END INTERFACE
-
- hdferr = h5pset_hyper_cache_c(prp_id, cache, limit)
- END SUBROUTINE h5pset_hyper_cache_f
-
-!----------------------------------------------------------------------
-! Name: h5pget_hyper_cache_f
-!
-! Purpose: Returns information regarding the caching of hyperslab
-! blocks during I/O.
-!
-! Inputs:
-! prp_id - dataset transfer property list identifier
-! Outputs:
-! cache - a flag indicating whether caching is
-! set to on (1) or off (0).
-! limit - maximum size of the hyperslab block to
-! cache; 0 (zero) indicates no limit
-! hdferr: - error code
-! Success: 0
-! Failure: -1
-! Optional parameters:
-! NONE
-!
-! Programmer: Elena Pourmal
-! August 12, 1999
-!
-! Modifications: Explicit Fortran interfaces were added for
-! called C functions (it is needed for Windows
-! port). March 14, 2001
-!
-! Comment:
-!----------------------------------------------------------------------
-
- SUBROUTINE h5pget_hyper_cache_f(prp_id, cache, limit, hdferr)
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5pget_hyper_cache_f
-!DEC$endif
-!
- IMPLICIT NONE
- INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
- INTEGER, INTENT(OUT) :: cache !
- INTEGER, INTENT(OUT) :: limit ! Maximum size of the hyperslab block to
- !cache. 0 (zero) indicates no limit.
- INTEGER, INTENT(OUT) :: hdferr ! Error code
-
-
-! INTEGER, EXTERNAL :: h5pget_hyper_cache_c
-! MS FORTRAN needs explicit interface for C functions called here.
-!
- INTERFACE
- INTEGER FUNCTION h5pget_hyper_cache_c(prp_id, cache, limit)
- USE H5GLOBAL
- !DEC$ IF DEFINED(HDF5F90_WINDOWS)
- !MS$ATTRIBUTES C,reference,alias:'_H5PGET_HYPER_CACHE_C'::h5pget_hyper_cache_c
- !DEC$ ENDIF
- INTEGER(HID_T), INTENT(IN) :: prp_id
- INTEGER, INTENT(OUT) :: cache
- INTEGER, INTENT(OUT) :: limit
- END FUNCTION h5pget_hyper_cache_c
- END INTERFACE
-
- hdferr = h5pget_hyper_cache_c(prp_id, cache, limit)
- END SUBROUTINE h5pget_hyper_cache_f
-
-!----------------------------------------------------------------------
! Name: h5pset_btree_ratios_f
!
! Purpose: Sets B-tree split ratios for a dataset transfer
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index a684644..1caa464 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -772,8 +772,6 @@ H5_DLL int_f nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag );
# define nh5pset_external_c FNAME(H5PSET_EXTERNAL_C)
# define nh5pget_external_count_c FNAME(H5PGET_EXTERNAL_COUNT_C)
# define nh5pget_external_c FNAME(H5PGET_EXTERNAL_C)
-# define nh5pset_hyper_cache_c FNAME(H5PSET_HYPER_CACHE_C)
-# define nh5pget_hyper_cache_c FNAME(H5PGET_HYPER_CACHE_C)
# define nh5pget_btree_ratios_c FNAME(H5PGET_BTREE_RATIOS_C)
# define nh5pset_btree_ratios_c FNAME(H5PSET_BTREE_RATIOS_C)
# define nh5pset_fapl_mpio_c FNAME(H5PSET_FAPL_MPIO_C)
@@ -881,8 +879,6 @@ H5_DLL int_f nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag );
# define nh5pset_external_c FNAME(h5pset_external_c)
# define nh5pget_external_count_c FNAME(h5pget_external_count_c)
# define nh5pget_external_c FNAME(h5pget_external_c)
-# define nh5pset_hyper_cache_c FNAME(h5pset_hyper_cache_c)
-# define nh5pget_hyper_cache_c FNAME(h5pget_hyper_cache_c)
# define nh5pget_btree_ratios_c FNAME(h5pget_btree_ratios_c)
# define nh5pset_btree_ratios_c FNAME(h5pset_btree_ratios_c)
# define nh5pset_fapl_mpio_c FNAME(h5pset_fapl_mpio_c)
@@ -1048,10 +1044,6 @@ H5_DLL int_f
nh5pget_external_count_c (hid_t_f *prp_id, int_f* count);
H5_DLL int_f
nh5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f* name_size, _fcd name, int_f* offset, hsize_t_f*bytes);
-H5_DLL int_f
-nh5pset_hyper_cache_c(hid_t_f *prp_id, int_f* cache, int_f* limit);
-H5_DLL int_f
-nh5pget_hyper_cache_c(hid_t_f *prp_id, int_f* cache, int_f* limit);
H5_DLL int_f
nh5pget_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* middle, real_f* right);
H5_DLL int_f