diff options
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/test/t.c | 19 | ||||
| -rw-r--r-- | fortran/test/t.h | 2 | ||||
| -rw-r--r-- | fortran/test/tH5F.f90 | 10 | ||||
| -rw-r--r-- | fortran/test/tf.f90 | 35 |
4 files changed, 1 insertions, 65 deletions
diff --git a/fortran/test/t.c b/fortran/test/t.c index 5c4286c..cb71fd2 100644 --- a/fortran/test/t.c +++ b/fortran/test/t.c @@ -128,22 +128,3 @@ nh5_exit_c(int_f *status) HDexit((int)*status); } /* h5_exit_c */ - -/*---------------------------------------------------------------------------- - * Name: h5_group_revision_c - * Purpose: Checks if H5_GROUP_REVISION variable defined - * Inputs: - * Returns: 1 if defines, 0 otherwise - * Programmer: Elena Pourmal - * Saturday, May 13, 2006 - * Modifications: - *---------------------------------------------------------------------------*/ -int_f -nh5_group_revision_c() -{ - int_f ret =0; -#ifdef H5_GROUP_REVISION - ret = 1; -#endif - return ret; -} /* h5_group_revision_c */ diff --git a/fortran/test/t.h b/fortran/test/t.h index 47062ac..79c6d4b 100644 --- a/fortran/test/t.h +++ b/fortran/test/t.h @@ -25,7 +25,6 @@ char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size) # define nh5_fixname_c H5_FC_FUNC_(h5_fixname_c, H5_FIXNAME_C) # define nh5_cleanup_c H5_FC_FUNC_(h5_cleanup_c, H5_CLEANUP_C) # define nh5_exit_c H5_FC_FUNC_(h5_exit_c, H5_EXIT_C) -# define nh5_group_revision_c H5_FC_FUNC_(h5_group_revision_c, H5_GROUP_REVISION_C) H5_FCTESTDLL int_f nh5_fixname_c (_fcd base_name, size_t_f *base_namelen, hid_t_f *fapl, _fcd full_name, size_t_f *full_namelen); @@ -36,4 +35,3 @@ H5_FCTESTDLL int_f nh5_cleanup_c H5_FCTESTDLL void nh5_exit_c (int_f *status); -H5_FCTESTDLL int_f nh5_group_revision_c(); diff --git a/fortran/test/tH5F.f90 b/fortran/test/tH5F.f90 index 2cc4766..091b1a5 100644 --- a/fortran/test/tH5F.f90 +++ b/fortran/test/tH5F.f90 @@ -747,16 +747,8 @@ ! Check the free space now CALL h5fget_freespace_f(fid, free_space, error) - CALL h5_group_revision_f(flag) CALL check("h5fget_freespace_f",error,total_error) - if(flag .eq. 1) then - free_space_out = 232 - else - free_space_out = 1024 - endif - if(error .eq.0 .and. free_space .ne. free_space_out) then -! if(error .eq.0 .and. free_space .ne. 232) then -! if(error .eq.0 .and. free_space .ne. 1024) then + if(error .eq.0 .and. free_space .ne. 0) then total_error = total_error + 1 write(*,*) "3: Wrong amount of free space reported, ", free_space endif diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90 index 6dc3c02..cc9c9fa 100644 --- a/fortran/test/tf.f90 +++ b/fortran/test/tf.f90 @@ -201,38 +201,3 @@ END SUBROUTINE h5_exit_f -!---------------------------------------------------------------------- -! Name: h5_group_revision_f -! -! Purpose: Checks if group revisions are defined -! -! Inputs: -! -! Outputs: -! flag -! -! Programmer: Elena Pourmal -! May 13, 2006 -! -! -!---------------------------------------------------------------------- - SUBROUTINE h5_group_revision_f(flag) -! -!This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) -!DEC$attributes dllexport :: h5_group_revision_f -!DEC$endif - IMPLICIT NONE - INTEGER, INTENT(OUT) :: flag ! Return code - INTEGER :: flag1 - INTERFACE - INTEGER FUNCTION h5_group_revision_c() - !DEC$ IF DEFINED(HDF5F90_WINDOWS) - !MS$ATTRIBUTES C,reference,alias:'_H5_GROUP_REVISION_C':: h5_group_revision_c - !DEC$ ENDIF - END FUNCTION h5_group_revision_c - END INTERFACE - - flag = h5_group_revision_c() - - END SUBROUTINE h5_group_revision_f |