Fixes to DUMMYLIB for pgi 5.1

andreww · Nov 14, 2007 · 9bfa6eb · 9bfa6eb
1 parent ac89e47
commit 9bfa6eb
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 13 deletions.
diff --git a/common/m_common_array_str.F90 b/common/m_common_array_str.F90
@@ -1,5 +1,5 @@
 module m_common_array_str
-
+#ifndef DUMMYLIB
   use m_common_realtypes, only: dp
 
   implicit none
@@ -195,4 +195,5 @@ subroutine devnull(in)
     ! just so we can call string functions for their side-effects
   end subroutine devnull
 
+#endif
 end module m_common_array_str
diff --git a/m4/quantity.m4 b/m4/quantity.m4
@@ -85,7 +85,7 @@ module m_wcml_$1
 
   interface cmlAdd$1
 m4_foreach(`x', TOHWM4_types, `TOHWM4_interfacelist($1, x)')
-  end interface cmlAdd$1
+  end interface
 
   public :: cmlAdd$1
 

diff --git a/utils/fox_m_utils_mtprng.f90 → utils/fox_m_utils_mtprng.F90 b/utils/fox_m_utils_mtprng.f90 → utils/fox_m_utils_mtprng.F90
@@ -1,4 +1,5 @@
 module fox_m_utils_mtprng
+#ifndef DUMMYLIB
 !---------------------------------------------------------------------
 ! From the Algorithmic Conjurings of Scott Robert Ladd comes...
 !---------------------------------------------------------------------
@@ -355,4 +356,5 @@ function mtprng_rand_real3(state) result(r)
 
     end function mtprng_rand_real3
 
+#endif
 end module fox_m_utils_mtprng
diff --git a/utils/fox_m_utils_uuid.f90 → utils/fox_m_utils_uuid.F90 b/utils/fox_m_utils_uuid.f90 → utils/fox_m_utils_uuid.F90
@@ -4,10 +4,14 @@ module fox_m_utils_uuid
 
   ! Only types 1 (time-based) and 4 (pseudo-RNG-based) are implemented.
 
+#ifndef DUMMYLIB
   use fox_m_utils_mtprng, only : mtprng_state, mtprng_init, mtprng_rand64
+#endif
+
   implicit none
   private
 
+#ifndef DUMMYLIB
   integer, parameter :: i4b = selected_int_kind(9)
   integer, parameter :: i8b = selected_int_kind(18)
 
@@ -23,6 +27,8 @@ module fox_m_utils_uuid
 ! using this module. That's the best we can do per S 4.1.5
   integer, save :: clock_seq = 0
 
+#endif
+
   public :: generate_uuid
 
 contains
@@ -31,6 +37,7 @@ function generate_uuid(version) result(uuid)
     integer, intent(in), optional :: version
     character(len=36) :: uuid
 
+#ifndef DUMMYLIB
     integer(kind=i8b) :: timestamp, node
     integer(kind=i4b) :: clock_sequence
 
@@ -158,10 +165,11 @@ function int64ToHexOctets(b, n) result(s)
       enddo
 
     end function int64ToHexOctets
-
+
+#endif 
   end function generate_uuid
-
 
+#ifndef DUMMYLIB
   function get_utc_since_1582(values) result(ns)
     ! This subroutine is a little broken. It only works
     ! for times after 1/1/2006 and takes no account
@@ -225,5 +233,5 @@ end function isLeapYear
 
   end function get_utc_since_1582
 
-
+#endif
 end module fox_m_utils_uuid
diff --git a/wcml/m_wcml_parameter.F90 b/wcml/m_wcml_parameter.F90
@@ -56,7 +56,7 @@ module m_wcml_parameter
      module procedure parameterChMatSi
      module procedure parameterChMatSh
 
-  end interface cmlAddparameter
+  end interface
 
   public :: cmlAddparameter
 

diff --git a/wcml/m_wcml_property.F90 b/wcml/m_wcml_property.F90
@@ -56,7 +56,7 @@ module m_wcml_property
      module procedure propertyChMatSi
      module procedure propertyChMatSh
 
-  end interface cmlAddproperty
+  end interface
 
   public :: cmlAddproperty
 

diff --git a/wxml/m_wxml_overloads.F90 b/wxml/m_wxml_overloads.F90
@@ -38,7 +38,7 @@ module m_wxml_overloads
     module procedure CharactersMatrixInt
     module procedure CharactersMatrixLg
     module procedure CharactersMatrixCh
- end interface xml_AddCharacters
+ end interface
 
   interface xml_AddAttribute
     module procedure AttributeScalarCmplxDp
@@ -62,7 +62,7 @@ module m_wxml_overloads
     module procedure AttributeMatrixInt
     module procedure AttributeMatrixLg
     module procedure AttributeMatrixCh
- end interface xml_AddAttribute
+ end interface
 
   interface xml_AddPseudoAttribute
     module procedure PseudoAttributeScalarCmplxDp
@@ -86,7 +86,7 @@ module m_wxml_overloads
     module procedure PseudoAttributeMatrixInt
     module procedure PseudoAttributeMatrixLg
     module procedure PseudoAttributeMatrixCh
- end interface xml_AddPseudoAttribute
+ end interface
 
   public :: xml_AddCharacters
   public :: xml_AddAttribute

diff --git a/wxml/m_wxml_overloads.m4 b/wxml/m_wxml_overloads.m4
@@ -142,23 +142,23 @@ m4_foreach(`x', TOHWM4_types, `dnl
     TOHWM4_subroutinename(`Characters', type, x)
 ')dnl
 ')dnl
- end interface xml_AddCharacters
+ end interface
 
   interface xml_AddAttribute
 m4_foreach(`type', `(Scalar, Array, Matrix)', `dnl
 m4_foreach(`x', TOHWM4_types, `dnl
     TOHWM4_subroutinename(`Attribute', type, x)
 ')dnl
 ')dnl
- end interface xml_AddAttribute
+ end interface
 
   interface xml_AddPseudoAttribute
 m4_foreach(`type', `(Scalar, Array, Matrix)', `dnl
 m4_foreach(`x', TOHWM4_types, `dnl
     TOHWM4_subroutinename(`PseudoAttribute', type, x)
 ')dnl
 ')dnl
- end interface xml_AddPseudoAttribute
+ end interface
 
   public :: xml_AddCharacters
   public :: xml_AddAttribute