Changeset 940

Timestamp:

03/08/10 14:14:01 (15 years ago)

Author:

bellier

Message:

Change the name of the optional argument mode -> cmode in fliocrfd
to avoid conflicts with the old version

File:

• IOIPSL/trunk/src/fliocom.f90 (modified) (7 diffs)

IOIPSL/trunk/src/fliocom.f90

@@ -62 +62 @@
 !! which contains the dimensions needed.
 !!
-!! SUBROUTINE fliocrfd (f_n,f_d_n,f_d_l,f_i,id_dom,mode,c_f_n)
+!! SUBROUTINE fliocrfd (f_n,f_d_n,f_d_l,f_i,id_dom,cmode,c_f_n)
 !!
 !! INPUT
@@ -86 +86 @@
 !!              This argument can be equal to FLIO_DOM_DEFAULT
 !!              (see "flio_dom_defset").
-!! (C) mode   : String of (case insensitive) blank-separated words
+!! (C) cmode  : String of (case insensitive) blank-separated words
 !!              defining the mode used to create the file.
 !!              Supported keywords : REPLACE, 32, 64
@@ -837 +837 @@
 !-
 !===
-SUBROUTINE fliocrfd (f_n,f_d_n,f_d_l,f_i,id_dom,mode,c_f_n)
+SUBROUTINE fliocrfd (f_n,f_d_n,f_d_l,f_i,id_dom,cmode,c_f_n)
 !---------------------------------------------------------------------
   IMPLICIT NONE
@@ -846 +846 @@
   INTEGER,INTENT(OUT) :: f_i
   INTEGER,OPTIONAL,INTENT(IN) :: id_dom
-  CHARACTER(LEN=*),OPTIONAL,INTENT(IN) :: mode
+  CHARACTER(LEN=*),OPTIONAL,INTENT(IN) :: cmode
   CHARACTER(LEN=*),OPTIONAL,INTENT(OUT) :: c_f_n
 !-
@@ -897 +897 @@
   i_opt(:)=-1
 !-
-  IF (PRESENT(mode)) THEN
+  IF (PRESENT(cmode)) THEN
 !---
-    IF (LEN_TRIM(mode) > l_string) THEN
+    IF (LEN_TRIM(cmode) > l_string) THEN
       CALL ipslerr (3,'fliocrfd', &
- &     '"mode" argument','too long','to be treated')
-    ENDIF
-    c_string = mode(:)
+ &     '"cmode" argument','too long','to be treated')
+    ENDIF
+    c_string = cmode(:)
     CALL strlowercase (c_string)
 !---
@@ -963 +963 @@
 !-
 !- Code to be replaced by the following for NETCDF4
-  IF (i_opt(3) /= k_32) THEN
-    m_c = IOR(m_c,NF90_64BIT_OFFSET)
-  ENDIF
 !?  IF (i_opt(2) == k_netcdf4) THEN
 !?    m_c = IOR(m_c,NF90_NETCDF4)
@@ -976 +973 @@
 !?   LSE IF (i_opt(4) > 0) THEN
 !?    CALL ipslerr (3,'fliocrfd', &
-!? &   'Netcdf default format','and classic option','are not compatible')
-!?  ELSE IF (i_opt(3) /= k_32) THEN
-!?    m_c = IOR(m_c,NF90_64BIT_OFFSET)
+!? &   'Classic option','is reserved','for the Netcdf4 format')
+!?  ELSE
+    IF (i_opt(3) /= k_32) THEN
+      m_c = IOR(m_c,NF90_64BIT_OFFSET)
+    ENDIF
 !?  ENDIF
 !-