Changeset 300 for XMLIO_V2/dev/common/src/fortran/ifile.F90

Timestamp:

02/13/12 19:35:25 (12 years ago)

Author:

ymipsl

Message:

nouvelle version de developpement de xios

• nouvelle interface fortran
• recodage complet de la couche de communication
• et bien d'autres choses...

YM

File:

• XMLIO_V2/dev/common/src/fortran/ifile.F90 (modified) (9 diffs)

XMLIO_V2/dev/common/src/fortran/ifile.F90

@@ -35 +35 @@
 
 
-   SUBROUTINE xios(set_file_attr)(file_id, name , description, name_suffix, output_freq, output_level, enabled)
+   SUBROUTINE xios(set_file_attr)(file_id, name , description, name_suffix, output_freq, output_level, enabled, type)
       IMPLICIT NONE
       TYPE(txios(file))                       :: file_hdl
@@ -45 +45 @@
       INTEGER           , OPTIONAL, INTENT(IN) :: output_level
       LOGICAL           , OPTIONAL, INTENT(IN) :: enabled
-      
+      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: type
+            
       CALL xios(get_file_handle)(file_id,file_hdl)
-      CALL xios(set_file_attr_hdl_)(file_hdl, name , description, name_suffix, output_freq, output_level, enabled)
+      CALL xios(set_file_attr_hdl_)(file_hdl, name , description, name_suffix, output_freq, output_level, enabled, type)
       
    END SUBROUTINE xios(set_file_attr)
    
 
-   SUBROUTINE xios(set_file_attr_hdl)(file_hdl, name , description, name_suffix, output_freq, output_level, enabled)
+   SUBROUTINE xios(set_file_attr_hdl)(file_hdl, name , description, name_suffix, output_freq, output_level, enabled,type)
       TYPE(txios(file))          , INTENT(IN) :: file_hdl
       CHARACTER(len = *), OPTIONAL, INTENT(IN) :: name
@@ -60 +61 @@
       INTEGER           , OPTIONAL, INTENT(IN) :: output_level
       LOGICAL           , OPTIONAL, INTENT(IN) :: enabled
-
-      CALL xios(set_file_attr_hdl_)(file_hdl, name , description, name_suffix, output_freq, output_level, enabled)
+      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: type
+
+      CALL xios(set_file_attr_hdl_)(file_hdl, name , description, name_suffix, output_freq, output_level, enabled, type)
       
    END SUBROUTINE xios(set_file_attr_hdl)
 
-   SUBROUTINE xios(set_file_attr_hdl_)(file_hdl, name_ , description_, name_suffix_, output_freq_, output_level_, enabled_)
+   SUBROUTINE xios(set_file_attr_hdl_)(file_hdl, name_ , description_, name_suffix_, output_freq_, output_level_, enabled_, type_)
       TYPE(txios(file))          , INTENT(IN) :: file_hdl
       CHARACTER(len = *), OPTIONAL, INTENT(IN) :: name_
@@ -74 +76 @@
       LOGICAL(kind = 1)                        :: enabled__
       LOGICAL           , OPTIONAL, INTENT(IN) :: enabled_
-      
+      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: type_
+            
       IF (PRESENT(name_))         THEN
          CALL cxios_set_file_name(file_hdl%daddr, name_, len(name_))
@@ -94 +97 @@
          CALL cxios_set_file_enabled(file_hdl%daddr, enabled__)
       END IF
-
+      
+      IF (PRESENT(type_))         THEN
+         CALL cxios_set_file_type(file_hdl%daddr, type_, len(type_))
+      END IF
+      
    END SUBROUTINE xios(set_file_attr_hdl_)
 
 
    
-   SUBROUTINE xios(set_filegroup_attr)(filegroup_id, name , description, name_suffix, output_freq, output_level, enabled)
+   SUBROUTINE xios(set_filegroup_attr)(filegroup_id, name , description, name_suffix, output_freq, output_level, enabled, type)
       IMPLICIT NONE
       TYPE(txios(filegroup))                  :: filegroup_hdl
@@ -109 +116 @@
       INTEGER           , OPTIONAL, INTENT(IN) :: output_level
       LOGICAL           , OPTIONAL, INTENT(IN) :: enabled
+      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: type
       
       CALL xios(get_filegroup_handle)(filegroup_id,filegroup_hdl)
-      CALL xios(set_filegroup_attr_hdl_)(filegroup_hdl, name , description, name_suffix, output_freq, output_level, enabled)
+      CALL xios(set_filegroup_attr_hdl_)(filegroup_hdl, name , description, name_suffix, output_freq, output_level, enabled, type)
       
    END SUBROUTINE xios(set_filegroup_attr)
 
 
-   SUBROUTINE xios(set_filegroup_attr_hdl)(filegroup_hdl, name , description, name_suffix, output_freq, output_level, enabled)
+   SUBROUTINE xios(set_filegroup_attr_hdl)(filegroup_hdl, name , description, name_suffix, output_freq, output_level, enabled, type)
       IMPLICIT NONE
       TYPE(txios(filegroup))     , INTENT(IN) :: filegroup_hdl
@@ -125 +133 @@
       INTEGER           , OPTIONAL, INTENT(IN) :: output_level
       LOGICAL           , OPTIONAL, INTENT(IN) :: enabled
-      
-     CALL xios(set_filegroup_attr_hdl_)(filegroup_hdl, name , description, name_suffix, output_freq, output_level, enabled)
+      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: type
+      
+     CALL xios(set_filegroup_attr_hdl_)(filegroup_hdl, name , description, name_suffix, output_freq, output_level, enabled, type)
 
    END SUBROUTINE xios(set_filegroup_attr_hdl)
       
    
-   SUBROUTINE xios(set_filegroup_attr_hdl_)(filegroup_hdl, name_ , description_, name_suffix_, output_freq_, output_level_, enabled_)
+   SUBROUTINE xios(set_filegroup_attr_hdl_)(filegroup_hdl, name_ , description_, name_suffix_, output_freq_, output_level_,     &
+                   enabled_,type_)
       IMPLICIT NONE
       TYPE(txios(filegroup))     , INTENT(IN) :: filegroup_hdl
@@ -141 +151 @@
       LOGICAL(kind = 1)                        :: enabled__
       LOGICAL           , OPTIONAL, INTENT(IN) :: enabled_
+      CHARACTER(len = *), OPTIONAL, INTENT(IN) :: type_
       
       IF (PRESENT(name_))         THEN
@@ -160 +171 @@
         enabled__ = enabled_ 
         CALL cxios_set_filegroup_enabled(filegroup_hdl%daddr, enabled__)
+      END IF
+      
+      IF (PRESENT(type_))         THEN
+         CALL cxios_set_filegroup_type(filegroup_hdl%daddr, type_, len(type_))
       END IF