check Fortran data type integer*8

Author: wkliao

CMakeExtras/MatchNetCDFFortranTypes.cmake

@@ -5,6 +5,7 @@
 # check sizes of C types
 check_type_size(int SIZEOF_INT)
 check_type_size(long SIZEOF_LONG)
+check_type_size("long long" SIZEOF_LONG_LONG)
 check_type_size(float SIZEOF_FLOAT)
 check_type_size(double SIZEOF_DOUBLE)
 check_type_size("signed char" SIZEOF_SIGNED_CHAR)  
@@ -16,6 +17,7 @@ SET(NCBYTE_T "byte") # 1 byte
 SET(NCSHORT_T "integer*2") # 2 bytes
 SET(NF_INT1_T "integer*1") # 1 byte
 SET(NF_INT2_T "integer*2") # 2 bytes
+SET(NF_INT8_T "integer*8") # 8 bytes
 
 # Checks the provided C types to see which ones have the number of bytes passed
 # Roughly equivalent to the Automake function UD_CHECK_CTYPE_FORTRAN
@@ -59,6 +61,7 @@ message("Matching Fortran types to C types")
 find_c_type_with_size(1 INT1 "signed char" short int long)
 find_c_type_with_size(2 INT2 short int long)
 find_c_type_with_size(4 INT int long)
+find_c_type_with_size(8 INT8 int "long long")
 find_c_type_with_size(4 REAL float double)
 find_c_type_with_size(8 DOUBLEPRECISION float double)
 

CMakeLists.txt

@@ -475,6 +475,7 @@ ADD_DEFINITIONS(-DNF_INT2_IS_C_SHORT)
 #ADD_DEFINITIONS(-DNF_INT2_IS_C_LONG)
 ADD_DEFINITIONS(-DNF_INT_IS_C_INT)
 #ADD_DEFINITIONS(-DNF_INT_IS_C_LONG)
+ADD_DEFINITIONS(-DNF_INT8_IS_C_LONG_LONG)
 ADD_DEFINITIONS(-DNF_REAL_IS_C_FLOAT)
 #ADD_DEFINITIONS(-DNF_REAL_IS_C_DOUBLE)
 ADD_DEFINITIONS(-DNF_DOUBLEPRECISION_IS_C_DOUBLE)
@@ -683,10 +684,12 @@ ELSE()
   SET(NCSHORT_T "integer*2")
   SET(NF_INT1_T "byte")
   SET(NF_INT2_T "integer*2")
+  SET(NF_INT8_T "integer*8")
   # Default is for following to be true.  TODO: test instead
   SET(NF_INT1_IS_C_SIGNED_CHAR "1")
   SET(NF_INT2_IS_C_SHORT "1")
   SET(NF_INT_IS_C_INT "1")
+  SET(NF_INT8_IS_C_LONG_LONG "1")
   SET(NF_REAL_IS_C_FLOAT "1")
   SET(NF_DOUBLEPRECISION_IS_C_DOUBLE "1")
 ENDIF(ENABLE_FORTRAN_TYPE_CHECKS)

acinclude.m4

@@ -235,6 +235,7 @@ dnl	UD_CHECK_FORTRAN_TYPE(NF_INT1_T, byte integer*1 "integer(kind(1))")
 dnl	UD_CHECK_FORTRAN_TYPE(NF_INT2_T, integer*2 "integer(kind(2))")
 	UD_CHECK_FORTRAN_TYPE(NF_INT1_T, byte integer*1 "integer(kind=1)" "integer(selected_int_kind(2))")
 	UD_CHECK_FORTRAN_TYPE(NF_INT2_T, integer*2 "integer(kind=2)" "integer(selected_int_kind(4))")
+	UD_CHECK_FORTRAN_TYPE(NF_INT8_T, integer*8 "integer(kind=8)" "integer(selected_int_kind(18))")
 
 	case "${NF_INT1_T}" in
 	    '') ;;
@@ -251,6 +252,13 @@ dnl	UD_CHECK_FORTRAN_TYPE(NF_INT2_T, integer*2 "integer(kind(2))")
 		UD_CHECK_CTYPE_FORTRAN($NF_INT2_T, long, INT2)
 		;;
 	esac
+	case "${NF_INT8_T}" in
+	    '') ;;
+	    *)  UD_CHECK_CTYPE_FORTRAN($NF_INT8_T, "short", INT8)
+		UD_CHECK_CTYPE_FORTRAN($NF_INT8_T, "int", INT8)
+		UD_CHECK_CTYPE_FORTRAN($NF_INT8_T, "long long", INT8)
+		;;
+	esac
 	UD_CHECK_CTYPE_FORTRAN(integer, int long, INT)
 	UD_CHECK_CTYPE_FORTRAN(real, float double, REAL)
 	UD_CHECK_CTYPE_FORTRAN(doubleprecision, double float, DOUBLEPRECISION)

configure.ac

@@ -341,6 +341,7 @@ else
    AC_DEFINE(NCSHORT_T, integer*2)
    AC_DEFINE(NF_INT1_T, byte)
    AC_DEFINE(NF_INT2_T, integer*2)
+   AC_DEFINE(NF_INT8_T, integer*8)
    AC_DEFINE(NF_INT1_IS_C_SIGNED_CHAR, 1, [default])
    AC_DEFINE(NF_INT2_IS_C_SHORT, 1, [default])
    AC_DEFINE(NF_INT_IS_C_INT, 1, [default])

fortran/module_netcdf_nc_data.F90

@@ -149,6 +149,19 @@ Module netcdf_nc_data
  Integer, Parameter :: NFINT = IK4
 #endif
 
+! INT8 KINDs
+
+#ifdef NF_INT8_IS_C_SHORT
+ Integer, Parameter :: CINT8 = C_SHORT
+ Integer, Parameter :: NFINT8 = IK2
+#elif NF_INT8_IS_C_INT
+ Integer, Parameter :: CINT8 = C_INT
+ Integer, Parameter :: NFINT8 = IK4
+#else
+ Integer, Parameter :: CINT8 = C_LONG_LONG
+ Integer, Parameter :: NFINT8 = IK8
+#endif
+
 ! Set Fortran default real kind. This should
 ! take care of the case were the default real
 ! type is a 64 bit real (ala prehistoric CRAYs)