--- MITgcm/pkg/diagnostics/diagnostics_readparms.F	2004/12/14 03:48:23	1.2
+++ MITgcm/pkg/diagnostics/diagnostics_readparms.F	2005/03/17 01:22:43	1.6
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/diagnostics/diagnostics_readparms.F,v 1.2 2004/12/14 03:48:23 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/diagnostics/diagnostics_readparms.F,v 1.6 2005/03/17 01:22:43 jmc Exp $
 C $Name:  $
 
 #include "DIAG_OPTIONS.h"
@@ -12,7 +12,7 @@
 
 C     !DESCRIPTION:
 C     Read Diagnostics Namelists to specify output sequence.
-      
+
 C     !USES:
       IMPLICIT NONE
 #include "SIZE.h"
@@ -40,25 +40,33 @@
       INTEGER     frequency(ldimLoc)
       _RL         levels(kdimLoc,ldimLoc)
       CHARACTER*8 fields(fdimLoc,ldimLoc)
-      CHARACTER*8 filename(ldimLoc)
+      CHARACTER*80 filename(ldimLoc), blkFilName
       CHARACTER*8 blk8c
       CHARACTER*(MAX_LEN_MBUF) msgBuf
       INTEGER ku, stdUnit
-      INTEGER k,l,n,m
+      INTEGER k,l,n,m,iL
       _RL undef, getcon
+      INTEGER  ILNBLNK
+      EXTERNAL ILNBLNK
 
       NAMELIST / diagnostics_list /
      &     frequency, levels, fields, filename,
-     &     diag_mnc
+     &     diag_mnc,
+     &     diag_pickup_read,     diag_pickup_write,
+     &     diag_pickup_read_mnc, diag_pickup_write_mnc
 
 C     Initialize and Read Diagnostics Namelist
       _BEGIN_MASTER(myThid)
 
       undef = getcon('UNDEF')
       blk8c  = '        '
+      DO k=1,LEN(blkFilName)
+        blkFilName(k:k) = ' '
+      ENDDO
 
       DO l = 1,ldimLoc
         frequency(l) = 0
+        filename (l) = blkFilName
         DO k = 1,kdimLoc
           levels (k,l) = undef
         ENDDO
@@ -66,13 +74,17 @@
           fields (m,l) = blk8c
         ENDDO
       ENDDO
-      diag_mnc   = .FALSE.
+      diag_mnc = useMNC
+      diag_pickup_read      = .FALSE.
+      diag_pickup_write     = .FALSE.
+      diag_pickup_read_mnc  = .FALSE.
+      diag_pickup_write_mnc = .FALSE.
 
       WRITE(msgBuf,'(A)')
      &     ' DIAGNOSTICS_READPARMS: opening data.diagnostics'
       CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,SQUEEZE_RIGHT,1)
