mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-05 15:42:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r7064]

Browse Source 
Purpose: IA64 (titan) cleanup and backing up previous change to the
         H5f90global.f90 file

Description: We defined IA64 variable for C-stubs compilation
             on IA64 systems. But system defines __ia64 and
             it is better to use it as we do on all other systems.
             Fortran test failed since global variable became undefined.

Solution: Removed -DIA64 and use __ia64 instead.
          Somehow removal of COMMON statements from H5f90global.f90
          caused errors on titan. Most of the global fortran variables became
          undefined. I am not sure why it is happenning. It may be ecc compiler
          or there is an error in the Fortran code. Since it may take some time
          to track it, I decided to remove this change.
Platforms tested: titan, arabica

Misc. update:
This commit is contained in:
Elena Pourmal 2003-06-19 14:38:32 -05:00
parent 18185298e4
commit 0489e2726c
2 changed files with 92 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
fortran/src/H5f90global.f90
View File

@ -104,6 +104,46 @@
EQUIVALENCE (integer_types(17), H5T_STRING) EQUIVALENCE (integer_types(17), H5T_STRING)
! COMMON /PREDEFINED_TYPES/ H5T_NATIVE_INTEGER, &
! H5T_NATIVE_REAL, &
! H5T_NATIVE_DOUBLE, &
! H5T_NATIVE_CHARACTER, &
! H5T_STD_REF_OBJ, &
! H5T_STD_REF_DSETREG
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /PREDEFINED_TYPES/
!DEC$endif
COMMON /PREDEFINED_TYPES/ predef_types
! COMMON /FLOATING_TYPES/ H5T_IEEE_F32BE, &
! H5T_IEEE_F32LE, &
! H5T_IEEE_F64BE, &
! H5T_IEEE_F64LE
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /FLOATING_TYPES/
!DEC$endif
COMMON /FLOATING_TYPES/ floating_types
!
! COMMON /INTEGER_TYPES/ H5T_STD_I8BE, &
! H5T_STD_I8LE, &
! H5T_STD_I16BE, &
! H5T_STD_I16LE, &
! H5T_STD_I32BE, &
! H5T_STD_I32LE, &
! H5T_STD_I64BE, &
! H5T_STD_I64LE, &
! H5T_STD_U8BE, &
! H5T_STD_U8LE, &
! H5T_STD_U16BE, &
! H5T_STD_U16LE, &
! H5T_STD_U32BE, &
! H5T_STD_U32LE, &
! H5T_STD_U64BE, &
! H5T_STD_U64LE
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /INTEGER_TYPES/
!DEC$endif
COMMON /INTEGER_TYPES/ integer_types
! !
! Fortran flags ! Fortran flags
! !
@ -114,6 +154,10 @@
! !
INTEGER, PARAMETER :: H5F_FLAGS_LEN = 16 INTEGER, PARAMETER :: H5F_FLAGS_LEN = 16
INTEGER H5F_flags(H5F_FLAGS_LEN) INTEGER H5F_flags(H5F_FLAGS_LEN)
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /H5F_FLAGS/
!DEC$endif
COMMON /H5F_FLAGS/ H5F_flags
INTEGER :: H5F_ACC_RDWR_F INTEGER :: H5F_ACC_RDWR_F
INTEGER :: H5F_ACC_RDONLY_F INTEGER :: H5F_ACC_RDONLY_F
@ -153,6 +197,10 @@
! !
INTEGER, PARAMETER :: H5G_FLAGS_LEN = 8 INTEGER, PARAMETER :: H5G_FLAGS_LEN = 8
INTEGER H5G_flags(H5G_FLAGS_LEN) INTEGER H5G_flags(H5G_FLAGS_LEN)
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /H5G_FLAGS/
!DEC$endif
COMMON /H5G_FLAGS/ H5G_flags
INTEGER :: H5G_UNKNOWN_F INTEGER :: H5G_UNKNOWN_F
INTEGER :: H5G_LINK_F INTEGER :: H5G_LINK_F
@ -177,6 +225,10 @@
INTEGER, PARAMETER :: H5D_FLAGS_LEN = 19 INTEGER, PARAMETER :: H5D_FLAGS_LEN = 19
INTEGER H5D_flags(H5D_FLAGS_LEN) INTEGER H5D_flags(H5D_FLAGS_LEN)
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /H5D_FLAGS/
!DEC$endif
COMMON /H5D_FLAGS/ H5D_flags
INTEGER :: H5D_COMPACT_F INTEGER :: H5D_COMPACT_F
INTEGER :: H5D_CONTIGUOUS_F INTEGER :: H5D_CONTIGUOUS_F
@ -231,6 +283,10 @@
! !
INTEGER, PARAMETER :: H5FD_FLAGS_LEN = 11 INTEGER, PARAMETER :: H5FD_FLAGS_LEN = 11
INTEGER H5FD_flags(H5FD_FLAGS_LEN) INTEGER H5FD_flags(H5FD_FLAGS_LEN)
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /H5FD_FLAGS/
!DEC$endif
COMMON /H5FD_FLAGS/ H5FD_flags
INTEGER :: H5FD_MPIO_INDEPENDENT_F INTEGER :: H5FD_MPIO_INDEPENDENT_F
INTEGER :: H5FD_MPIO_COLLECTIVE_F INTEGER :: H5FD_MPIO_COLLECTIVE_F
@ -261,6 +317,10 @@
! !
INTEGER, PARAMETER :: H5E_FLAGS_LEN = 24 INTEGER, PARAMETER :: H5E_FLAGS_LEN = 24
INTEGER H5E_flags(H5E_FLAGS_LEN) INTEGER H5E_flags(H5E_FLAGS_LEN)
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /H5E_FLAGS/
!DEC$endif
COMMON /H5E_FLAGS/ H5E_flags
INTEGER :: H5E_NONE_MAJOR_F INTEGER :: H5E_NONE_MAJOR_F
INTEGER :: H5E_ARGS_F INTEGER :: H5E_ARGS_F
@ -317,6 +377,10 @@
! !
INTEGER, PARAMETER :: H5I_FLAGS_LEN = 7 INTEGER, PARAMETER :: H5I_FLAGS_LEN = 7
INTEGER H5I_flags(H5I_FLAGS_LEN) INTEGER H5I_flags(H5I_FLAGS_LEN)
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /H5I_FLAGS/
!DEC$endif
COMMON /H5I_FLAGS/ H5I_flags
INTEGER :: H5I_FILE_F INTEGER :: H5I_FILE_F
INTEGER :: H5I_GROUP_F INTEGER :: H5I_GROUP_F
@ -339,6 +403,10 @@
! !
INTEGER, PARAMETER :: H5P_FLAGS_LEN = 7 INTEGER, PARAMETER :: H5P_FLAGS_LEN = 7
INTEGER H5P_flags(H5P_FLAGS_LEN) INTEGER H5P_flags(H5P_FLAGS_LEN)
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /H5P_FLAGS/
!DEC$endif
COMMON /H5P_FLAGS/ H5P_flags
INTEGER :: H5P_FILE_CREATE_F INTEGER :: H5P_FILE_CREATE_F
INTEGER :: H5P_FILE_ACCESS_F INTEGER :: H5P_FILE_ACCESS_F
@ -361,6 +429,10 @@
! !
INTEGER, PARAMETER :: H5R_FLAGS_LEN = 2 INTEGER, PARAMETER :: H5R_FLAGS_LEN = 2
INTEGER H5R_flags(H5R_FLAGS_LEN) INTEGER H5R_flags(H5R_FLAGS_LEN)
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /H5R_FLAGS/
!DEC$endif
COMMON /H5R_FLAGS/ H5R_flags
INTEGER :: H5R_OBJECT_F INTEGER :: H5R_OBJECT_F
INTEGER :: H5R_DATASET_REGION_F INTEGER :: H5R_DATASET_REGION_F
@ -373,6 +445,10 @@
! !
INTEGER, PARAMETER :: H5S_FLAGS_LEN = 19 INTEGER, PARAMETER :: H5S_FLAGS_LEN = 19
INTEGER H5S_flags(H5S_FLAGS_LEN) INTEGER H5S_flags(H5S_FLAGS_LEN)
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /H5S_FLAGS/
!DEC$endif
COMMON /H5S_FLAGS/ H5S_flags
INTEGER :: H5S_SCALAR_F INTEGER :: H5S_SCALAR_F
INTEGER :: H5S_SIMPLE_F INTEGER :: H5S_SIMPLE_F
@ -427,6 +503,10 @@
! !
INTEGER, PARAMETER :: H5T_FLAGS_LEN = 30 INTEGER, PARAMETER :: H5T_FLAGS_LEN = 30
INTEGER H5T_flags(H5T_FLAGS_LEN) INTEGER H5T_flags(H5T_FLAGS_LEN)
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /H5T_FLAGS/
!DEC$endif
COMMON /H5T_FLAGS/ H5T_flags
INTEGER :: H5T_NO_CLASS_F INTEGER :: H5T_NO_CLASS_F
INTEGER :: H5T_INTEGER_F INTEGER :: H5T_INTEGER_F
@ -495,6 +575,10 @@
! !
INTEGER, PARAMETER :: H5Z_FLAGS_LEN = 11 INTEGER, PARAMETER :: H5Z_FLAGS_LEN = 11
INTEGER H5Z_flags(H5Z_FLAGS_LEN) INTEGER H5Z_flags(H5Z_FLAGS_LEN)
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /H5Z_FLAGS/
!DEC$endif
COMMON /H5Z_FLAGS/ H5Z_flags
INTEGER :: H5Z_FILTER_ERROR_F INTEGER :: H5Z_FILTER_ERROR_F
INTEGER :: H5Z_FILTER_NONE_F INTEGER :: H5Z_FILTER_NONE_F
@ -526,10 +610,13 @@
! !
INTEGER, PARAMETER :: H5LIB_FLAGS_LEN = 3 INTEGER, PARAMETER :: H5LIB_FLAGS_LEN = 3
INTEGER :: H5LIB_flags(H5LIB_FLAGS_LEN) INTEGER :: H5LIB_flags(H5LIB_FLAGS_LEN)
!DEC$if defined(BUILD_HDF5_DLL)
INTEGER :: H5_SZIP_RAW_OM_F !DEC$ ATTRIBUTES DLLEXPORT :: /H5LIB_FLAGS/
INTEGER :: H5_SZIP_NN_OM_F !DEC$endif
INTEGER :: H5_SZIP_RAWORNN_OM_F COMMON /H5LIB_FLAGS/ H5LIB_flags
INTEGER :: H5_SZIP_RAW_OM_F
INTEGER :: H5_SZIP_NN_OM_F
INTEGER :: H5_SZIP_RAWORNN_OM_F
! !
EQUIVALENCE(H5LIB_flags(1), H5_SZIP_RAW_OM_F) EQUIVALENCE(H5LIB_flags(1), H5_SZIP_RAW_OM_F)
EQUIVALENCE(H5LIB_flags(2), H5_SZIP_NN_OM_F) EQUIVALENCE(H5LIB_flags(2), H5_SZIP_NN_OM_F)

2
fortran/src/H5f90i.h
View File

@ -114,7 +114,7 @@ typedef float real_f;
#endif /*LINUX*/ #endif /*LINUX*/
/* IA64 LINUX definitions */ /* IA64 LINUX definitions */
#if defined IA64 #if defined __ia64
typedef char *_fcd; typedef char *_fcd;
typedef long hsize_t_f; typedef long hsize_t_f;
typedef long hssize_t_f; typedef long hssize_t_f;