/[MITgcm]/MITgcm/model/src/calc_3d_diffusivity.F
ViewVC logotype

Diff of /MITgcm/model/src/calc_3d_diffusivity.F

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

revision 1.10 by dimitri, Mon Apr 23 20:46:49 2007 UTC revision 1.11 by jmc, Tue Sep 4 16:49:44 2007 UTC
# Line 6  C $Name$ Line 6  C $Name$
6    
7  CBOP  CBOP
8  C     !ROUTINE: CALC_3D_DIFFUSIVITY  C     !ROUTINE: CALC_3D_DIFFUSIVITY
9  C     !INTERFACE:  C     !INTERFACE:
10        SUBROUTINE CALC_3D_DIFFUSIVITY(        SUBROUTINE CALC_3D_DIFFUSIVITY(
11       I        bi,bj,iMin,iMax,jMin,jMax,       I        bi,bj,iMin,iMax,jMin,jMax,
12       I        trIdentity, trUseGMRedi, trUseKPP,       I        trIdentity, trUseGMRedi, trUseKPP,
13       O        KappaRTr,       O        KappaRTr,
# Line 62  C     i, j, k    :: Loop counters Line 62  C     i, j, k    :: Loop counters
62  C     iTr        :: passive tracer index  C     iTr        :: passive tracer index
63  C     msgBuf     :: message buffer  C     msgBuf     :: message buffer
64        INTEGER i,j,k        INTEGER i,j,k
65        _RL KbryanLewis79, KbryanLewisEQ        _RL KbryanLewis79
66    #ifdef ALLOW_BL79_LAT_VARY
67          _RL KbryanLewisEQ
68    #endif
69        CHARACTER*(MAX_LEN_MBUF) msgBuf        CHARACTER*(MAX_LEN_MBUF) msgBuf
70  #ifdef ALLOW_PTRACERS  #ifdef ALLOW_PTRACERS
71        INTEGER iTr        INTEGER iTr
# Line 92  CEOP Line 95  CEOP
95          DO k = 1,Nr          DO k = 1,Nr
96           DO j = 1-Oly,sNy+Oly           DO j = 1-Oly,sNy+Oly
97            DO i = 1-Olx,sNx+Olx            DO i = 1-Olx,sNx+Olx
98             KappaRTr(i,j,k) = KappaRTr(i,j,k)             KappaRTr(i,j,k) = KappaRTr(i,j,k)
99  #if (defined ALLOW_3D_DIFFKR || \  #if (defined ALLOW_3D_DIFFKR || \
100       (defined (ALLOW_AUTODIFF_TAMC) && defined (ALLOW_DIFFKR_CONTROL)))       (defined (ALLOW_AUTODIFF_TAMC) && defined (ALLOW_DIFFKR_CONTROL)))
101       &          + diffKr(i,j,k,bi,bj)       &          + diffKr(i,j,k,bi,bj)
# Line 177  C--   Add physical pacakge contributions Line 180  C--   Add physical pacakge contributions
180  #endif /* ALLOW_KPP */  #endif /* ALLOW_KPP */
181    
182  #ifdef ALLOW_GMREDI  #ifdef ALLOW_GMREDI
183        IF (trUseGMRedi) THEN        IF (trUseGMRedi) THEN
184           CALL GMREDI_CALC_DIFF(           CALL GMREDI_CALC_DIFF(
185       I        bi,bj,iMin,iMax,jMin,jMax,0,Nr,       I        bi,bj,iMin,iMax,jMin,jMax,0,Nr,
186       U        KappaRTr,       U        KappaRTr,
# Line 202  C--   Add physical pacakge contributions Line 205  C--   Add physical pacakge contributions
205       I        myThid)       I        myThid)
206        ENDIF        ENDIF
207  #endif  #endif
208          
209  #ifdef ALLOW_GGL90  #ifdef ALLOW_GGL90
210        IF (useGGL90) THEN        IF (useGGL90) THEN
211           CALL GGL90_CALC_DIFF(           CALL GGL90_CALC_DIFF(
# Line 211  C--   Add physical pacakge contributions Line 214  C--   Add physical pacakge contributions
214       I        myThid)       I        myThid)
215        ENDIF        ENDIF
216  #endif  #endif
217          
218  C-    Apply mask to vertical diffusivity  C-    Apply mask to vertical diffusivity
219  C jmc: don't have the impression that masking is needed  C jmc: don't have the impression that masking is needed
220  C      but could be removed later if it's the case.  C      but could be removed later if it's the case.
221  c     DO j = 1-Oly, sNy+Oly  c     DO j = 1-Oly, sNy+Oly
222  c      DO i = 1-Olx, sNx+Olx  c      DO i = 1-Olx, sNx+Olx
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11
  ViewVC Help
Powered by ViewVC 1.1.22