/[MITgcm]/MITgcm/pkg/diagnostics/diagnostics_utils.F
ViewVC logotype

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

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

revision 1.35 by mlosch, Fri May 26 08:33:03 2017 UTC revision 1.36 by jmc, Sun Jul 23 00:24:18 2017 UTC
# Line 71  C     to increment (needs to be a valid Line 71  C     to increment (needs to be a valid
71          IF ( diagName.EQ.flds(m,n) .AND. idiag(m,n).GT.0 ) THEN          IF ( diagName.EQ.flds(m,n) .AND. idiag(m,n).GT.0 ) THEN
72           ipt = idiag(m,n)           ipt = idiag(m,n)
73           IF (ndiag(ipt,bi,bj).GE.0) THEN           IF (ndiag(ipt,bi,bj).GE.0) THEN
74            ndId = jdiag(m,n)            ndId = ABS(jdiag(m,n))
75            ipt = ipt + pdiag(n,bi,bj)*kdiag(ndId)            ipt = ipt + pdiag(n,bi,bj)*kdiag(ndId)
76  C-    Increment the counter for the diagnostic  C-    Increment the counter for the diagnostic
77            IF ( biArg.EQ.0 .AND. bjArg.EQ.0 ) THEN            IF ( biArg.EQ.0 .AND. bjArg.EQ.0 ) THEN
# Line 260  C-    search for this diag. in the activ Line 260  C-    search for this diag. in the activ
260             IF ( ip.EQ.0 .AND. diagName.EQ.flds(m,n)             IF ( ip.EQ.0 .AND. diagName.EQ.flds(m,n)
261       &                  .AND. idiag(m,n).NE.0 ) THEN       &                  .AND. idiag(m,n).NE.0 ) THEN
262              ip   = ABS(idiag(m,n))              ip   = ABS(idiag(m,n))
263              ndId = jdiag(m,n)              ndId = ABS(jdiag(m,n))
264             ENDIF             ENDIF
265           ENDDO           ENDDO
266          ENDDO          ENDDO
# Line 281  C-    search for this diag. in the activ Line 281  C-    search for this diag. in the activ
281             IF ( ip.EQ.0 .AND. diagName.EQ.flds(m,n)             IF ( ip.EQ.0 .AND. diagName.EQ.flds(m,n)
282       &                  .AND. idiag(m,n).NE.0 ) THEN       &                  .AND. idiag(m,n).NE.0 ) THEN
283              ip   = ABS(idiag(m,n))              ip   = ABS(idiag(m,n))
284              ndId = jdiag(m,n)              ndId = ABS(jdiag(m,n))
285             ENDIF             ENDIF
286            ENDDO            ENDDO
287           ELSEIF ( ip.EQ.0 ) THEN           ELSEIF ( ip.EQ.0 ) THEN
288            DO m=1,nActive(n)            DO m=1,nActive(n)
289             IF ( ip.EQ.0 .AND. diagName.EQ.flds(m,n)             IF ( ip.EQ.0 .AND. diagName.EQ.flds(m,n)
290       &                  .AND. idiag(m,n).NE.0 ) THEN       &                  .AND. idiag(m,n).NE.0 ) THEN
291              ndId = jdiag(m,n)              ndId = ABS(jdiag(m,n))
292             ENDIF             ENDIF
293            ENDDO            ENDDO
294           ENDIF           ENDIF
Legend:
Removed from v.1.35  
changed lines
  Added in v.1.36
  ViewVC Help
Powered by ViewVC 1.1.22