Changeset 1581 for trunk/NEMO/TOP_SRC/CFC

Timestamp:

2009-08-05T16:53:12+02:00 (15 years ago)

Author:

smasson

Message:

ctlopn cleanup, see ticket:515 and ticket:237

Location:

trunk/NEMO/TOP_SRC/CFC

Files:

• trcini_cfc.F90 (modified) (3 diffs)
• trclsm_cfc.F90 (modified) (3 diffs)

trunk/NEMO/TOP_SRC/CFC/trcini_cfc.F90

@@ -16 +16 @@
    USE trc             ! TOP variables
    USE trcsms_cfc          ! CFC sms trends
+   USE in_out_manager  ! I/O manager
 
    IMPLICIT NONE
@@ -21 +22 @@
 
    PUBLIC   trc_ini_cfc   ! called by trcini.F90 module
-
-   CHARACTER (len=34) ::   clname = 'cfc1112.atm'   ! ???
 
    INTEGER  ::   inum                   ! unit number
@@ -89 +88 @@
       IF(lwp) WRITE(numout,*) 'read of formatted file cfc1112atm'
       
-      CALL ctlopn( inum, clname, 'OLD', 'FORMATTED', 'SEQUENTIAL',   &
-         &           1, numout, .FALSE., 1 )
+      CALL ctl_opn( inum, 'cfc1112.atm', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. )
       REWIND(inum)
       

trunk/NEMO/TOP_SRC/CFC/trclsm_cfc.F90

@@ -16 +16 @@
    USE trc             ! TOP variables
    USE trcsms_cfc      ! CFC specific variable
+   USE in_out_manager  ! I/O manager
 
    IMPLICIT NONE
@@ -41 +42 @@
       !! ** input   :   Namelist namcfc
       !!----------------------------------------------------------------------
-      CHARACTER (len=32) ::   clname = 'namelist_cfc'
       INTEGER ::   numnatc
 #if defined key_trc_diaadd
@@ -65 +65 @@
 
       !                             ! Open namelist file
-      CALL ctlopn( numnatc, clname, 'OLD', 'FORMATTED', 'SEQUENTIAL',  1, numout, .FALSE., 1 )
+      CALL ctl_opn( numnatc, 'namelist_cfc', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. )
          
       READ( numnatc , namcfcdate )     ! read namelist