/[MITgcm]/MITgcm/pkg/generic_advdiff/gad_calc_rhs.F
ViewVC logotype

Diff of /MITgcm/pkg/generic_advdiff/gad_calc_rhs.F

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

revision 1.32 by jmc, Thu Dec 16 22:29:34 2004 UTC revision 1.33 by jmc, Mon Dec 20 19:10:13 2004 UTC
# Line 112  C af               :: advective flux Line 112  C af               :: advective flux
112  C df               :: diffusive flux  C df               :: diffusive flux
113  C localT           :: local copy of tracer field  C localT           :: local copy of tracer field
114  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
       INTEGER     kk  
115        CHARACTER*8 diagName        CHARACTER*8 diagName
116        CHARACTER*4 GAD_DIAG_SUFX, diagSufx        CHARACTER*4 GAD_DIAG_SUFX, diagSufx
117        EXTERNAL    GAD_DIAG_SUFX        EXTERNAL    GAD_DIAG_SUFX
# Line 218  C-    Advective flux in X Line 217  C-    Advective flux in X
217  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
218          IF ( useDiagnostics ) THEN          IF ( useDiagnostics ) THEN
219            diagName = 'ADVx'//diagSufx            diagName = 'ADVx'//diagSufx
220            kk = -k            CALL DIAGNOSTICS_FILL(af,diagName, k,1, 2,bi,bj, myThid)
           CALL DIAGNOSTICS_FILL(af,diagName, kk,1, 2,bi,bj, myThid)  
221          ENDIF          ENDIF
222  #endif  #endif
223        ENDIF        ENDIF
# Line 263  C       excluding advective terms: Line 261  C       excluding advective terms:
261        IF ( useDiagnostics .AND.        IF ( useDiagnostics .AND.
262       &    (diffKh.NE.0. .OR. diffK4 .NE.0. .OR. useGMRedi) ) THEN       &    (diffKh.NE.0. .OR. diffK4 .NE.0. .OR. useGMRedi) ) THEN
263            diagName = 'DIFx'//diagSufx            diagName = 'DIFx'//diagSufx
264            kk = -k            CALL DIAGNOSTICS_FILL(df,diagName, k,1, 2,bi,bj, myThid)
           CALL DIAGNOSTICS_FILL(df,diagName, kk,1, 2,bi,bj, myThid)  
265        ENDIF        ENDIF
266  #endif  #endif
267    
# Line 306  C-    Advective flux in Y Line 303  C-    Advective flux in Y
303  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
304          IF ( useDiagnostics ) THEN          IF ( useDiagnostics ) THEN
305            diagName = 'ADVy'//diagSufx            diagName = 'ADVy'//diagSufx
306            kk = -k            CALL DIAGNOSTICS_FILL(af,diagName, k,1, 2,bi,bj, myThid)
           CALL DIAGNOSTICS_FILL(af,diagName, kk,1, 2,bi,bj, myThid)  
307          ENDIF          ENDIF
308  #endif  #endif
309        ENDIF        ENDIF
# Line 351  C       excluding advective terms: Line 347  C       excluding advective terms:
347        IF ( useDiagnostics .AND.        IF ( useDiagnostics .AND.
348       &    (diffKh.NE.0. .OR. diffK4 .NE.0. .OR. useGMRedi) ) THEN       &    (diffKh.NE.0. .OR. diffK4 .NE.0. .OR. useGMRedi) ) THEN
349            diagName = 'DIFy'//diagSufx            diagName = 'DIFy'//diagSufx
350            kk = -k            CALL DIAGNOSTICS_FILL(df,diagName, k,1, 2,bi,bj, myThid)
           CALL DIAGNOSTICS_FILL(df,diagName, kk,1, 2,bi,bj, myThid)  
351        ENDIF        ENDIF
352  #endif  #endif
353    
# Line 394  C-     add the advective flux to fVerT Line 389  C-     add the advective flux to fVerT
389  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
390          IF ( useDiagnostics ) THEN          IF ( useDiagnostics ) THEN
391            diagName = 'ADVr'//diagSufx            diagName = 'ADVr'//diagSufx
392            kk = -k            CALL DIAGNOSTICS_FILL(af,diagName, k,1, 2,bi,bj, myThid)
           CALL DIAGNOSTICS_FILL(af,diagName, kk,1, 2,bi,bj, myThid)  
393          ENDIF          ENDIF
394  #endif  #endif
395        ENDIF        ENDIF
# Line 437  C       Explicit terms only & excluding Line 431  C       Explicit terms only & excluding
431        IF ( useDiagnostics .AND.        IF ( useDiagnostics .AND.
432       &    (.NOT.implicitDiffusion .OR. useGMRedi) ) THEN       &    (.NOT.implicitDiffusion .OR. useGMRedi) ) THEN
433            diagName = 'DFrE'//diagSufx            diagName = 'DFrE'//diagSufx
434            kk = -k            CALL DIAGNOSTICS_FILL(df,diagName, k,1, 2,bi,bj, myThid)
           CALL DIAGNOSTICS_FILL(df,diagName, kk,1, 2,bi,bj, myThid)  
435        ENDIF        ENDIF
436  #endif  #endif
437    
Legend:
Removed from v.1.32  
changed lines
  Added in v.1.33
  ViewVC Help
Powered by ViewVC 1.1.22