Changeset 576 for XIOS/trunk/src/interface/fortran/date_interface.F90

Timestamp:

03/13/15 17:49:10 (9 years ago)

Author:

rlacroix

Message:

Fix compilation with PGI for the development version of XIOS 2.0

• Convert parse_xml.cpp to Fortran (port r573 to the trunk).
• Modify date_interface to work-around a problem related to xios_duration type.
• Reorganize the XIOS module to work-around a problem related to operator overloads for xios_duration and xios_date types.

File:

• XIOS/trunk/src/interface/fortran/date_interface.F90 (modified) (4 diffs)

XIOS/trunk/src/interface/fortran/date_interface.F90

@@ -3 +3 @@
 MODULE DATE_INTERFACE
    USE, INTRINSIC :: ISO_C_BINDING
+   USE IDURATION, only : txios(duration)
 
    TYPE, BIND(C) :: txios(date)
       INTEGER(kind = C_INT) :: year, month, day, hour, minute, second
    END TYPE txios(date)
+
+   PRIVATE :: txios(duration)
 
    INTERFACE ! Ne pas appeler directement/Interface FORTRAN 2003 <-> C99
@@ -18 +21 @@
       TYPE(txios(date)) FUNCTION cxios_date_add_duration(date, dur) BIND(C)
          USE ISO_C_BINDING
-         USE IDURATION, only : txios(duration)
          IMPORT :: txios(date)
+         IMPORT :: txios(duration)
          TYPE(txios(date)), VALUE :: date
          TYPE(txios(duration)), VALUE :: dur
@@ -26 +29 @@
       TYPE(txios(date)) FUNCTION cxios_date_sub_duration(date, dur) BIND(C)
          USE ISO_C_BINDING
-         USE IDURATION, only : txios(duration)
          IMPORT :: txios(date)
+         IMPORT :: txios(duration)
          TYPE(txios(date)), VALUE :: date
          TYPE(txios(duration)), VALUE :: dur
@@ -34 +37 @@
       TYPE(txios(duration)) FUNCTION cxios_date_sub(date1, date2) BIND(C)
          USE ISO_C_BINDING
-         USE IDURATION, only : txios(duration)
          IMPORT :: txios(date)
+         IMPORT :: txios(duration)
          TYPE(txios(date)), VALUE :: date1, date2
       END FUNCTION cxios_date_sub