/[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.65 by jmc, Fri May 23 19:59:47 2014 UTC revision 1.66 by rpa, Wed Jun 4 14:48:32 2014 UTC
# Line 338  C       excluding advective terms: Line 338  C       excluding advective terms:
338       &    (diffKh.NE.0. .OR. diffK4 .NE.0. .OR. trUseGMRedi) ) THEN       &    (diffKh.NE.0. .OR. diffK4 .NE.0. .OR. trUseGMRedi) ) THEN
339            diagName = 'DFxE'//diagSufx            diagName = 'DFxE'//diagSufx
340            CALL DIAGNOSTICS_FILL( df, diagName, k,1, 2,bi,bj, myThid )            CALL DIAGNOSTICS_FILL( df, diagName, k,1, 2,bi,bj, myThid )
341    #ifdef ALLOW_LAYERS
342              CALL LAYERS_FILL_DFX( df, trIdentity, k, 1, 2,bi,bj, myThid )
343    #endif /* ALLOW_LAYERS */
344        ENDIF        ENDIF
345  #endif  #endif
346    
# Line 475  C       excluding advective terms: Line 478  C       excluding advective terms:
478       &    (diffKh.NE.0. .OR. diffK4 .NE.0. .OR. trUseGMRedi) ) THEN       &    (diffKh.NE.0. .OR. diffK4 .NE.0. .OR. trUseGMRedi) ) THEN
479            diagName = 'DFyE'//diagSufx            diagName = 'DFyE'//diagSufx
480            CALL DIAGNOSTICS_FILL( df, diagName, k,1, 2,bi,bj, myThid )            CALL DIAGNOSTICS_FILL( df, diagName, k,1, 2,bi,bj, myThid )
481    #ifdef ALLOW_LAYERS
482                CALL LAYERS_FILL_DFY( df, trIdentity,k, 1, 2,bi,bj, myThid )
483    #endif /* ALLOW_LAYERS */
484        ENDIF        ENDIF
485  #endif  #endif
486    
# Line 605  C       Explicit terms only & excluding Line 611  C       Explicit terms only & excluding
611       &    (.NOT.implicitDiffusion .OR. trUseGMRedi) ) THEN       &    (.NOT.implicitDiffusion .OR. trUseGMRedi) ) THEN
612            diagName = 'DFrE'//diagSufx            diagName = 'DFrE'//diagSufx
613            CALL DIAGNOSTICS_FILL( df, diagName, k,1, 2,bi,bj, myThid )            CALL DIAGNOSTICS_FILL( df, diagName, k,1, 2,bi,bj, myThid )
614    #ifdef ALLOW_LAYERS
615              CALL LAYERS_FILL_DFR( df, trIdentity, k, 1, 2,bi,bj, myThid )
616    #endif /* ALLOW_LAYERS */
617        ENDIF        ENDIF
618  #endif  #endif
619    
# Line 653  C-    Diagnostics of Non-Local Tracer (v Line 662  C-    Diagnostics of Non-Local Tracer (v
662  C- note: needs to explicitly increment the counter since DIAGNOSTICS_FILL  C- note: needs to explicitly increment the counter since DIAGNOSTICS_FILL
663  C        does it only if k=1 (never the case here)  C        does it only if k=1 (never the case here)
664           IF ( k.EQ.2 ) CALL DIAGNOSTICS_COUNT(diagName,bi,bj,myThid)           IF ( k.EQ.2 ) CALL DIAGNOSTICS_COUNT(diagName,bi,bj,myThid)
665    #ifdef ALLOW_LAYERS
666             CALL LAYERS_FILL_DFR( df, trIdentity, k, 1, 2,bi,bj, myThid )
667    #endif /* ALLOW_LAYERS */
668         ENDIF         ENDIF
669  #endif  #endif
670        ENDIF        ENDIF
Legend:
Removed from v.1.65  
changed lines
  Added in v.1.66
  ViewVC Help
Powered by ViewVC 1.1.22