/[MITgcm]/MITgcm/pkg/diagnostics/diagnostics_readparms.F

Diff of /MITgcm/pkg/diagnostics/diagnostics_readparms.F

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.12 by molod,
Tue Jun 14 23:06:15 2005 UTC
+revision 1.13 by jmc,
Sun Jun 26 16:51:49 2005 UTC
 Line 35 
 C     levels    :: List Output Levels
  C     fields    :: List Output Fields
  C     filename  :: List Output Filename
  C--   per level statistics output:
  C     stat_freq   :: Frequency (in s) of statistics output
  C     stat_phase  :: phase (in s) to write statistics output
  C     stat_region :: List of statistics output Regions
  C     stat_fields :: List of statistics output Fields
 Line 58 
 C     stat_fname  :: List of statistics
        INTEGER stat_region(rdimLoc,ldimLoc)
        INTEGER ku, stdUnit
        INTEGER j,k,l,n,m
-       INTEGER regionCount
+       INTEGER iLen, regionCount
        _RL undef, getcon
        INTEGER  ILNBLNK
        EXTERNAL ILNBLNK
 Line 72 
 C--   full level output:
  C--   per level statistics output:
        NAMELIST / DIAG_STATIS_PARMS /
       &     stat_freq, stat_phase, stat_region, stat_fields,
       &     stat_fname,
       &     diagSt_mnc
  C     Initialize and Read Diagnostics Namelist
        _BEGIN_MASTER(myThid)
 Line 142 
 C-    set default for statistics output
       &     ' read namelist "DIAG_STATIS_PARMS": start'
        CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,
       &                    SQUEEZE_RIGHT , 1)
- c     STOP 'before reading namelist: DIAG_STATIS_PARMS'
        READ  (ku,NML=DIAG_STATIS_PARMS)
        WRITE(msgBuf,'(2A)') 'S/R DIAGNOSTICS_READPARMS,',
       &     ' read namelist "DIAG_STATIS_PARMS": OK'
-Line 151 
 c     STOP 'before reading namelist: DIA
+Line 150 
 c     STOP 'before reading namelist: DIA
        CLOSE (ku)
- C     Initialise diag_choices common block
+ C     Initialise diag_choices common block (except pointers)
        nlists = 0
        DO n = 1,numlists
          freq(n) = 0.
-Line 164 
 C     Initialise diag_choices common blo
+Line 163 
 C     Initialise diag_choices common blo
          ENDDO
          DO m = 1,numperlist
            flds(m,n) = blk8c
-           jdiag(m,n) = 0
          ENDDO
        ENDDO
-Line 188 
 C     Fill Diagnostics Common Block with
+Line 186 
 C     Fill Diagnostics Common Block with
        diagSt_ascii = (.NOT. diagSt_mnc) .OR. outputTypesInclusive
        DO l = 1,ldimLoc
-        IF ( filename(L).NE.blkFilName .and. nlists.LT.numlists ) THEN
+        iLen = ILNBLNK(filename(l))
+ C-     Only lists with non-empty file name (iLen>0) are considered
+        IF ( iLen.GE.1 .AND. nlists.LT.numlists ) THEN
           n = nlists + 1
           freq(n)    = frequency(l)
           IF ( timePhase(l).NE. UNSET_RL ) THEN
 Line 243 
 C-       will set levels later, once the
           ENDDO
           nlists = nlists + 1
  c        write(6,*) 'list summary:',n,nfields(n),nlevels(n)
-        ELSEIF (filename(L).NE.blkFilName) THEN
+        ELSEIF ( iLen.GE.1 ) THEN
           WRITE(msgBuf,'(2A,I3)') 'DIAGNOSTICS_READPARMS: ',
       &            'Exceed Max.Num. of list numlists=', numlists
           CALL PRINT_ERROR( msgBuf , myThid )
 Line 259 
 c        write(6,*) 'list summary:',n,nf
  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
- C     Initialise DIAG_STATIS common block
+ C     Initialise DIAG_STATIS common block (except pointers)
        diagSt_nbLists = 0
        DO n = 1,numlists
          diagSt_freq(n) = 0.
 Line 272 
 C     Initialise DIAG_STATIS common bloc
          ENDDO
          DO m = 1,numperlist
            diagSt_Flds(m,n) = blk8c
-           jSdiag(m,n) = 0
          ENDDO
        ENDDO
-Line 280 
 C     Fill Diagnostics Common Block with
+Line 279 
 C     Fill Diagnostics Common Block with
        diagSt_ascii = (.NOT. diagSt_mnc) .OR. outputTypesInclusive
        DO l = 1,ldimLoc
-        IF(stat_fname(L).NE.blkFilName.AND.
+        iLen = ILNBLNK(stat_fname(l))
-      .                            diagSt_nbLists.LT.numlists)THEN
+ C-     Only lists with non-empty file name (iLen>0) are considered
+        IF ( iLen.GE.1 .AND. diagSt_nbLists.LT.numlists)THEN
           n = diagSt_nbLists + 1
           diagSt_freq(n) = stat_freq(l)
           IF ( stat_phase(l).NE. UNSET_RL ) THEN
 Line 323 
 C-       no region selected => default i
       &        'Exceed Max.Num. of Fields/list numperlist=', numperlist
               CALL PRINT_ERROR( msgBuf , myThid )
               WRITE(msgBuf,'(2A,I3,3A,I3,2A)') 'DIAGNOSTICS_READPARMS: ',
       &        'when trying to add stat_field (m=', m,
       &        ' ): ',stat_fields(m,l)
               CALL PRINT_ERROR( msgBuf , myThid )
               WRITE(msgBuf,'(2A,I3,2A)') 'DIAGNOSTICS_READPARMS: ',
 Line 334 
 C-       no region selected => default i
           ENDDO
           diagSt_nbLists = diagSt_nbLists + 1
  c        write(6,*) 'stat-list summary:',n,diagSt_nbFlds(n),regionCount
-        ELSEIF ( stat_fname(L).NE.blkFilName ) THEN
+        ELSEIF ( iLen.GE.1 ) THEN
           WRITE(msgBuf,'(2A,I3)') 'DIAGNOSTICS_READPARMS: ',
       &            'Exceed Max.Num. of list numlists=', numlists
           CALL PRINT_ERROR( msgBuf , myThid )
 Line 392 
 C     Echo History List Data Structure
          WRITE(msgBuf,'(2(A,F17.6))') 'Frequency : ',diagSt_freq(n),
       &                               ' ; Phase: ', diagSt_phase(n)
          CALL PRINT_MESSAGE( msgBuf, stdUnit,SQUEEZE_RIGHT, myThid)
          WRITE(msgBuf,'(A)') ' Regions : '
          l = 12
          DO j=0,nRegions
           IF ( diagSt_region(j,n).GE.1 ) THEN

 Legend:



Removed from v.1.12
 


changed lines


 
Added in v.1.13
 Legend:



Removed from v.1.12
 


changed lines


 
Added in v.1.13
-Removed from v.1.12
+Added in v.1.13

	ViewVC Help
Powered by ViewVC 1.1.22