Changeset 1581 for trunk/NEMO/OPA_SRC/opa.F90

Timestamp:

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

Author:

smasson

Message:

ctlopn cleanup, see ticket:515 and ticket:237

File:

• trunk/NEMO/OPA_SRC/opa.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/opa.F90

@@ -179 +179 @@
       INTEGER :: localComm
 #endif
-      CHARACTER(len=20)               ::   namelistname
-      CHARACTER(len=28)               ::   file_out
-      CHARACTER(len=80),dimension(10) ::   cltxt
+      CHARACTER(len=80),dimension(10) ::   cltxt = ''
       INTEGER                         :: ji             ! local loop indicees
       NAMELIST/namctl/ ln_ctl, nprint, nictls, nictle,   &
@@ -187 +185 @@
       !!----------------------------------------------------------------------
 
-      ! Initializations
-      ! ===============
-      cltxt(:) = ''
-      file_out = 'ocean.output'
-      namelistname = 'namelist'
-      
       ! Namelist namctl : Control prints & Benchmark
-      CALL ctlopn( numnam, namelistname, 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE., 1 )
-      REWIND( numnam )   ! is this really needed? we just open the file...
+      CALL ctl_opn( numnam, 'namelist', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. )
       READ  ( numnam, namctl )
 
@@ -227 +218 @@
       IF( lwp ) THEN
          ! open listing and namelist units
-         IF( narea > 1 )   WRITE(file_out, "(a,'_',i4.4)") TRIM(file_out), narea-1
-         CALL ctlopn( numout, file_out, 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE., 1 )
+         CALL ctl_opn( numout, 'ocean.output', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE., narea )
          
          WRITE(numout,*)