Changeset 1581 for trunk/NEMO/OPA_SRC/DIA

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/OPA_SRC/DIA

Files:

• diadimg.F90 (modified) (3 diffs)
• diafwb.F90 (modified) (1 diff)
• diawri.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/DIA/diadimg.F90

@@ -42 +42 @@
     !!
     !! History :
-    !!   03-12 (J.M. Molines ) : Original. Replace ctlopn, writn2d
+    !!   03-12 (J.M. Molines ) : Original. Replace ctl_opn, writn2d
     !!---------------------------------------------------------------------------
     !! * Arguments
@@ -104 +104 @@
     IF ( ln_dimgnnn  ) THEN
        WRITE(clname,'(a,a,i3.3)') TRIM(cd_name),'.',narea
-       CALL ctlopn(inum, clname,'UNKNOWN','UNFORMATTED','DIRECT',irecl4,numout,lwp,1)
+       CALL ctl_opn( inum, clname, 'REPLACE', 'UNFORMATTED', 'DIRECT', irecl4, numout, lwp )
        WRITE(inum,REC=1 ) clver, cd_text, irecl4, &
             &     jpi,jpj, klev, 1 , 1 ,            &
@@ -131 +131 @@
        !! Standard dimgproc (1 file per variable, all procs. write to this file )
        !! * Open file
-       CALL ctlopn(inum, cd_name,'UNKNOWN','UNFORMATTED','DIRECT',irecl4,numout,lwp,1)
+       CALL ctl_opn( inum, cd_name, 'REPLACE', 'UNFORMATTED', 'DIRECT', irecl4, numout, lwp )
 
        !! * Write header on record #1

trunk/NEMO/OPA_SRC/DIA/diafwb.F90

@@ -357 +357 @@
       ! --------------------------
 
-      IF ( kt == nitend .AND. cp_cfg == "orca" ) THEN
-
-         CALL ctlopn( inum, 'STRAIT.dat', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',   &
-            &         1, numout, lwp, 1 )
+      IF ( kt == nitend .AND. cp_cfg == "orca" .AND. lwp ) THEN
+
+         CALL ctl_opn( inum, 'STRAIT.dat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
          WRITE(inum,*)
          WRITE(inum,*)    'Net freshwater budget '

trunk/NEMO/OPA_SRC/DIA/diawri.F90

@@ -150 +150 @@
       REAL(wp), DIMENSION(jpi,jpj) :: &
          zw2d                            ! temporary workspace
-      CHARACTER (len=80) :: clname
       !!----------------------------------------------------------------------
       !
@@ -209 +208 @@
 
          ! WRITE root name in date.file for use by postpro
-         IF( lwp) THEN
+         IF(lwp) THEN
             CALL dia_nam( clhstnam, nwrite,' ' )
-            clname = 'date.file'
-            CALL ctlopn( inum, clname,  'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', 1, numout, lwp, 1 )
+            CALL ctl_opn( inum, 'date.file', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
             WRITE(inum,*) clhstnam
             CLOSE(inum)