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

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

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

-revision 1.8 by jmc,
Fri May 20 07:28:49 2005 UTC
+revision 1.9 by jmc,
Sun Jun 26 16:51:49 2005 UTC
 Line 6 
 C $Name$
  CBOP
  C     !ROUTINE: DIAGNOSTICS_FILL
  C     !INTERFACE:
        SUBROUTINE DIAGNOSTICS_FILL (inpfld, chardiag,
-      I                kLev, nLevs, bibjflg, biArg, bjArg, myThid)
+      I                kLev, nLevs, bibjFlg, biArg, bjArg, myThid)
  C     !DESCRIPTION:
  C***********************************************************************
 Line 31 
 C     chardiag ... Character expression
  C     kLev   ..... Integer flag for vertical levels:
  C                  > 0 (any integer): WHICH single level to increment in qdiag.
  C                  0,-1 to increment "nLevs" levels in qdiag,
  C                  0 : fill-in in the same order as the input array
  C                  -1: fill-in in reverse order.
  C     nLevs ...... indicates Number of levels of the input field array
  C                  (whether to fill-in all the levels (kLev<1) or just one (kLev>0))
- C     bibjflg .... Integer flag to indicate instructions for bi bj loop
+ C     bibjFlg .... Integer flag to indicate instructions for bi bj loop
  C                  0 indicates that the bi-bj loop must be done here
  C                  1 indicates that the bi-bj loop is done OUTSIDE
  C                  2 indicates that the bi-bj loop is done OUTSIDE
 Line 43 
 C                     AND that we have b
  C                  3 indicates that the bi-bj loop is done OUTSIDE
  C                     AND that we have been sent a local array
  C                     AND that the array has no overlap region (interior only)
- C                  NOTE - bibjflg can be NEGATIVE to indicate not to increment counter
+ C                  NOTE - bibjFlg can be NEGATIVE to indicate not to increment counter
- C     biArg ...... X-direction tile number - used for bibjflg=1-3
+ C     biArg ...... X-direction tile number - used for bibjFlg=1-3
- C     bjArg ...... Y-direction tile number - used for bibjflg=1-3
+ C     bjArg ...... Y-direction tile number - used for bibjFlg=1-3
  C     myThid     ::  my thread Id number
  C***********************************************************************
  C                  NOTE: User beware! If a local (1 tile only) array
- C                        is sent here, bibjflg MUST NOT be set to 0
+ C                        is sent here, bibjFlg MUST NOT be set to 0
  C                        or there will be out of bounds problems!
  C***********************************************************************
        _RL inpfld(*)
        CHARACTER*8 chardiag
-       INTEGER kLev, nLevs, bibjflg, biArg, bjArg
+       INTEGER kLev, nLevs, bibjFlg, biArg, bjArg
        INTEGER myThid
  CEOP
  C     !LOCAL VARIABLES:
+ C     ndId      :: diagnostic Id number (in available diagnostics list)
  C ===============
-       INTEGER m, n, j
+       INTEGER m, n, j, k, l, bi, bj
-       INTEGER ndiagnum, ipointer, iSp, jSd
+       INTEGER ndId, ipt, iSp
        INTEGER region2fill(0:nRegions)
+       IF ( bibjFlg.EQ.0 ) THEN
+         bi = 1
+         bj = 1
+       ELSE
+         bi = biArg
+         bj = bjArg
+       ENDIF
  C--   2D/3D Diagnostics :
  C Run through list of active diagnostics to make sure
  C we are trying to fill a valid diagnostic
-       ndiagnum = 0
-       ipointer = 0
        DO n=1,nlists
         DO m=1,nActive(n)
-         IF ( chardiag.EQ.flds(m,n) ) THEN
+         IF ( chardiag.EQ.flds(m,n) .AND. idiag(m,n).GT.0 ) THEN
-          ndiagnum = jdiag(m,n)
+          ipt = idiag(m,n)
-          IF (ndiag(ndiagnum).GE.0) ipointer = idiag(ndiagnum)
+          IF ( ndiag(ipt,bi,bj).GE.0 ) THEN
+ C diagnostic is valid & active, do the filling:
+            ndId = jdiag(m,n)
+            CALL DIAGNOSTICS_FILL_FIELD( inpfld, ndId, ipt,
+      I                kLev, nLevs, bibjFlg, biArg, bjArg, myThid )
+          ENDIF
          ENDIF
         ENDDO
        ENDDO
- C if we are a valid and an active diagnostic, do the filling:
-       IF ( ipointer.NE.0 ) THEN
-         CALL DIAGNOSTICS_FILL_FIELD( inpfld, ndiagnum, ipointer,
-      I                kLev, nLevs, bibjflg, biArg, bjArg, myThid )
-       ENDIF
  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
  C--   Global/Regional Statistics :
  C Run through list of active statistics-diagnostics to make sure
  C we are trying to compute & fill a valid diagnostic
-       ndiagnum = 0
-       iSp = 0
        DO n=1,diagSt_nbLists
         DO m=1,diagSt_nbActv(n)
-         IF ( chardiag.EQ.diagSt_Flds(m,n) ) THEN
+         IF ( chardiag.EQ.diagSt_Flds(m,n) .AND. iSdiag(m,n).GT.0 ) THEN
-          jSd = jSdiag(m,n)
+          iSp = iSdiag(m,n)
-          iSp = iSdiag(jSd)
+          IF ( qSdiag(0,0,iSp,bi,bj).GE.0. ) THEN
-          IF ( iSp.NE.0 ) THEN
+ C-         diagnostics is valid and Active. Find list of regions to fill:
-            IF (qSdiag(0,0,iSp,1,1).LT.0.) iSp = 0
-          ENDIF
-          IF ( ndiagnum.EQ.0 ) THEN
             DO j=0,nRegions
              region2fill(j) = diagSt_region(j,n)
             ENDDO
-          ELSE
+ C-         if this diagnostics appears in several lists (with same freq)
-            DO j=0,nRegions
+ C          then add regions from other lists
-             region2fill(j) = MAX( region2fill(j), diagSt_region(j,n) )
+            DO l=1,diagSt_nbLists
+             DO k=1,diagSt_nbActv(l)
+              IF ( iSdiag(k,l).EQ.-iSp ) THEN
+               DO j=0,nRegions
+                region2fill(j) = MAX(region2fill(j),diagSt_region(j,l))
+               ENDDO
+              ENDIF
+             ENDDO
             ENDDO
+ C-         Now do the filling :
+            ndId = jSdiag(m,n)
+            CALL DIAGSTATS_FILL( inpfld, ndId, iSp, region2fill,
+      I                kLev, nLevs, bibjFlg, biArg, bjArg, myThid )
           ENDIF
-          ndiagnum = jSd
          ENDIF
         ENDDO
        ENDDO
- C if we are a valid and an active diagnostic, do the filling:
+       RETURN
-       IF ( iSp.NE.0 ) THEN
-         CALL DIAGSTATS_FILL( inpfld, ndiagnum, iSp, region2fill,
-      I                kLev, nLevs, bibjflg, biArg, bjArg, myThid )
-       ENDIF
-       RETURN
        END

 Legend:



Removed from v.1.8
 


changed lines


 
Added in v.1.9
 Legend:



Removed from v.1.8
 


changed lines


 
Added in v.1.9
-Removed from v.1.8
+Added in v.1.9

	ViewVC Help
Powered by ViewVC 1.1.22