diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2010-04-15 14:49:08 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2010-04-15 14:49:08 (GMT) |
| commit | fee129b9c2ad2b841ebe26294cf1b27182d24d17 (patch) | |
| tree | 5991176c60c43f2098ea7fc1fda53844e680924b /fortran/src | |
| parent | fcff5fc0f8a9b1a75a924c339a3a03fa40595cb8 (diff) | |
| download | hdf5-fee129b9c2ad2b841ebe26294cf1b27182d24d17.zip hdf5-fee129b9c2ad2b841ebe26294cf1b27182d24d17.tar.gz hdf5-fee129b9c2ad2b841ebe26294cf1b27182d24d17.tar.bz2 | |
[svn-r18557] Description:
Merged Fortran changes from the trunk into the branch
svn merge -r 18098:18556 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
Tested: jam (intel)
Diffstat (limited to 'fortran/src')
| -rw-r--r-- | fortran/src/H5Fff.f90 | 4 | ||||
| -rw-r--r-- | fortran/src/H5Tff.f90 | 17 | ||||
| -rw-r--r-- | fortran/src/Makefile.am | 4 | ||||
| -rw-r--r-- | fortran/src/Makefile.in | 4 |
4 files changed, 21 insertions, 8 deletions
diff --git a/fortran/src/H5Fff.f90 b/fortran/src/H5Fff.f90 index a1ebe58..dcd6ff6 100644 --- a/fortran/src/H5Fff.f90 +++ b/fortran/src/H5Fff.f90 @@ -89,8 +89,8 @@ creation_prp_default = H5P_DEFAULT_F access_prp_default = H5P_DEFAULT_F - IF (PRESENT(creation_prp)) creation_prp_default = creation_prp - IF (PRESENT(access_prp)) access_prp_default = access_prp + if (present(creation_prp)) creation_prp_default = creation_prp + if (present(access_prp)) access_prp_default = access_prp namelen = LEN_TRIM(name) hdferr = h5fcreate_c(name, namelen, access_flags, & diff --git a/fortran/src/H5Tff.f90 b/fortran/src/H5Tff.f90 index 82220c7..c6c96d0 100644 --- a/fortran/src/H5Tff.f90 +++ b/fortran/src/H5Tff.f90 @@ -1510,8 +1510,9 @@ CONTAINS ! type_id - datatype identifier ! Outputs: ! cset - character set type of a string datatype -! Possible values of padding type are: +! Possible values are: ! H5T_CSET_ASCII_F = 0 +! H5T_CSET_UTF8_F ! hdferr: - error code ! Success: 0 ! Failure: -1 @@ -1532,8 +1533,9 @@ CONTAINS IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier INTEGER, INTENT(OUT) :: cset ! character set type of a string datatype - ! Possible values of padding type are: - !H5T_CSET_ASCII_F = 0 + ! Possible values are: + ! H5T_CSET_ASCII_F = 0 + ! H5T_CSET_UTF8_F INTEGER, INTENT(OUT) :: hdferr ! Error code ! INTEGER, EXTERNAL :: h5tget_cset_c @@ -1561,8 +1563,9 @@ CONTAINS ! Inputs: ! type_id - datatype identifier ! cset - character set type of a string datatype -! Possible values of padding type are: +! Possible values are: ! H5T_CSET_ASCII_F = 0 +! H5T_CSET_UTF8_F ! Outputs: ! hdferr: - error code ! Success: 0 @@ -1584,8 +1587,10 @@ CONTAINS IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier INTEGER, INTENT(IN) :: cset !character set type of a string datatype - !Possible values of padding type are: - !H5T_CSET_ASCII_F = 0 + !Possible values are: + ! H5T_CSET_ASCII_F = 0 + ! H5T_CSET_UTF8_F + INTEGER, INTENT(OUT) :: hdferr ! Error code ! INTEGER, EXTERNAL :: h5tset_cset_c diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index d2644a1..f38e94f 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -90,11 +90,14 @@ clean-local: @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ $(RM) *.$(F9XMODEXT); \ fi + $(RM) $(DESTDIR)$(includedir)/H5f90i*.h install-data-local: @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \ fi + $(CP) $(top_builddir)/$(subdir)/H5f90i_gen.h $(DESTDIR)$(includedir)/. + $(CP) $(top_srcdir)/fortran/src/H5f90i.h $(DESTDIR)$(includedir)/. uninstall-local: @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ @@ -103,6 +106,7 @@ uninstall-local: fi; \ fi; \ $(RM) $(DESTDIR)$(bindir)/$(H5FC_NAME) + $(RM) $(DESTDIR)$(includedir)/H5f90i*.h # Also install and uninstall (uninstall-local above) h5fc script install-exec-local: diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index ff4225d..922780f 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -916,11 +916,14 @@ clean-local: @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ $(RM) *.$(F9XMODEXT); \ fi + $(RM) $(DESTDIR)$(includedir)/H5f90i*.h install-data-local: @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \ fi + $(CP) $(top_builddir)/$(subdir)/H5f90i_gen.h $(DESTDIR)$(includedir)/. + $(CP) $(top_srcdir)/fortran/src/H5f90i.h $(DESTDIR)$(includedir)/. uninstall-local: @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ @@ -929,6 +932,7 @@ uninstall-local: fi; \ fi; \ $(RM) $(DESTDIR)$(bindir)/$(H5FC_NAME) + $(RM) $(DESTDIR)$(includedir)/H5f90i*.h # Also install and uninstall (uninstall-local above) h5fc script install-exec-local: |