/[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.13 by jmc, Mon Nov 5 18:52:21 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 36  C     == GLobal variables == Line 36  C     == GLobal variables ==
36  #endif  #endif
37  #ifdef ALLOW_PTRACERS  #ifdef ALLOW_PTRACERS
38  #include "PTRACERS_SIZE.h"  #include "PTRACERS_SIZE.h"
39  #include "PTRACERS.h"  #include "PTRACERS_PARAMS.h"
40  #endif  #endif
41    
42  C     !INPUT/OUTPUT PARAMETERS:  C     !INPUT/OUTPUT PARAMETERS:
# 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 147  C--   Add physical pacakge contributions Line 150  C--   Add physical pacakge contributions
150    
151  #ifdef ALLOW_KPP  #ifdef ALLOW_KPP
152        IF (trUseKPP) THEN        IF (trUseKPP) THEN
153    C--   Set vertical diffusivity contribution from KPP
154         IF (trIdentity.EQ.GAD_TEMPERATURE) THEN         IF (trIdentity.EQ.GAD_TEMPERATURE) THEN
155           CALL KPP_CALC_DIFF_T(           CALL KPP_CALC_DIFF_T(
156       I        bi,bj,iMin,iMax,jMin,jMax,0,Nr,       I        bi,bj,iMin,iMax,jMin,jMax,0,Nr,
157       U        KappaRTr,       O        KappaRTr,
158       I        myThid)       I        myThid)
159         ELSE         ELSE
160           CALL KPP_CALC_DIFF_S(           CALL KPP_CALC_DIFF_S(
161       I        bi,bj,iMin,iMax,jMin,jMax,0,Nr,       I        bi,bj,iMin,iMax,jMin,jMax,0,Nr,
162       U        KappaRTr,       O        KappaRTr,
163       I        myThid)       I        myThid)
164         ENDIF         ENDIF
165  #if (defined ALLOW_PTRACERS && ! (defined ALLOW_3D_DIFFKR || \  #if (defined ALLOW_PTRACERS && ! (defined ALLOW_3D_DIFFKR || \
# Line 177  C--   Add physical pacakge contributions Line 181  C--   Add physical pacakge contributions
181  #endif /* ALLOW_KPP */  #endif /* ALLOW_KPP */
182    
183  #ifdef ALLOW_GMREDI  #ifdef ALLOW_GMREDI
184        IF (trUseGMRedi) THEN        IF (trUseGMRedi) THEN
185           CALL GMREDI_CALC_DIFF(           CALL GMREDI_CALC_DIFF(
186       I        bi,bj,iMin,iMax,jMin,jMax,0,Nr,       I        bi,bj,iMin,iMax,jMin,jMax,0,Nr,
187       U        KappaRTr,       U        KappaRTr,
# Line 202  C--   Add physical pacakge contributions Line 206  C--   Add physical pacakge contributions
206       I        myThid)       I        myThid)
207        ENDIF        ENDIF
208  #endif  #endif
209          
210  #ifdef ALLOW_GGL90  #ifdef ALLOW_GGL90
211        IF (useGGL90) THEN        IF (useGGL90) THEN
212           CALL GGL90_CALC_DIFF(           CALL GGL90_CALC_DIFF(
# Line 211  C--   Add physical pacakge contributions Line 215  C--   Add physical pacakge contributions
215       I        myThid)       I        myThid)
216        ENDIF        ENDIF
217  #endif  #endif
218          
219  C-    Apply mask to vertical diffusivity  C-    Apply mask to vertical diffusivity
220  C jmc: don't have the impression that masking is needed  C jmc: don't have the impression that masking is needed
221  C      but could be removed later if it's the case.  C      but could be removed later if it's the case.
222  c     DO j = 1-Oly, sNy+Oly  c     DO j = 1-Oly, sNy+Oly
223  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.13
  ViewVC Help
Powered by ViewVC 1.1.22