-      
-      CALL OPEN_COPY_DATA_FILE('data.diagnostics', 
+
+      CALL OPEN_COPY_DATA_FILE('data.diagnostics',
      &     'DIAGNOSTICS_READPARMS', ku, myThid )
       READ  (ku,NML=diagnostics_list)
       CLOSE (ku)
@@ -83,24 +95,34 @@
         freq(n) = 0
         nlevels(n) = 0
         nfields(n) = 0
-        fnames(n) = blk8c
+        fnames(n) = blkFilName
         DO k = 1,numLevels
           levs(k,n) = 0
         ENDDO
         DO m = 1,numperlist
-          flds(m,n) = '        '
+          flds(m,n) = blk8c
           jdiag(m,n) = 0
         ENDDO
       ENDDO
-      diag_mdsio = .TRUE.
 
 C     Fill Diagnostics Common Block with Namelist Info
-      IF ( useMNC .AND. diag_mnc 
-     &            .AND. (.NOT. outputTypesInclusive)) THEN
-        diag_mdsio = .FALSE.
-      ENDIF
-      
+      diag_mnc = diag_mnc .AND. useMNC
+      diag_mdsio = (.NOT. diag_mnc) .OR. outputTypesInclusive
+      diag_pickup_read_mnc  = diag_pickup_read_mnc .AND. diag_mnc
+      diag_pickup_write_mnc = diag_pickup_write_mnc .AND. diag_mnc
+      diag_pickup_read_mdsio  = 
+     &     diag_pickup_read .AND. (.NOT. diag_pickup_read_mnc)
+      diag_pickup_write_mdsio = diag_pickup_write .AND.
+     &     ((.NOT. diag_pickup_write_mnc) .OR. outputTypesInclusive)
+
       DO l = 1,ldimLoc
+       iL = ILNBLNK(filename(l))
+       IF ( frequency(l).NE.0 .AND. iL.EQ.0 ) THEN
+         WRITE(msgBuf,'(2A,I3,A,I6)') 'DIAGNOSTICS_READPARMS: ',
+     &    'Empty File-name ! (list l=', l, ' ), freq:',frequency(l)
+         CALL PRINT_ERROR( msgBuf , myThid )
+         STOP 'ABNORMAL END: S/R DIAGNOSTICS_READPARMS'
+       ENDIF
        IF ( frequency(l).NE.0 .AND. nlists.LT.numlists ) THEN
          n = nlists + 1
          freq(n)    = frequency(l)
@@ -108,7 +130,7 @@
          nlevels(n) = 0
          IF ( levels(1,l).NE.undef ) THEN
            DO k=1,kdimLoc
-             IF ( levels(k,l).NE.undef .AND. 
+             IF ( levels(k,l).NE.undef .AND.
      &            nlevels(n).LT.numLevels ) THEN
                nlevels(n) = nlevels(n) + 1
                levs(nlevels(n),n) = levels(k,l)
@@ -117,7 +139,7 @@
      &         'Exceed Max.Num. of Levels numLevels=', numLevels
               CALL PRINT_ERROR( msgBuf , myThid )
               WRITE(msgBuf,'(2A,I3,A,F3.0)') 'DIAGNOSTICS_READPARMS: ',
-     &         'when trying to add level(k=', k, ' )=', levels(k,l) 
+     &         'when trying to add level(k=', k, ' )=', levels(k,l)
               CALL PRINT_ERROR( msgBuf , myThid )
               WRITE(msgBuf,'(2A,I3,2A)') 'DIAGNOSTICS_READPARMS: ',
      &         ' for list l=', l, ', filename: ', filename(l)
@@ -126,14 +148,12 @@
              ENDIF
            ENDDO
          ELSE
-           nlevels(n) = Nr
-           DO k=1,nlevels(n)
-             levs(k,n) = k
-           ENDDO
+C-       will set levels later, once the Nb of levels of each diag is known
+           nlevels(n) = -1
          ENDIF
          nfields(n) = 0
          DO m=1,fdimLoc
-           IF ( fields(m,l).NE.blk8c .AND. 
+           IF ( fields(m,l).NE.blk8c .AND.
      &          nfields(n).LT.numperlist ) THEN
              nfields(n) = nfields(n) + 1
              flds(nfields(n),n) = fields(m,l)
@@ -183,11 +203,16 @@
         CALL PRINT_MESSAGE( msgBuf, stdUnit,SQUEEZE_RIGHT, myThid)
         WRITE(msgBuf,*) 'Frequency: ',freq(n)
         CALL PRINT_MESSAGE( msgBuf, stdUnit,SQUEEZE_RIGHT, myThid)
-	DO l=1,nlevels(n),20
+        IF ( nlevels(n).EQ.-1 ) THEN
+          WRITE(msgBuf,'(A,A)') ' Levels:    ','will be set later'
+          CALL PRINT_MESSAGE( msgBuf, stdUnit,SQUEEZE_RIGHT, myThid)
+        ELSE
+         DO l=1,nlevels(n),20
           m = MIN(nlevels(n),l+19)
           WRITE(msgBuf,'(A,20F5.0)') ' Levels:    ', (levs(k,n),k=l,m)
           CALL PRINT_MESSAGE( msgBuf, stdUnit,SQUEEZE_RIGHT, myThid)
-	ENDDO
+         ENDDO
+        ENDIF
         WRITE(msgBuf,*) 'Fields:   ',(' ',flds(l,n),l=1,nfields(n))
         CALL PRINT_MESSAGE( msgBuf, stdUnit,SQUEEZE_RIGHT, myThid)
       ENDDO