[svn-r15849] Description:

Changed the datatype test programs such that we don't distinguish between writeDoubleToFiles and writeFloatToFiles so that we only define c_float_4, c_float_8, and c_float_16 in  H5f90i_gen.h

Added the definition of real_4_f, real_8_f, real_16_f depending on if they are available, also in  H5f90i_gen.h

1 files changed, 115 insertions, 12 deletions

diff --git a/fortran/src/H5test_kind.f90 b/fortran/src/H5test_kind.f90
index e357fea..b945cd3 100644
--- a/fortran/src/H5test_kind.f90
+++ b/fortran/src/H5test_kind.f90
@@ -1,4 +1,26 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!****h* fortran/src/H5test_kind.f90
+!
+! NAME
+!  H5test_kind
+!  
+! FUNCTION
+!  This stand alone program is used at build time to generate the program 
+!  H5fortran_detect.f90. It cycles through all the available KIND parameters for
+!  integers and reals. The appropriate program and subroutines are then generated 
+!  depending on which of the KIND values are found.
+!
+! NOTES
+!  This program is depreciated in favor of H5test_kind_SIZEOF.f90 and is only 
+!  used when the Fortran intrinsic function SIZEOF is not available. It generates
+!  code that does not make use of SIZEOF in H5fortran_detect.f90 which is less 
+!  portable in comparison to using SIZEOF.
+!
+!  The availability of SIZEOF is checked at configure time and the TRUE/FALSE 
+!  condition is set in the configure variable "FORTRAN_HAVE_SIZEOF".
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
 !                                                                             *
@@ -8,17 +30,18 @@
 !   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://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
-!   access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   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.     *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
 !
-! H5test_kind.f90
-!
-! This fortran program generates H5fortran_detect.f90
-! 
+! AUTHOR
+!  Elena Pourma
 !
+!*****
+
 PROGRAM test_kind
-  INTEGER :: i, j, ii, last, kind_numbers(10)
+  IMPLICIT NONE
+  INTEGER :: i, j, ii, ir, last, ikind_numbers(10), rkind_numbers(10)
   INTEGER :: jr, jd
   last = -1
   ii = 0
@@ -28,13 +51,67 @@ PROGRAM test_kind
      IF(j .NE. last) THEN
         IF(last .NE. -1) THEN
            ii = ii + 1
-           kind_numbers(ii) = last
+           ikind_numbers(ii) = last
+        ENDIF
+        last = j
+        IF(j .EQ. -1) EXIT
+     ENDIF
+  ENDDO
+
+  last = -1
+  ir = 0
+  DO i = 1,100
+     j = SELECTED_REAL_KIND(i)
+     IF(j .NE. last) THEN
+        IF(last .NE. -1) THEN
+           ir = ir + 1
+           rkind_numbers(ir) = last
         ENDIF
         last = j
         IF(j .EQ. -1) EXIT
      ENDIF
   ENDDO
+
+! Generate program information:
+
+WRITE(*,'(40(A,/))') &
+'!****h* fortran/src/H5fortran_detect.f90',&
+'!',&
+'! NAME',&
+'!  H5fortran_detect',&
+'! ',&
+'! FUNCTION',&
+'!  This stand alone program is used at build time to generate the header file',&
+'!  H5fort_type_defines.h. The source code itself was automatically generated by',&
+'!  the program H5test_kind.f90',&
+'!',&
+'! NOTES',&
+'!  This source code does not make use of the Fortran intrinsic function SIZEOF because',&
+'!  the availability of the intrinsic function was determined to be not available at',&
+'!  configure time',& 
+'!',&
+'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
+'!   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.     *',&
+'! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *',&
+'!',&
+'! AUTHOR',&
+'!  H5test_kind.f90',&
+'!',&
+'!*****'
+
 ! Generate a program
+
   WRITE(*,*) "PROGRAM int_kind"
   WRITE(*,*) "WRITE(*,*) "" /*generating header file*/ """
   j = 0
@@ -44,9 +121,13 @@ PROGRAM test_kind
   jd = 0
   WRITE(*, "("" CALL d"", i2.2,""()"")") jd
   DO i = 1, ii
-     j = kind_numbers(i)
+     j = ikind_numbers(i)
      WRITE(*, "("" CALL i"", i2.2,""()"")") j
   ENDDO
+  DO i = 1, ir
+     j = rkind_numbers(i)
+     WRITE(*, "("" CALL r"", i2.2,""()"")") j
+  ENDDO
   WRITE(*,*) "END PROGRAM int_kind"
   j = 0
   WRITE(*, "("" SUBROUTINE i"", i2.2,""()"")") j
@@ -109,7 +190,7 @@ PROGRAM test_kind
   WRITE(*,*)"   RETURN"
   WRITE(*,*)"END SUBROUTINE"    
   DO i = 1, ii
-     j = kind_numbers(i)
+     j = ikind_numbers(i)
      WRITE(*, "("" SUBROUTINE i"", i2.2,""()"")") j
      WRITE(*,*)"   IMPLICIT NONE"
      WRITE(*,*)"   INTEGER(",j,") :: a = 0"
@@ -133,6 +214,28 @@ PROGRAM test_kind
      WRITE(*,*)"   RETURN"
      WRITE(*,*)"   END SUBROUTINE"    
   ENDDO
+  DO i = 1, ir
+     j = rkind_numbers(i)
+     WRITE(*, "("" SUBROUTINE r"", i2.2,""()"")") j
+     WRITE(*,*)"   IMPLICIT NONE"
+     WRITE(*,*)"   REAL(KIND=",j,") :: b(32)"
+     WRITE(*,*)"   INTEGER :: a(1)"
+     WRITE(*,*)"   INTEGER :: a_size"
+     WRITE(*,*)"   INTEGER :: real_size"
+     WRITE(*,*)"   a_size = BIT_SIZE(a(1)) ! Size in bits for integer"
+     WRITE(*,*)"   real_size = (SIZE(TRANSFER(b,a))*a_size)/SIZE(b)"
+     WRITE(*,*)"   IF (real_size .EQ. 32) THEN"
+     WRITE(*,*)"       WRITE(*,*) ""#define H5_FORTRAN_HAS_REAL_4"" "
+     WRITE(*,*)"   ENDIF"
+     WRITE(*,*)"   IF (real_size .EQ. 64) THEN"
+     WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_REAL_8"" "
+     WRITE(*,*)"   endif"
+     WRITE(*,*)"   IF (real_size .EQ. 128) THEN"
+     WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_REAL_16"" "
+     WRITE(*,*)"   ENDIF"
+     WRITE(*,*)"   RETURN"
+     WRITE(*,*)"   END SUBROUTINE"    
+  ENDDO
 END PROGRAM test_kind